From cd45554e5a0a643781d3deab1e3a8369dfbfd717 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 8 Apr 2013 17:29:47 +0200 Subject: po: refresh --- po/apt-all.pot | 130 ++++++++++++++++++++++++++++----------------------------- po/ar.po | 130 ++++++++++++++++++++++++++++----------------------------- po/ast.po | 130 ++++++++++++++++++++++++++++----------------------------- po/bg.po | 130 ++++++++++++++++++++++++++++----------------------------- po/bs.po | 130 ++++++++++++++++++++++++++++----------------------------- po/ca.po | 130 ++++++++++++++++++++++++++++----------------------------- po/cs.po | 130 ++++++++++++++++++++++++++++----------------------------- po/cy.po | 130 ++++++++++++++++++++++++++++----------------------------- po/da.po | 130 ++++++++++++++++++++++++++++----------------------------- po/de.po | 130 ++++++++++++++++++++++++++++----------------------------- po/dz.po | 130 ++++++++++++++++++++++++++++----------------------------- po/el.po | 130 ++++++++++++++++++++++++++++----------------------------- po/es.po | 130 ++++++++++++++++++++++++++++----------------------------- po/eu.po | 130 ++++++++++++++++++++++++++++----------------------------- po/fi.po | 130 ++++++++++++++++++++++++++++----------------------------- po/fr.po | 130 ++++++++++++++++++++++++++++----------------------------- po/gl.po | 130 ++++++++++++++++++++++++++++----------------------------- po/hu.po | 130 ++++++++++++++++++++++++++++----------------------------- po/it.po | 130 ++++++++++++++++++++++++++++----------------------------- po/ja.po | 130 ++++++++++++++++++++++++++++----------------------------- po/km.po | 130 ++++++++++++++++++++++++++++----------------------------- po/ko.po | 130 ++++++++++++++++++++++++++++----------------------------- po/ku.po | 130 ++++++++++++++++++++++++++++----------------------------- po/lt.po | 130 ++++++++++++++++++++++++++++----------------------------- po/mr.po | 130 ++++++++++++++++++++++++++++----------------------------- po/nb.po | 130 ++++++++++++++++++++++++++++----------------------------- po/ne.po | 130 ++++++++++++++++++++++++++++----------------------------- po/nl.po | 130 ++++++++++++++++++++++++++++----------------------------- po/nn.po | 130 ++++++++++++++++++++++++++++----------------------------- po/pl.po | 130 ++++++++++++++++++++++++++++----------------------------- po/pt.po | 130 ++++++++++++++++++++++++++++----------------------------- po/pt_BR.po | 130 ++++++++++++++++++++++++++++----------------------------- po/ro.po | 130 ++++++++++++++++++++++++++++----------------------------- po/ru.po | 130 ++++++++++++++++++++++++++++----------------------------- po/sk.po | 130 ++++++++++++++++++++++++++++----------------------------- po/sl.po | 130 ++++++++++++++++++++++++++++----------------------------- po/sv.po | 130 ++++++++++++++++++++++++++++----------------------------- po/th.po | 130 ++++++++++++++++++++++++++++----------------------------- po/tl.po | 130 ++++++++++++++++++++++++++++----------------------------- po/uk.po | 130 ++++++++++++++++++++++++++++----------------------------- po/vi.po | 130 ++++++++++++++++++++++++++++----------------------------- po/zh_CN.po | 130 ++++++++++++++++++++++++++++----------------------------- po/zh_TW.po | 130 ++++++++++++++++++++++++++++----------------------------- 43 files changed, 2795 insertions(+), 2795 deletions(-) diff --git a/po/apt-all.pot b/po/apt-all.pot index 4703792d7..a69dc9295 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.9~exp2\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -153,7 +153,7 @@ msgstr "" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1435,7 +1435,7 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 @@ -1546,7 +1546,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 #, c-format msgid "Unable to write to %s" msgstr "" @@ -1555,31 +1555,31 @@ msgstr "" msgid "Cannot get debconf version. Is debconf installed?" msgstr "" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "" #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format msgid "Error processing directory %s" msgstr "" -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "" -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, c-format msgid "Error processing contents %s" msgstr "" -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1621,11 +1621,11 @@ msgid "" " -o=? Set an arbitrary configuration option" msgstr "" -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "" @@ -1651,8 +1651,8 @@ msgstr "" msgid "Unable to open DB file %s: %s" msgstr "" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "" @@ -1730,22 +1730,22 @@ msgstr "" msgid "Archive had no package field" msgstr "" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:814 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" -#: ftparchive/writer.cc:708 +#: ftparchive/writer.cc:711 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:715 #, c-format msgid " %s has no binary override entry either\n" msgstr "" @@ -1819,7 +1819,7 @@ msgstr "" msgid "Problem unlinking %s" msgstr "" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "" @@ -1943,54 +1943,54 @@ msgstr "" msgid "Failed to close file %s" msgstr "" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, 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:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" msgstr "" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "" -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "" -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "" -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "" @@ -2368,59 +2368,59 @@ msgstr "" msgid "The package cache was built for a different architecture" msgstr "" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "" @@ -2520,12 +2520,12 @@ msgstr "" msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" @@ -2677,14 +2677,14 @@ msgstr "" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 +#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 +#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 +#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 +#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 +#: apt-pkg/pkgcachegen.cc:561 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "" @@ -2705,26 +2705,26 @@ msgstr "" msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:568 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:1150 +#: apt-pkg/pkgcachegen.cc:1197 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 +#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 msgid "Reading package lists" msgstr "" -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1302 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 msgid "IO Error saving source cache" msgstr "" @@ -2919,22 +2919,22 @@ msgstr "" msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/ar.po b/po/ar.po index 1b56be6c7..d42708726 100644 --- a/po/ar.po +++ b/po/ar.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2006-10-20 21:28+0300\n" "Last-Translator: Ossama M. Khayat \n" "Language-Team: Arabic \n" @@ -160,7 +160,7 @@ msgstr " جدول النسخ:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1460,7 +1460,7 @@ msgstr "خطأ داخلي" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 @@ -1573,7 +1573,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 #, c-format msgid "Unable to write to %s" msgstr "تعذرت الكتابة إلى %s" @@ -1582,31 +1582,31 @@ msgstr "تعذرت الكتابة إلى %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "تعذر الحصول على نسخة debconf. هل هي مثبتة؟" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "قائمة توسيعات الحزمة طويلة جداً" #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format msgid "Error processing directory %s" msgstr "خطأ في معالجة الدليل %s" -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "قائمة توسيعات المصدر طويلة جداً" -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "خطأ في كتابة الترويسة إلى ملف المحتويات" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, c-format msgid "Error processing contents %s" msgstr "خطأ في معالجة المحتويات %s" -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1648,11 +1648,11 @@ msgid "" " -o=? Set an arbitrary configuration option" msgstr "" -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "لم تُطابق أية تحديدات" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "بعض الملفات مفقودة في مجموعة ملف الحزمة `%s'" @@ -1678,8 +1678,8 @@ msgstr "" 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 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "" @@ -1757,22 +1757,22 @@ msgstr "" msgid "Archive had no package field" msgstr "" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:814 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" -#: ftparchive/writer.cc:708 +#: ftparchive/writer.cc:711 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:715 #, c-format msgid " %s has no binary override entry either\n" msgstr "" @@ -1846,7 +1846,7 @@ msgstr "" msgid "Problem unlinking %s" msgstr "" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "فشل تغيير اسم %s إلى %s" @@ -1970,54 +1970,54 @@ msgstr "فشلت كتابة الملف %s" msgid "Failed to close file %s" msgstr "فشل إغلاق الملف %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "المسار %s طويل جداً" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "فكّ تحزيم %s أكثر من مرّة" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, 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:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" msgstr "" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "المسار طويل جداً" -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "" -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "" -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "" @@ -2398,59 +2398,59 @@ msgstr "" msgid "The package cache was built for a different architecture" msgstr "" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "يعتمد" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "يعتمد مسبقاً" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "يستحسن" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "يقترح" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "يعارض" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "يستبدل" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "يُلغي" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "مهم" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "مطلوب" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "قياسي" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "اختياري" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "إضافي" @@ -2551,12 +2551,12 @@ msgstr "فتح %s" msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" @@ -2708,14 +2708,14 @@ msgstr "" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 +#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 +#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 +#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 +#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 +#: apt-pkg/pkgcachegen.cc:561 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "حدث خطأ أثناء معالجة %s (NewVersion1)" @@ -2736,26 +2736,26 @@ msgstr "" msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:568 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:1150 +#: apt-pkg/pkgcachegen.cc:1197 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 +#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 msgid "Reading package lists" msgstr "قراءة قوائم الحزم" -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1302 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 msgid "IO Error saving source cache" msgstr "" @@ -2954,22 +2954,22 @@ msgstr "كتابة لائحة المصادر الجديدة\n" msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/ast.po b/po/ast.po index 25388ddbb..cfa13d9ca 100644 --- a/po/ast.po +++ b/po/ast.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.18\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2010-10-02 23:35+0100\n" "Last-Translator: Iñigo Varela \n" "Language-Team: Asturian (ast)\n" @@ -153,7 +153,7 @@ msgstr " Tabla de versiones:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1590,7 +1590,7 @@ msgstr "Fallu internu" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 @@ -1721,7 +1721,7 @@ msgstr "" "-o=? Afita una opción de configuración arbitraria, p. ej. -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 #, c-format msgid "Unable to write to %s" msgstr "Nun se pue escribir en %s" @@ -1730,31 +1730,31 @@ msgstr "Nun se pue escribir en %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nun se pue alcontrar la versión de debconf. ¿Ta instaláu debconf?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "La llista d'estensión de paquetes ye enforma llarga" #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format msgid "Error processing directory %s" msgstr "Error al procesar el direutoriu %s" -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "La llista d'estensión de fontes ye enforma llarga" -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "Error al escribir la cabecera al ficheru de conteníos" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, c-format msgid "Error processing contents %s" msgstr "Error al procesar conteníos %s" -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1835,11 +1835,11 @@ msgstr "" " -c=? Lleer esti ficheru de configuración\n" " -o=? Afita una escoyeta de configuración propia" -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "Nun concasó denguna seleición" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Falten dellos ficheros nel grupu de ficheros de paquete `%s'" @@ -1867,8 +1867,8 @@ msgstr "" msgid "Unable to open DB file %s: %s" msgstr "Nun pudo abrise'l ficheru de BD %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "Nun pudo lleese %s" @@ -1946,22 +1946,22 @@ msgstr " Alcanzose'l llímite of %sB de desenllaz.\n" msgid "Archive had no package field" msgstr "L'archivu nun tien el campu paquetes" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr " %s nun tien la entrada saltos\n" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:814 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " el curiador de %s ye %s y non %s\n" -#: ftparchive/writer.cc:708 +#: ftparchive/writer.cc:711 #, c-format msgid " %s has no source override entry\n" msgstr " %s nun tien la entrada saltos de fonte\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:715 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s tampoco nun tiene una entrada binaria de saltos\n" @@ -2035,7 +2035,7 @@ msgstr "Nun pudo lleese al computar MD5" msgid "Problem unlinking %s" msgstr "Problema al desenllazar %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Nun pudo renomase %s como %s" @@ -2182,54 +2182,54 @@ msgstr "Falló la escritura nel ficheru %s" msgid "Failed to close file %s" msgstr "Falló al pesllar el ficheru %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "La trayeutoria %s ye enforma llarga" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "Desempaquetando %s más d'una vegada" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "El direutorio %s ta desviáu" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "El paquete ta tentando escribir nel oxetivu desviáu %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" msgstr "La trayeutoria de desviación ye enforma llarga" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "El direutoriu %s ta reemplazándose por un non-direutoriu" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "Fallu al atopar el nodu nel so bote d'enllaz" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "La trayeutoria ye perllarga" -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Sobreescribiendo concordancia del paquete ensin versión pa %s" -#: apt-inst/extract.cc:432 +#: 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:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Nun ye a lleer %s" @@ -2616,59 +2616,59 @@ msgstr "Esti APT nun soporta'l sistema de versiones '%s'" msgid "The package cache was built for a different architecture" msgstr "La caché de paquetes creóse pa una arquitectura estremada" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "Depende de" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "Predepende de" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "Suxer" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "Recomienda" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "En conflictu con" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "Sustituye a" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "Fai obsoletu a" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "Ruempe" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "Aumenta" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "importante" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "requeríu" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "estándar" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "opcional" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "extra" @@ -2771,12 +2771,12 @@ msgstr "Abriendo %s" msgid "Line %u too long in source list %s." msgstr "Llinia %u enforma llarga na llista d'oríxenes %s." -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Llinia %u mal formada na llista d'oríxenes %s (triba)" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Triba '%s' desconocida na llinia %u de la llista d'oríxenes %s" @@ -2941,14 +2941,14 @@ msgstr "La caché tien un sistema de versiones incompatible" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 +#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 +#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 +#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 +#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 +#: apt-pkg/pkgcachegen.cc:561 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Hebo un error al procesar %s (FindPkg)" @@ -2970,26 +2970,26 @@ msgstr "Coime, perpasaste'l númberu de descripciones qu'esti APT ye a remanar." msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Vaya, perpasaste'l númberu de dependencies coles que puede esti APT." -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:568 #, 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:1150 +#: apt-pkg/pkgcachegen.cc:1197 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nun se puede lleer la llista de paquetes d'oríxenes %s" -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 +#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 msgid "Reading package lists" msgstr "Lleendo llista de paquetes" -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1302 msgid "Collecting File Provides" msgstr "Recoyendo ficheros qu'apurren" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 msgid "IO Error saving source cache" msgstr "Fallu de E/S al grabar caché d'oríxenes" @@ -3200,22 +3200,22 @@ msgstr "Escribiendo llista nueva d'oríxenes\n" msgid "Source list entries for this disc are:\n" msgstr "Les entraes de la llista d'oríxenes pa esti discu son:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 #, c-format msgid "Wrote %i records.\n" msgstr "%i rexistros escritos.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i rexistros escritos con %i ficheros de menos.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i rexistros escritos con %i ficheros mal empareyaos\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/bg.po b/po/bg.po index 7378aae74..dd59498e1 100644 --- a/po/bg.po +++ b/po/bg.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.21\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2012-06-25 17:23+0300\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -159,7 +159,7 @@ msgstr " Таблица с версиите:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1627,7 +1627,7 @@ msgstr "Вътрешна грешка" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 @@ -1756,7 +1756,7 @@ msgstr "" " -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 #, c-format msgid "Unable to write to %s" msgstr "Неуспех при записа на %s" @@ -1765,31 +1765,31 @@ msgstr "Неуспех при записа на %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Не може да се извлече версията на debconf. Debconf инсталиран ли е?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "Списъкът с разширения на пакети и твърде дълъг" #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format msgid "Error processing directory %s" msgstr "Грешка при обработката на директория %s" -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "Списъкът с разширения на източници е твърде дълъг" -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "Грешка при запазването на заглавната част във файла със съдържание" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, c-format msgid "Error processing contents %s" msgstr "Грешка при обработката на съдържание %s" -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1874,11 +1874,11 @@ msgstr "" " -c=? Четене на този конфигурационен файл.\n" " -o=? Настройване на произволна конфигурационна опция" -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "Няма съвпадения на избора" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Липсват някои файлове от групата с файлови пакети „%s“" @@ -1906,8 +1906,8 @@ msgstr "" 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 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "Грешка при получаването на атрибути за %s" @@ -1985,22 +1985,22 @@ msgstr "Превишен лимит на DeLink от %sB.\n" msgid "Archive had no package field" msgstr "Архивът няма поле „package“" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr " %s няма запис „override“\n" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:814 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " поддържащия пакета %s е %s, а не %s\n" -#: ftparchive/writer.cc:708 +#: ftparchive/writer.cc:711 #, c-format msgid " %s has no source override entry\n" msgstr " %s няма запис „source override“\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:715 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s няма също и запис „binary override“\n" @@ -2074,7 +2074,7 @@ msgstr "Неуспех при четене докато се изчислява msgid "Problem unlinking %s" msgstr "Неуспех при премахването на връзка на %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Неуспех при преименуването на %s на %s" @@ -2219,54 +2219,54 @@ msgstr "Неуспех при запис на файл %s" msgid "Failed to close file %s" msgstr "Неуспех при затварянето на файл %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "Пътят %s е твърде дълъг" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "Разпакетиране на %s повече от веднъж" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "Директорията %s е отклонена" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Пакетът се опитва да пише в целта за отклонение %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" msgstr "Пътят за отклонение е твърде дълъг" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Директорията %s се заменя с не-директория" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "Неуспех при намирането на възел в неговия хеш" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "Пътят е твърде дълъг" -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Файловете се заменят със съдържанието на пакета %s без версия" -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Файл %s/%s заменя този в пакет %s" -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Неуспех при получаването на атрибути за %s" @@ -2657,59 +2657,59 @@ msgstr "Тази версия на APT не поддържа система за msgid "The package cache was built for a different architecture" msgstr "Кешът на пакети е бил направен за различна архитектура" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "Зависи от" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "Предварително зависи от" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "Предлага се" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "Препоръчва се" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "В конфликт с" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "Заменя" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "Изважда от употреба" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "Чупи" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "Подобрява" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "важен" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "изискван" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "стандартен" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "незадължителен" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "допълнителен" @@ -2816,12 +2816,12 @@ msgstr "Отваряне на %s" msgid "Line %u too long in source list %s." msgstr "Ред %u в списъка с източници %s е твърде дълъг." -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Лошо форматиран ред %u в списъка с източници %s (тип)" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен." @@ -2991,14 +2991,14 @@ msgstr "Кешът има несъвместима система за верс #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 +#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 +#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 +#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 +#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 +#: apt-pkg/pkgcachegen.cc:561 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Възникна грешка при обработката на %s (%s%d)" @@ -3023,27 +3023,27 @@ msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Еха, надхвърлихте броя зависимости, на който е способна тази версия на APT." -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:568 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Пакетът %s %s не беше открит при обработката на файла със зависимости" -#: apt-pkg/pkgcachegen.cc:1150 +#: apt-pkg/pkgcachegen.cc:1197 #, c-format msgid "Couldn't stat source package list %s" msgstr "" "Неуспех при получаването на атрибути на списъка с пакети с изходен код %s" -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 +#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 msgid "Reading package lists" msgstr "Четене на списъците с пакети" -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1302 msgid "Collecting File Provides" msgstr "Събиране на информация за „Осигурява“" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 msgid "IO Error saving source cache" msgstr "Входно/изходна грешка при запазването на кеша на пакети с изходен код" @@ -3257,22 +3257,22 @@ msgstr "Запазване на новия списък с източници\n" msgid "Source list entries for this disc are:\n" msgstr "Записите в списъка с източници за този диск са:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 #, c-format msgid "Wrote %i records.\n" msgstr "Записани са %i записа.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Записани са %i записа с %i липсващи файла.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Записани са %i записа с %i несъответстващи файла\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Записани са %i записа с %i липсващи и %i несъответстващи файла\n" diff --git a/po/bs.po b/po/bs.po index 4b4cb478d..126df2b43 100644 --- a/po/bs.po +++ b/po/bs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2004-05-06 15:25+0100\n" "Last-Translator: Safir Šećerović \n" "Language-Team: Bosnian \n" @@ -155,7 +155,7 @@ msgstr "" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1458,7 +1458,7 @@ msgstr "Unutrašnja greška" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 @@ -1569,7 +1569,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 #, c-format msgid "Unable to write to %s" msgstr "Ne mogu zapisati na %s" @@ -1579,31 +1579,31 @@ msgid "Cannot get debconf version. Is debconf installed?" msgstr "" "Ne mogu odrediti verziju debconf programa. Da li je debconf instaliran?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "" #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format msgid "Error processing directory %s" msgstr "" -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "" -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, c-format msgid "Error processing contents %s" msgstr "" -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1645,11 +1645,11 @@ msgid "" " -o=? Set an arbitrary configuration option" msgstr "" -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "" @@ -1675,8 +1675,8 @@ msgstr "" msgid "Unable to open DB file %s: %s" msgstr "Ne mogu otvoriti DB datoteku %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "" @@ -1754,22 +1754,22 @@ msgstr "" msgid "Archive had no package field" msgstr "" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:814 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" -#: ftparchive/writer.cc:708 +#: ftparchive/writer.cc:711 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:715 #, c-format msgid " %s has no binary override entry either\n" msgstr "" @@ -1843,7 +1843,7 @@ msgstr "" msgid "Problem unlinking %s" msgstr "" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "" @@ -1967,54 +1967,54 @@ msgstr "Ne mogu ukloniti %s" msgid "Failed to close file %s" msgstr "" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, 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:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" msgstr "" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "Putanja je preduga" -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "" -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "" -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "" @@ -2395,60 +2395,60 @@ msgstr "" msgid "The package cache was built for a different architecture" msgstr "" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "Zavisi" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "Unaprijed zavisi" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "Predlaže" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "Preporučuje" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 #, fuzzy msgid "Conflicts" msgstr "Sukobljava se sa" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "Zamjenjuje" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "Zastarijeva" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "važno" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "zahtijevano" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "standardno" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "opcionalno" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "extra" @@ -2549,12 +2549,12 @@ msgstr "Otvaram %s" msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" @@ -2706,14 +2706,14 @@ msgstr "" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 +#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 +#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 +#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 +#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 +#: apt-pkg/pkgcachegen.cc:561 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "" @@ -2734,26 +2734,26 @@ msgstr "" msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:568 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:1150 +#: apt-pkg/pkgcachegen.cc:1197 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 +#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 msgid "Reading package lists" msgstr "Čitam spiskove paketa" -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1302 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 msgid "IO Error saving source cache" msgstr "" @@ -2951,22 +2951,22 @@ msgstr "" msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/ca.po b/po/ca.po index ddbaf731a..df78aa61f 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.6\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2012-10-19 13:30+0200\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" @@ -157,7 +157,7 @@ msgstr " Taula de versió:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1616,7 +1616,7 @@ msgstr "Error intern" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 @@ -1746,7 +1746,7 @@ msgstr "" " -c=? Llegeix aquest fitxer de configuració\n" " -o=? Estableix una opció de conf arbitrària, p.e. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 #, c-format msgid "Unable to write to %s" msgstr "No es pot escriure en %s" @@ -1755,31 +1755,31 @@ msgstr "No es pot escriure en %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "No es pot determinar la versió de debconf. Està instaŀlat debconf?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "La llista de les extensions dels paquets és massa llarga" #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format msgid "Error processing directory %s" msgstr "S'ha produït un error en processar el directori %s" -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "La llista d'extensions de les fonts és massa llarga" -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "S'ha produït un error en escriure la capçalera al fitxer de continguts" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, c-format msgid "Error processing contents %s" msgstr "S'ha produït un error en processar el fitxer de continguts %s" -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1860,11 +1860,11 @@ msgstr "" " -c=? Llegeix aquest fitxer de configuració\n" " -o=? Estableix una opció de configuració arbitrària" -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "No s'ha trobat cap selecció" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "No es troben alguns fitxers dins del grup de fitxers del paquet `%s'" @@ -1892,8 +1892,8 @@ msgstr "" msgid "Unable to open DB file %s: %s" msgstr "No es pot obrir el fitxer de DB %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "No es pot determinar l'estat de %s" @@ -1971,22 +1971,22 @@ msgstr " DeLink s'ha arribat al límit de %sB.\n" msgid "Archive had no package field" msgstr "Arxiu sense el camp paquet" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr " %s no té una entrada dominant\n" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:814 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " el mantenidor de %s és %s, no %s\n" -#: ftparchive/writer.cc:708 +#: ftparchive/writer.cc:711 #, c-format msgid " %s has no source override entry\n" msgstr " %s no té una entrada dominant de font\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:715 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s no té una entrada dominant de binari\n" @@ -2060,7 +2060,7 @@ msgstr "No s'ha pogut llegir mentre es calculava la suma MD5" msgid "Problem unlinking %s" msgstr "S'ha trobat un problema treient l'enllaç %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "No s'ha pogut canviar el nom de %s a %s" @@ -2205,54 +2205,54 @@ msgstr "No s'ha pogut escriure el fitxer %s" msgid "Failed to close file %s" msgstr "Ha fallat el tancament del fitxer %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "La ruta %s és massa llarga" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "S'està desempaquetant %s més d'una vegada" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "El directori %s està desviat" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "El paquet està intentant escriure en l'objectiu desviat %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" msgstr "La ruta de desviació és massa llarga" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "El directori %s està sent reemplaçat per un no-directori" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "No s'ha trobat el node dins de la taula" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "La ruta és massa llarga" -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "S'està sobreescrivint el corresponent paquet sense versió per a %s" -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "El fitxer %s/%s sobreescriu al que està en el paquet %s" -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "No es pot veure l'estat de %s" @@ -2643,59 +2643,59 @@ msgstr "Aquest APT no suporta el sistema de versions «%s»" msgid "The package cache was built for a different architecture" msgstr "La memòria cau de paquets fou creada per a una arquitectura diferent" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "Depèn" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "Predepèn" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "Suggereix" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "Recomana" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "Entra en conflicte" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "Reemplaça" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "Fa obsolet" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "Trenca" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "Millora" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "important" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "requerit" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "estàndard" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "opcional" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "extra" @@ -2798,12 +2798,12 @@ msgstr "S'està obrint %s" msgid "Line %u too long in source list %s." msgstr "La línia %u és massa llarga en la llista de fonts %s." -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "La línia %u és malformada en la llista de fonts %s (tipus)" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s" @@ -2972,14 +2972,14 @@ msgstr "La memòria cau té un sistema de versions incompatible" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 +#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 +#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 +#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 +#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 +#: apt-pkg/pkgcachegen.cc:561 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "S'ha produït un error en processar %s (%s%d)" @@ -3006,27 +3006,27 @@ msgstr "" "Uau, heu excedit el nombre de dependències que aquest APT és capaç de " "gestionar." -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:568 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "No s'ha trobat el paquet %s %s en processar les dependències del fitxer" -#: apt-pkg/pkgcachegen.cc:1150 +#: apt-pkg/pkgcachegen.cc:1197 #, c-format msgid "Couldn't stat source package list %s" msgstr "No s'ha pogut llegir la llista de paquets font %s" -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 +#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 msgid "Reading package lists" msgstr "S'està llegint la llista de paquets" -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1302 msgid "Collecting File Provides" msgstr "S'estan recollint els fitxers que proveeixen" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 msgid "IO Error saving source cache" msgstr "Error d'E/S en desar la memòria cau de la font" @@ -3243,22 +3243,22 @@ msgstr "S'està escrivint una nova llista de fonts\n" msgid "Source list entries for this disc are:\n" msgstr "Les entrades de la llista de fonts per a aquest disc són:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 #, c-format msgid "Wrote %i records.\n" msgstr "S'han escrit %i registres.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "S'han escrit %i registres, on falten %i fitxers.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "S'han escrit %i registres, on hi ha %i fitxers no coincidents\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/cs.po b/po/cs.po index ffe773302..84753c438 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2012-07-08 13:46+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -154,7 +154,7 @@ msgstr " Tabulka verzí:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1603,7 +1603,7 @@ msgstr "Vnitřní chyba" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 @@ -1727,7 +1727,7 @@ msgstr "" " -c=? Načte tento konfigurační soubor\n" " -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 #, c-format msgid "Unable to write to %s" msgstr "Nelze zapsat do %s" @@ -1736,31 +1736,31 @@ msgstr "Nelze zapsat do %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nelze určit verzi programu debconf. Je debconf nainstalován?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "Seznam rozšíření balíku je příliš dlouhý" #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format msgid "Error processing directory %s" msgstr "Chyba zpracování adresáře %s" -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "Seznam zdrojových rozšíření je příliš dlouhý" -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "Chyba při zapisování hlavičky do souboru" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, c-format msgid "Error processing contents %s" msgstr "Chyba při zpracovávání obsahu %s" -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1840,11 +1840,11 @@ msgstr "" " -c=? Načte tento konfigurační soubor\n" " -o=? Nastaví libovolnou volbu" -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "Žádný výběr nevyhověl" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Některé soubory chybí v balíkovém souboru skupiny %s" @@ -1872,8 +1872,8 @@ msgstr "" msgid "Unable to open DB file %s: %s" msgstr "Nelze otevřít DB soubor %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "Nelze vyhodnotit %s" @@ -1951,22 +1951,22 @@ msgstr " Odlinkovací limit %sB dosažen.\n" msgid "Archive had no package field" msgstr "Archiv nemá pole Package" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr " %s nemá žádnou položku pro override\n" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:814 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " správce %s je %s, ne %s\n" -#: ftparchive/writer.cc:708 +#: ftparchive/writer.cc:711 #, c-format msgid " %s has no source override entry\n" msgstr " %s nemá žádnou zdrojovou položku pro override\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:715 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s nemá ani žádnou binární položku pro override\n" @@ -2040,7 +2040,7 @@ msgstr "Chyba čtení při výpočtu MD5" msgid "Problem unlinking %s" msgstr "Problém s odlinkováním %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Selhalo přejmenování %s na %s" @@ -2184,54 +2184,54 @@ msgstr "Selhal zápis souboru %s" msgid "Failed to close file %s" msgstr "Selhalo zavření souboru %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "Cesta %s je příliš dlouhá" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "Rozbaluji %s vícekrát" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "Adresář %s je odkloněn" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Balík se pokouší zapisovat do diverzního cíle %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" msgstr "Diverzní cesta je příliš dlouhá" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Adresář %s bude nahrazen neadresářem" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "Nelze nalézt uzel v jeho hashovacím kbelíku" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "Cesta je příliš dlouhá" -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Přepsat vyhovující balík bez udání verze pro %s" -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Soubor %s/%s přepisuje ten z balíku %s" -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Nelze vyhodnotit %s" @@ -2616,59 +2616,59 @@ msgstr "Tato APT nepodporuje systém pro správu verzí „%s“" msgid "The package cache was built for a different architecture" msgstr "Cache balíků byla vytvořena pro jinou architekturu" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "Závisí na" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "Předzávisí na" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "Navrhuje" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "Doporučuje" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "Koliduje s" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "Nahrazuje" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "Zastarává" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "Porušuje" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "Rozšiřuje" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "důležitý" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "vyžadovaný" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "standardní" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "volitelný" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "extra" @@ -2768,12 +2768,12 @@ msgstr "Otevírám %s" msgid "Line %u too long in source list %s." msgstr "Řádek %u v seznamu zdrojů %s je příliš dlouhý." -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Zkomolený řádek %u v seznamu zdrojů %s (typ)" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ „%s“ na řádce %u v seznamu zdrojů %s není známý" @@ -2937,14 +2937,14 @@ msgstr "Cache má nekompatibilní systém správy verzí" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 +#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 +#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 +#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 +#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 +#: apt-pkg/pkgcachegen.cc:561 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Chyba při zpracování %s (%s%d)" @@ -2965,26 +2965,26 @@ msgstr "Wow, překročili jste počet popisů, které tato APT umí zpracovat." msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Wow, překročili jste počet závislostí, které tato APT umí zpracovat." -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:568 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Při zpracování závislostí nebyl nalezen balík %s %s" -#: apt-pkg/pkgcachegen.cc:1150 +#: apt-pkg/pkgcachegen.cc:1197 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nešlo vyhodnotit seznam zdrojových balíků %s" -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 +#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 msgid "Reading package lists" msgstr "Čtu seznamy balíků" -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1302 msgid "Collecting File Provides" msgstr "Collecting File poskytuje" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 msgid "IO Error saving source cache" msgstr "Chyba IO při ukládání zdrojové cache" @@ -3198,22 +3198,22 @@ msgstr "Zapisuji nový seznam balíků\n" msgid "Source list entries for this disc are:\n" msgstr "Seznamy zdrojů na tomto disku jsou:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 #, c-format msgid "Wrote %i records.\n" msgstr "Zapsáno %i záznamů.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Zapsáno %i záznamů s chybějícími soubory (%i).\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Zapsáno %i záznamů s nesouhlasícími soubory (%i).\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Zapsáno %i záznamů s chybějícími (%i) a nesouhlasícími (%i) soubory.\n" diff --git a/po/cy.po b/po/cy.po index ae7173a40..c689bbc91 100644 --- a/po/cy.po +++ b/po/cy.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries \n" "Language-Team: Welsh \n" @@ -173,7 +173,7 @@ msgstr " Tabl Fersiynnau:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1621,7 +1621,7 @@ msgstr "Gwall mewnol" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 @@ -1749,7 +1749,7 @@ msgstr "" " -c=? Darllen y ffeil cyfluniad hwn\n" " -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 #, c-format msgid "Unable to write to %s" msgstr "Ni ellir ysgrifennu i %s" @@ -1758,32 +1758,32 @@ msgstr "Ni ellir ysgrifennu i %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "Mae'r rhestr estyniad pecyn yn rhy hir." #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, fuzzy, c-format msgid "Error processing directory %s" msgstr "Gwall wrth brosesu'r cyfeiriadur %s" -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir" -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, fuzzy, c-format msgid "Error processing contents %s" msgstr "Gwall wrth Brosesu Cynnwys %s" # FIXME: full stops -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 #, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" @@ -1865,11 +1865,11 @@ msgstr "" " -c=? Darllen y ffeil cyfluniad hwn\n" " -o=? Gosod opsiwn cyfluniad mympwyol" -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "Dim dewisiadau'n cyfateb" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Mae rhai ffeiliau ar goll yn y grŵp ffeiliau pecyn `%s'" @@ -1895,8 +1895,8 @@ msgstr "" msgid "Unable to open DB file %s: %s" msgstr "Ni ellir agor y ffeil DB2 %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "Methodd stat() o %s" @@ -1975,22 +1975,22 @@ msgstr " Tarwyd y terfyn cyswllt %sB.\n" msgid "Archive had no package field" msgstr "Doedd dim maes pecyn gan yr archif" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:814 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " Cynaliwr %s yw %s nid %s\n" -#: ftparchive/writer.cc:708 +#: ftparchive/writer.cc:711 #, fuzzy, c-format msgid " %s has no source override entry\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:715 #, fuzzy, c-format msgid " %s has no binary override entry either\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" @@ -2065,7 +2065,7 @@ msgstr "Methwyd darllen wrth gyfrifo MD5" msgid "Problem unlinking %s" msgstr "Gwall wrth datgysylltu %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Methwyd ailenwi %s at %s" @@ -2215,56 +2215,56 @@ msgstr "Methwyd ysgrifennu ffeil %s" msgid "Failed to close file %s" msgstr "Methwyd cau ffeil %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "Mae'r llwybr %s yn rhy hir" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "Yn dadbacio %s mwy nag unwaith" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Mae'r pecyn yn ceisio ysgrifennu i'r targed dargyfeiriad %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" msgstr "Mae llwybr y dargyfeiriad yn rhy hir" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "" "Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "Methwyd lleoli nôd yn ei fwced stwnsh" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "Mae'r llwybr yn rhy hir" # FIXME: wtf? -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s" -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s" -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Ni ellir gwneud stat() o %s" @@ -2656,59 +2656,59 @@ msgstr "Nid yw'r APT yma yn cefnogi'r system fersiwn '%s'" msgid "The package cache was built for a different architecture" msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "Dibynnu" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "CynDdibynnu" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "Awgrymu" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "Argymell" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "Gwrthdaro" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "Amnewid" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "Darfodi" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "pwysig" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "angenrheidiol" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "safonnol" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "opsiynnol" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "ychwanegol" @@ -2818,12 +2818,12 @@ msgstr "Yn agor %s" msgid "Line %u too long in source list %s." msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, fuzzy, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s" @@ -2994,14 +2994,14 @@ msgstr "Mae can y storfa system fersiwn anghyfaddas" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 +#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 +#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 +#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 +#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 +#: apt-pkg/pkgcachegen.cc:561 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)" @@ -3025,27 +3025,27 @@ msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin." -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:568 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil" -#: apt-pkg/pkgcachegen.cc:1150 +#: apt-pkg/pkgcachegen.cc:1197 #, c-format msgid "Couldn't stat source package list %s" msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s" -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 +#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 #, fuzzy msgid "Reading package lists" msgstr "Yn Darllen Rhestrau Pecynnau" -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1302 msgid "Collecting File Provides" msgstr "Yn Casglu Darpariaethau Ffeil" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 msgid "IO Error saving source cache" msgstr "Gwall M/A wrth gadw'r storfa ffynhonell" @@ -3254,22 +3254,22 @@ msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/da.po b/po/da.po index db109ad0f..f40831ac1 100644 --- a/po/da.po +++ b/po/da.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2012-07-03 23:51+0200\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" @@ -160,7 +160,7 @@ msgstr " Versionstabel:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1614,7 +1614,7 @@ msgstr "Intern fejl" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 @@ -1744,7 +1744,7 @@ msgstr "" " -c=? Læs denne opsætningsfil\n" " -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 #, c-format msgid "Unable to write to %s" msgstr "Kunne ikke skrive til %s" @@ -1753,31 +1753,31 @@ msgstr "Kunne ikke skrive til %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Kan ikke finde debconfs version. Er debconf installeret?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "Pakkeudvidelseslisten er for lang" #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format msgid "Error processing directory %s" msgstr "Fejl under behandling af mappen %s" -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "Kildeudvidelseslisten er for lang" -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "Fejl under skrivning af hovedet til indholdsfil" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, c-format msgid "Error processing contents %s" msgstr "Fejl under behandling af indhold %s" -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1857,11 +1857,11 @@ msgstr "" " -c=? Læs denne opsætningsfil\n" " -o=? Sæt en opsætnings-indstilling" -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "Ingen valg passede" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Visse filer mangler i pakkefilgruppen »%s«" @@ -1889,8 +1889,8 @@ msgstr "" msgid "Unable to open DB file %s: %s" msgstr "Kunne ikke åbne DB-filen %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "Kunne ikke finde %s" @@ -1968,22 +1968,22 @@ msgstr " Nåede DeLink-begrænsningen på %sB.\n" msgid "Archive had no package field" msgstr "Arkivet havde intet package-felt" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr " %s har ingen tvangs-post\n" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:814 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " pakkeansvarlig for %s er %s, ikke %s\n" -#: ftparchive/writer.cc:708 +#: ftparchive/writer.cc:711 #, c-format msgid " %s has no source override entry\n" msgstr " %s har ingen linje med tilsidesættelse af standard for kildefiler\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:715 #, c-format msgid " %s has no binary override entry either\n" msgstr "" @@ -2058,7 +2058,7 @@ msgstr "Kunne ikke læse under beregning af MD5" msgid "Problem unlinking %s" msgstr "Problem under aflænkning af %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Kunne ikke omdøbe %s til %s" @@ -2203,54 +2203,54 @@ msgstr "Kunne ikke skrive filen %s" msgid "Failed to close file %s" msgstr "Kunne ikke lukke filen %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "Stien %s er for lang" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "Pakkede %s ud flere gange" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "Mappen %s er omrokeret" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Pakken forsøger at skrive til omrokeret mål %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" msgstr "Omrokeringsstien er for lang" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Mappen %s bliver erstattet af en ikke-mappe" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "Kunne ikke finde knuden i sin hash-bucket" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "Stien er for lang" -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Overskriv pakkematch uden version for %s" -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "File %s/%s overskriver filen i pakken %s" -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Kunne ikke finde %s" @@ -2636,59 +2636,59 @@ msgstr "Denne APT understøtter ikke versionssystemet '%s'" msgid "The package cache was built for a different architecture" msgstr "Pakke-mellemlageret er lavet til en anden arkitektur" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "Afhængigheder" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "Præ-afhængigheder" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "Foreslåede" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "Anbefalede" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "Konflikter" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "Erstatter" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "Overflødiggør" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "Ødelægger" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "Forbedringer" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "vigtig" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "krævet" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "frivillig" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "ekstra" @@ -2788,12 +2788,12 @@ msgstr "Åbner %s" msgid "Line %u too long in source list %s." msgstr "Linjen %u er for lang i kildelisten %s." -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Ugyldig linje %u i kildelisten %s (type)" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen '%s' er ukendt på linje %u i kildelisten %s" @@ -2959,14 +2959,14 @@ msgstr "Mellemlageret benytter en inkompatibel versionsstyring" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 +#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 +#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 +#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 +#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 +#: apt-pkg/pkgcachegen.cc:561 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Der opstod en fejl under behandlingen af %s (%s%d)" @@ -2989,26 +2989,26 @@ msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Hold da op! Du nåede over det antal afhængigheder, denne APT kan håndtere." -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:568 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Pakken %s %s blev ikke fundet under behandlingen af filafhængigheder" -#: apt-pkg/pkgcachegen.cc:1150 +#: apt-pkg/pkgcachegen.cc:1197 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kunne ikke finde kildepakkelisten %s" -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 +#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 msgid "Reading package lists" msgstr "Indlæser pakkelisterne" -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1302 msgid "Collecting File Provides" msgstr "Samler filudbud" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 msgid "IO Error saving source cache" msgstr "IO-fejl ved gemning af kilde-mellemlageret" @@ -3222,22 +3222,22 @@ msgstr "Skriver ny kildeliste\n" msgid "Source list entries for this disc are:\n" msgstr "Denne disk har følgende kildeliste-indgange:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 #, c-format msgid "Wrote %i records.\n" msgstr "Skrev %i poster.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Skrev %i poster med %i manglende filer.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Skrev %i poster med %i ikke-trufne filer\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Skrev %i poster med %i manglende filer og %i ikke-trufne filer\n" diff --git a/po/de.po b/po/de.po index 276c0def7..2b5ed7599 100644 --- a/po/de.po +++ b/po/de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.2\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2012-06-27 10:55+0200\n" "Last-Translator: Holger Wansing \n" "Language-Team: Debian German \n" @@ -161,7 +161,7 @@ msgstr " Versionstabelle:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1667,7 +1667,7 @@ msgstr "Interner Fehler" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 @@ -1797,7 +1797,7 @@ msgstr "" " -c=? Diese Konfigurationsdatei lesen\n" " -o=? Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 #, c-format msgid "Unable to write to %s" msgstr "Schreiben nach %s nicht möglich" @@ -1807,31 +1807,31 @@ msgid "Cannot get debconf version. Is debconf installed?" msgstr "" "Debconf-Version konnte nicht ermittelt werden. Ist debconf installiert?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "Paketerweiterungsliste ist zu lang." #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format msgid "Error processing directory %s" msgstr "Fehler beim Verarbeiten von Verzeichnis %s" -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "Quellerweiterungsliste ist zu lang." -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "Fehler beim Schreiben der Kopfzeilen in die Inhaltsdatei" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, c-format msgid "Error processing contents %s" msgstr "Fehler beim Verarbeiten der Inhalte %s" -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1918,11 +1918,11 @@ msgstr "" " -c=? diese Konfigurationsdatei lesen\n" " -o=? eine beliebige Konfigurationsoption setzen" -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "Keine Auswahl traf zu" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Einige Dateien fehlen in der Paketdateigruppe »%s«." @@ -1951,8 +1951,8 @@ msgstr "" msgid "Unable to open DB file %s: %s" msgstr "Datenbankdatei %s kann nicht geöffnet werden: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "%s mit »stat« abfragen fehlgeschlagen" @@ -2030,22 +2030,22 @@ msgstr " DeLink-Limit von %sB erreicht\n" msgid "Archive had no package field" msgstr "Archiv hatte kein Feld »package«" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr " %s hat keinen Eintrag in der Override-Liste.\n" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:814 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s-Betreuer ist %s und nicht %s.\n" -#: ftparchive/writer.cc:708 +#: ftparchive/writer.cc:711 #, c-format msgid " %s has no source override entry\n" msgstr " %s hat keinen Eintrag in der Source-Override-Liste.\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:715 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s hat keinen Eintrag in der Binary-Override-Liste.\n" @@ -2119,7 +2119,7 @@ msgstr "Lesevorgang während der MD5-Berechnung fehlgeschlagen" msgid "Problem unlinking %s" msgstr "Problem beim Entfernen (unlink) von %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "%s konnte nicht in %s umbenannt werden." @@ -2265,54 +2265,54 @@ msgstr "Datei %s konnte nicht geschrieben werden." msgid "Failed to close file %s" msgstr "Datei %s konnte nicht geschlossen werden." -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "Der Pfad %s ist zu lang." -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "%s mehr als einmal entpackt" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "Das Verzeichnis %s ist umgeleitet." -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Schreibversuch vom Paket auf das Umleitungsziel %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" msgstr "Der Umleitungspfad ist zu lang." -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Das Verzeichnis %s wird durch ein Nicht-Verzeichnis ersetzt." -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "Knoten konnte nicht in seinem Hash gefunden werden." -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "Der Pfad ist zu lang." -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Pakettreffer ohne Version für %s wird überschrieben." -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Durch die Datei %s/%s wird die Datei in Paket %s überschrieben." -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "%s mit »stat« abfragen nicht möglich" @@ -2710,59 +2710,59 @@ msgstr "Das Versionssystem »%s« wird durch dieses APT nicht unterstützt." msgid "The package cache was built for a different architecture" msgstr "Der Paketzwischenspeicher wurde für eine andere Architektur aufgebaut." -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "Hängt ab von" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "Hängt ab von (vorher)" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "Schlägt vor" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "Empfiehlt" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "Kollidiert mit" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "Ersetzt" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "Löst ab" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "Beschädigt" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "Wertet auf" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "wichtig" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "erforderlich" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "optional" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "extra" @@ -2863,12 +2863,12 @@ msgstr "%s wird geöffnet." msgid "Line %u too long in source list %s." msgstr "Zeile %u in Quellliste %s zu lang." -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ »%s« in Zeile %u der Quellliste %s ist unbekannt." @@ -3043,14 +3043,14 @@ msgstr "Zwischenspeicher hat ein inkompatibles Versionssystem." #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 +#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 +#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 +#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 +#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 +#: apt-pkg/pkgcachegen.cc:561 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Fehler aufgetreten beim Verarbeiten von %s (%s%d)" @@ -3079,27 +3079,27 @@ msgstr "" "Na so was, Sie haben die Anzahl an Abhängigkeiten überschritten, mit denen " "diese APT-Version umgehen kann." -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:568 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Paket %s %s wurde beim Verarbeiten der Dateiabhängigkeiten nicht gefunden." -#: apt-pkg/pkgcachegen.cc:1150 +#: apt-pkg/pkgcachegen.cc:1197 #, c-format msgid "Couldn't stat source package list %s" msgstr "Die Quellpaket-Liste %s konnte nicht mit »stat« abgefragt werden" -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 +#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 msgid "Reading package lists" msgstr "Paketlisten werden gelesen" -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1302 msgid "Collecting File Provides" msgstr "Sammeln der angebotenen Funktionalitäten (Provides) aus den Dateien" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 msgid "IO Error saving source cache" msgstr "E/A-Fehler beim Speichern des Quell-Zwischenspeichers" @@ -3316,22 +3316,22 @@ msgstr "Schreiben der neuen Quellliste\n" msgid "Source list entries for this disc are:\n" msgstr "Quelllisteneinträge für dieses Medium sind:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 #, c-format msgid "Wrote %i records.\n" msgstr "Es wurden %i Datensätze geschrieben.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Es wurden %i Datensätze mit %i fehlenden Dateien geschrieben.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Es wurden %i Datensätze mit %i nicht passenden Dateien geschrieben.\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/dz.po b/po/dz.po index 82257ac5e..be5733cd0 100644 --- a/po/dz.po +++ b/po/dz.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po.pot\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2006-09-19 09:49+0530\n" "Last-Translator: Kinley Tshering \n" "Language-Team: Dzongkha \n" @@ -161,7 +161,7 @@ msgstr "ཐོན་རིམ་ཐིག་ཁྲམ།:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1580,7 +1580,7 @@ msgstr "ནང་འཁོད་འཛོལ་བ།" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 @@ -1707,7 +1707,7 @@ msgstr "" " -o=? འདི་གིས་མཐུན་སྒྲིག་རིམ་སྒྲིག་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབདཝ་ཨིན་ དཔེར་ན་-o dir::cache=/tmp་" "བཟུམ།\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 #, c-format msgid "Unable to write to %s" msgstr " %sལུ་འབྲི་མ་ཚུགས།" @@ -1716,31 +1716,31 @@ msgstr " %sལུ་འབྲི་མ་ཚུགས།" msgid "Cannot get debconf version. Is debconf installed?" msgstr "debconf ་་འཐོན་རིམ་འདི་ལེན་མ་ཚུགས། debconf འདི་གཞི་བཙུགས་འབད་ཡི་ག་?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "ཐུམ་སྒྲིལ་རྒྱ་བསྐྱེད་ཐོག་ཡིག་འདི་གནམ་མེད་ས་མེད་རིངམ་འདུག" #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format msgid "Error processing directory %s" msgstr "སྣོད་ཐོ་%s་ལས་སྦྱོར་འབདཝ་ད་འཛོལ་བ་འཐོན་ཡི།" -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "འབྱུང་ཁུངས་རྒྱ་བསྐྱེད་ཀྱི་ཐོག་ཡིག་འདི་གནམ་མེད་ས་མེད་རིང་པས།" -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "ནང་དོན་ཡིག་སྣོད་ལུ་མགོ་ཡིག་འཛོལ་བ་འབྲི་ནིའི་མགོ་ཡིག" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, c-format msgid "Error processing contents %s" msgstr "%sའཛོལ་བ་ལས་སྦྱོར་འབད་ནིའི་ནང་དོན།" -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1824,11 +1824,11 @@ msgstr "" " -c=? འ་ནི་རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷག\n" " -o=? མཐུན་སྒྲིག་རིམ་སྒྲིག་གི་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབད།" -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "སེལ་འཐུ་ཚུ་མཐུན་སྒྲིག་མིན་འདུག" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་ཐུམ་སྒྲིལ་ཡིག་སྣོད་སྡེ་ཚན་`%s'ནང་བརླག་སྟོར་ཞུགས་ནུག" @@ -1857,8 +1857,8 @@ msgstr "" 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 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "%s་སིཊེཊི་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" @@ -1936,22 +1936,22 @@ msgstr "%sB་ཧེང་བཀལ་བཀྲམ་ནིའི་འབྲེ msgid "Archive had no package field" msgstr "ཡིག་མཛོད་ལུ་ཐུམ་སྒྲིལ་ཅི་ཡང་འཐུས་ཤོར་མ་བྱུང་།" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr " %sལུ་ཟུར་བཞག་ཐོ་བཀོད་མེད།\n" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:814 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s ་རྒྱུན་སྐྱོང་པ་འདི་ %s ཨིན་ %s མེན།\n" -#: ftparchive/writer.cc:708 +#: ftparchive/writer.cc:711 #, c-format msgid " %s has no source override entry\n" msgstr " %s ལུ་འབྱུང་ཁུངས་མེདཔ་གཏང་ནིའི་ཐོ་བཀོད་འདི་མེད།\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:715 #, c-format msgid " %s has no binary override entry either\n" msgstr " %sལུ་ཟུང་ལྡན་མེདཔ་གཏང་ནིའི་་ཐོ་བཀོད་གང་རུང་ཡང་མིན་འདུག།\n" @@ -2025,7 +2025,7 @@ msgstr "ཨེམ་ཌི་༥་གློག་རིག་རྐྱབ་པ msgid "Problem unlinking %s" msgstr "%s་འབྲེལ་འཐུད་མེདཔ་བཟོ་ནི་ལུ་དཀའ་ངལ།" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" @@ -2172,54 +2172,54 @@ msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལ msgid "Failed to close file %s" msgstr "%s་ཡིག་སྣོད་འདི་ཁ་བསྡམས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "%s་འགྲུལ་ལམ་དེ་གནམ་མེད་ས་མེད་རིངམ་འདུག" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "སྦུང་ཚན་བཟོ་བཤོལ་%s་གཅིག་ལས་ལྷག་སྟེ་འདུག" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "སྣོད་ཐོ་%s་འདི་ཁ་ཕྱོགས་སྒྱུར་དེ་ཡོད།" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "ཐུམ་སྒྲིལ་འདི་གིས་ག་སྒྱུར་དམིགས་གཏད་%s/%s་ལུ་འབྲི་ནིའི་འབད་རྩོལ་བསྐྱེདཔ་དེ་ཡོད།" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" msgstr "ཁ་སྒྱུར་འགྲུལ་ལམ་འདི་གནམ་མེད་ས་མེད་རིངམ་ཨིན་པས།" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "སྣོད་ཡིག་%s་འདི་སྣོད་ཡིག་མེན་མི་ཅིག་གིས་ཚབ་བཙུག་དེ་ཡོདཔ་ཨིན།" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "ཁོང་རའི་དྲྭ་རྟགས། (#)རྡོབ་ནང་ལུ་མཐུད་མཚམས་ག་ཡོད་འཚོལ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "འགྲུལ་ལམ་དེ་གནམ་མེད་ས་མེད་རིངམ་ཅིག་ཨིན་པས།" -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "%s་གི་དོན་ལུ་ཚབ་སྲུང་འབད་བའི་ཐུམ་སྒྲིལ་དེ་གིས་འཐོན་རིམ་གཅིག་ད་ཡང་མཐུན་སྒྲིག་མི་འབད་བས།" -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "ཐུམ་སྒྲིལ་%s་ནང་ལུ་་ཡིག་སྣོད་%s/%sགིས་གཅིག་ཚབ་སྲུང་འབདཝ་ཨིན།" -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "%s་འདི་ལུ་ངོ་བཤུས་འབད་མ་ཚུགས།" @@ -2602,59 +2602,59 @@ msgstr "འ་ནི་ཨེ་པི་ཊི་ འདི་གིས་ '%s' msgid "The package cache was built for a different architecture" msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་འདི་བཟོ་བཀོད་སོ་སོ་ཅིག་གི་དོན་ལུ་བཟོ་བརྩིགས་འབད་འབདཝ་ཨིནཔས།" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "རྟེནམ་ཨིན།" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "སྔོན་གོང་མ་རྟེནམ་ཨིན།" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "བསམ་འཆར་བཀོདཔ་ཨིན།" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "འོས་སྦྱོར་འབདཝ་ཨིན།" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "མི་མཐུནམ་ཨིན།" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "ཚབ་བཙུགསཔ་ཨིན།" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "ཕན་མེདཔ་བཟོཝ་ཨིན།" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "གལ་ཅན།" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "དགོས་མཁོ་ཡོདཔ།" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "ཚད་ལྡན།" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "གདམ་ཁ་ཅན།" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "ཐེབས།" @@ -2755,12 +2755,12 @@ msgstr "%s་ཁ་ཕྱེ་དོ།" msgid "Line %u too long in source list %s." msgstr "གྲལ་ཐིག་%u་འདི་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་ནང་ལུ་གནམ་མེད་ས་མེད་རིངམོ་འདུག" -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%u་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (དབྱེ་བ)་ནང་ན།" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།" @@ -2924,14 +2924,14 @@ msgstr "འདྲ་མཛོད་ལུ་མཐུན་འགྱུར་མ #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 +#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 +#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 +#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 +#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 +#: apt-pkg/pkgcachegen.cc:561 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "%s (པི་ཀེ་ཇི་འཚོལ་ནི)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག" @@ -2953,26 +2953,26 @@ msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊ msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་བརྟེན་པའི་ཨང་གྲངས་ལས་ལྷག་ནུག" -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:568 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "ཡིག་སྣོད་རྟེན་འབྲེལ་འདི་ཚུ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་ཐུམ་སྒྲིལ་ %s %s ་འདི་མ་ཐོབ་པས།" -#: apt-pkg/pkgcachegen.cc:1150 +#: apt-pkg/pkgcachegen.cc:1197 #, c-format msgid "Couldn't stat source package list %s" msgstr "འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས།" -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 +#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 msgid "Reading package lists" msgstr "ཐུམ་སྒྲིལ་ཐོ་ཡིག་ཚུ་ལྷག་དོ།" -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1302 msgid "Collecting File Provides" msgstr "ཡིག་སྣོད་བྱིན་མི་ཚུ་བསྡུ་ལེན་འབད་དོ།" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 msgid "IO Error saving source cache" msgstr "IO འཛོལ་བ་འབྱུང་ཁུངས་འདྲ་མཛོད་སྲུང་བཞག་འབད་དོ།" @@ -3178,22 +3178,22 @@ msgstr "འབྱུང་ཁུངས་ཀྱི་ཐོ་ཡིག་གས msgid "Source list entries for this disc are:\n" msgstr "འ་ནི་ ཌིསིཀ་གི་དོན་ལུ་ འབྱུང་ཁུངས་ཧྲིལ་བུ་ཚུ་:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 #, c-format msgid "Wrote %i records.\n" msgstr "%i་དྲན་མཐོ་དེ་ཚུ་བྲིས་ཡོད།\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i བྱིག་འགྱོ་ཡོད་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ %i དྲན་ཐོ་འདི་ཚུ་བྲིས་ཡོད།\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i་མཐུན་སྒྲིག་མེདཔ་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ %i་དྲན་ཐོ་ཚུ་བྲིས་བཞག་ཡོདཔ་ཨིན།\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/el.po b/po/el.po index 1fcf3303a..1ebee0ecb 100644 --- a/po/el.po +++ b/po/el.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_el\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2008-08-26 18:25+0300\n" "Last-Translator: Θανάσης Νάτσης \n" "Language-Team: Greek \n" @@ -166,7 +166,7 @@ msgstr " Πίνακας Έκδοσης:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1603,7 +1603,7 @@ msgstr "Εσωτερικό Σφάλμα" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 @@ -1730,7 +1730,7 @@ msgstr "" " -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n" " -o=? Καθορισμός αυθαίρετης επιλογής παραμέτρου, πχ -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 #, c-format msgid "Unable to write to %s" msgstr "Αδύνατη η εγγραφή στο %s" @@ -1739,31 +1739,31 @@ msgstr "Αδύνατη η εγγραφή στο %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Δεν βρέθηκε η έκδοση του debconf. Είναι το debconf εγκατεστημένο;" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "Ο κατάλογος επεκτάσεων του πακέτου είναι υπερβολικά μακρύς" #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format msgid "Error processing directory %s" msgstr "Σφάλμα επεξεργασίας του καταλόγου %s" -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "Ο κατάλογος επεκτάσεων των πηγών είναι υπερβολικά μακρύς" -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "Σφάλμα εγγραφής κεφαλίδων στο αρχείο περιεχομένων" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, c-format msgid "Error processing contents %s" msgstr "Σφάλμα επεξεργασίας περιεχομένων του %s" -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1847,11 +1847,11 @@ msgstr "" " -c=? Χρήση αυτού του αρχείου ρυθμίσεων\n" " -o=? Ορισμός αυθαίρετης επιλογής ρύθμισης" -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "Δεν ταιριαξε καμία επιλογή" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Λείπουν μερικά αρχεία από την ομάδα πακέτων '%s'" @@ -1880,8 +1880,8 @@ msgstr "" 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 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "Αποτυχία εύρεσης της κατάστασης του %s." @@ -1959,22 +1959,22 @@ msgstr " Αποσύνδεση ορίου του %sB hit.\n" msgid "Archive had no package field" msgstr "Η αρχειοθήκη δεν περιέχει πεδίο πακέτων" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr " %s δεν περιέχει εγγραφή παράκαμψης\n" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:814 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s συντηρητής είναι ο %s όχι ο %s\n" -#: ftparchive/writer.cc:708 +#: ftparchive/writer.cc:711 #, c-format msgid " %s has no source override entry\n" msgstr " %s δεν έχει εγγραφή πηγαίας παράκαμψης\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:715 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s δεν έχει ούτε εγγραφή δυαδικής παράκαμψης\n" @@ -2048,7 +2048,7 @@ msgstr "Αποτυχία ανάγνωσης κατά τον υπολογισμό msgid "Problem unlinking %s" msgstr "Πρόβλημα κατά την αποσύνδεση του %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Αποτυχία μετονομασίας του %s σε %s" @@ -2194,54 +2194,54 @@ msgstr "Αποτυχία εγγραφής του αρχείου %s" msgid "Failed to close file %s" msgstr "Αποτυχία στο κλείσιμο του αρχείου %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "Η διαδρομή %s έχει υπερβολικό μήκος" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "Αποσυμπίεση του %s πάνω από μια φορά" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "Ο φάκελος %s έχει εκτραπεί" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Το πακέτο προσπαθεί να γράψει στον προορισμό εκτροπής %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" msgstr "Η διαδρομή εκτροπής έχει υπερβολικό μήκος" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Ο φάκελος %s αντικαθίσταται από ένα μη-φάκελο" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "Αποτυχία εντοπισμού του κόμβου στην ομάδα hash του" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "Η διαδρομή έχει υπερβολικό μήκος" -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Αντικατάσταση πακέτου χωρίς καμία έκδοση %s" -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Το αρχείο %s/%s αντικαθιστά αυτό στο πακέτο %s" -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Αδύνατη η εύρεση της κατάστασης του %s" @@ -2630,59 +2630,59 @@ msgstr "Αυτό το APT δεν υποστηρίζει το Σύστημα Απ msgid "The package cache was built for a different architecture" msgstr "Η cache πακέτων κατασκευάστηκε για μια διαφορετική αρχιτεκτονική" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "Εξαρτάται από" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "ΠροΕξαρτάται από" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "Προτείνει" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "Συστήνει" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "Ασύμβατο με" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "Αντικαθιστά" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "Απαρχαιώνει" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "Χαλάει" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "σημαντικό" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "απαιτούμενο" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "καθιερωμένο" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "προαιρετικό" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "επιπλέον" @@ -2782,12 +2782,12 @@ msgstr "Άνοιγμα του %s" msgid "Line %u too long in source list %s." msgstr "Η γραμμή %u έχει υπερβολικό μήκος στη λίστα πηγών %s." -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (τύπος)" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος " @@ -2955,14 +2955,14 @@ msgstr "Η cache έχει ασύμβατο σύστημα απόδοσης έκ #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 +#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 +#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 +#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 +#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 +#: apt-pkg/pkgcachegen.cc:561 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (FindPkg)" @@ -2987,26 +2987,26 @@ msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Εκπληκτικό, υπερβήκατε τον αριθμό των εξαρτήσεων που υποστηρίζει το APT." -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:568 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Το πακέτο %s %s δε βρέθηκε κατά την επεξεργασία εξαρτήσεων του αρχείου" -#: apt-pkg/pkgcachegen.cc:1150 +#: apt-pkg/pkgcachegen.cc:1197 #, c-format msgid "Couldn't stat source package list %s" msgstr "Αδύνατη η εύρεση της κατάστασης της λίστας πηγαίων πακέτων %s" -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 +#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 msgid "Reading package lists" msgstr "Ανάγνωση Λιστών Πακέτων" -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1302 msgid "Collecting File Provides" msgstr "Συλλογή Παροχών Αρχείου" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 msgid "IO Error saving source cache" msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγών" @@ -3213,22 +3213,22 @@ msgstr "Eγγραφή νέας λίστας πηγών\n" msgid "Source list entries for this disc are:\n" msgstr "Οι κατάλογοι με τις πηγές αυτού του δίσκου είναι: \n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 #, c-format msgid "Wrote %i records.\n" msgstr "Εγιναν %i εγγραφές.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Εγιναν %i εγγραφές με %i ασύμβατα αρχεία.\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία και %i ασύμβατα αρχεία\n" diff --git a/po/es.po b/po/es.po index 0307f0558..7b4bbb931 100644 --- a/po/es.po +++ b/po/es.po @@ -33,7 +33,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.10\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2011-01-24 11:47+0100\n" "Last-Translator: Javier Fernández-Sanguino Peña \n" "Language-Team: Debian Spanish \n" @@ -211,7 +211,7 @@ msgstr " Tabla de versión:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1665,7 +1665,7 @@ msgstr "Error interno" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 @@ -1797,7 +1797,7 @@ msgstr "" " -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::" "cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 #, c-format msgid "Unable to write to %s" msgstr "No se puede escribir en %s" @@ -1806,31 +1806,31 @@ msgstr "No se puede escribir en %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "No se puede encontrar la versión de debconf. ¿Está debconf instalado?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "La lista de extensión de paquetes es demasiado larga" #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format msgid "Error processing directory %s" msgstr "Error procesando el directorio %s" -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "La lista de extensión de fuentes es demasiado larga" -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "Error escribiendo cabeceras de archivos de contenido" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, c-format msgid "Error processing contents %s" msgstr "Error procesando contenidos %s" -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1915,11 +1915,11 @@ msgstr "" " -c=? Lee este archivo de configuración\n" " -o=? Establece una opción de configuración arbitraria" -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "Ninguna selección coincide" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Faltan algunos archivos en el grupo de archivo de paquetes «%s»" @@ -1947,8 +1947,8 @@ msgstr "" msgid "Unable to open DB file %s: %s" msgstr "No se pudo abrir el archivo DB %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "No pude leer %s" @@ -2026,22 +2026,22 @@ msgstr " DeLink se ha llegado al límite de %sB.\n" msgid "Archive had no package field" msgstr "Archivo no tiene campo de paquetes" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr " %s no tiene entrada de predominio\n" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:814 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " el encargado de %s es %s y no %s\n" -#: ftparchive/writer.cc:708 +#: ftparchive/writer.cc:711 #, c-format msgid " %s has no source override entry\n" msgstr " %s no tiene una entrada fuente predominante\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:715 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s tampoco tiene una entrada binaria predominante\n" @@ -2115,7 +2115,7 @@ msgstr "No se pudo leer mientras se computaba MD5" msgid "Problem unlinking %s" msgstr "Se produjo un problema al desligar %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Falló el renombre de %s a %s" @@ -2263,54 +2263,54 @@ msgstr "Falló la escritura del archivo %s" msgid "Failed to close file %s" msgstr "No pude cerrar el archivo %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "La trayectoria %s es demasiado larga" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "Desempaquetando %s más de una vez" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "El directorio %s está desviado" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "El paquete está tratando de escribir al blanco desviado %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" msgstr "La trayectoria de desviación es demasiado larga" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "El directorio %s está siendo reemplazado por un no-directorio" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "No pude localizar el nodo en su bote de enlace" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "La trayectoria es muy larga" -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Sobreescribiendo concordancia del paquete sin versión para %s" -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "El archivo %s/%s sobreescribe al que está en el paquete %s" -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "No pude leer %s" @@ -2701,59 +2701,59 @@ msgstr "Esta versión de APT no soporta el sistema de versiones «%s»" msgid "The package cache was built for a different architecture" msgstr "La caché de paquetes se había creado para una arquitectura diferente" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "Depende" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "PreDepende" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "Sugiere" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "Recomienda" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "Entra en conflicto" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "Reemplaza" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "Hace obsoleto" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "Rompe" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "Mejora" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "importante" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "requiere" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "estándar" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "opcional" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "extra" @@ -2859,12 +2859,12 @@ msgstr "Abriendo %s" msgid "Line %u too long in source list %s." msgstr "Línea %u demasiado larga en la lista de fuentes %s." -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Línea %u mal formada en la lista de fuentes %s (tipo)" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipo «%s» desconocido en la línea %u de lista de fuentes %s" @@ -3034,14 +3034,14 @@ msgstr "La caché tiene una versión incompatible de sistema de versiones" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 +#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 +#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 +#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 +#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 +#: apt-pkg/pkgcachegen.cc:561 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Se produjo un error mientras se procesaba %s (FindPkg)" @@ -3066,27 +3066,27 @@ msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Vaya, excedió el número de dependencias que este APT es capaz de manejar." -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:568 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Al procesar las dependencias de archivos no se encontró el paquete %s %s" -#: apt-pkg/pkgcachegen.cc:1150 +#: apt-pkg/pkgcachegen.cc:1197 #, c-format msgid "Couldn't stat source package list %s" msgstr "No se puede leer la lista de paquetes fuente %s" -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 +#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 msgid "Reading package lists" msgstr "Leyendo lista de paquetes" -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1302 msgid "Collecting File Provides" msgstr "Recogiendo archivos que proveen" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 msgid "IO Error saving source cache" msgstr "Error de E/S guardando caché fuente" @@ -3301,22 +3301,22 @@ msgstr "Escribiendo nueva lista de fuente\n" msgid "Source list entries for this disc are:\n" msgstr "Las entradas de la lista de fuentes para este disco son:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 #, c-format msgid "Wrote %i records.\n" msgstr "%i registros escritos.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i registros escritos con %i fichero de menos.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i registros escritos con %i fichero mal emparejado\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/eu.po b/po/eu.po index 083704182..c11691f86 100644 --- a/po/eu.po +++ b/po/eu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_eu\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2009-05-17 00:41+0200\n" "Last-Translator: Piarres Beobide \n" "Language-Team: Euskara \n" @@ -159,7 +159,7 @@ msgstr " Bertsio taula:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1586,7 +1586,7 @@ msgstr "Barne errorea" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 @@ -1711,7 +1711,7 @@ msgstr "" " -c=? Irakurri konfigurazio fitxategi hau\n" " -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 #, c-format msgid "Unable to write to %s" msgstr "%s : ezin da idatzi" @@ -1720,31 +1720,31 @@ msgstr "%s : ezin da idatzi" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Ezin da debconf bertsioa eskuratu. Debconf instalatuta dago?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "Pakete luzapenen zerrenda luzeegia da" #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format msgid "Error processing directory %s" msgstr "Errorea direktorioa prozesatzean %s" -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "Iturburu luzapenen zerrenda luzeegia da" -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "Errorea eduki fitxategiaren goiburua idaztean" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, c-format msgid "Error processing contents %s" msgstr "Errorea edukiak prozesatzean %s" -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1823,11 +1823,11 @@ msgstr "" " -c=? Irakurri konfigurazio fitxategi hau\n" " -o=? Ezarri konfigurazio aukera arbitrario bat" -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "Ez dago bat datorren hautapenik" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Fitxategi batzuk falta dira `%s' pakete fitxategien taldean" @@ -1856,8 +1856,8 @@ msgstr "" msgid "Unable to open DB file %s: %s" msgstr "Ezin da ireki %s datu-base fitxategia: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "Huts egin du %s(e)tik datuak lortzean" @@ -1935,22 +1935,22 @@ msgstr " DeLink-en mugara (%sB) heldu da.\n" msgid "Archive had no package field" msgstr "Artxiboak ez du pakete eremurik" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr " %s: ez du override sarrerarik\n" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:814 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s mantentzailea %s da, eta ez %s\n" -#: ftparchive/writer.cc:708 +#: ftparchive/writer.cc:711 #, c-format msgid " %s has no source override entry\n" msgstr " %s: ez du jatorri gainidazketa sarrerarik\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:715 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s: ez du bitar gainidazketa sarrerarik\n" @@ -2024,7 +2024,7 @@ msgstr "Huts egin du MD5 konputatzean" msgid "Problem unlinking %s" msgstr "Arazoa %s desestekatzean" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Huts egin du %s izenaren ordez %s ipintzean" @@ -2169,54 +2169,54 @@ msgstr "Ezin izan da %s fitxategian idatzi" msgid "Failed to close file %s" msgstr "Ezin izan da %s fitxategia itxi" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "%s bidea luzeegia da" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "%s behin baino gehiagotan deskonprimitzen" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "%s direktorioa desbideratuta dago" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Paketea desbideratze helburuan %s/%s idazten saiatzen ari da" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" msgstr "Desbideratzearen bidea luzeegia da" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "%s direktorioa ez-direktorio batekin ordezten ari da" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "Huts egin du nodoa bere hash-ontzian lokalizatzean" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "Bidea luzeegia da" -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Gainidatzi pakete-konkordantzia %s(r)en bertsiorik gabe" -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "%s/%s fitxategiak %s paketekoa gainidazten du" -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Ezin da daturik lortu %s(e)tik" @@ -2604,59 +2604,59 @@ msgstr "APT honek ez du '%s' bertsio sistema onartzen" msgid "The package cache was built for a different architecture" msgstr "Paketeen katxea beste arkitektura batentzat sortuta dago" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "Mendekotasuna:" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "Aurremendekotasuna:" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "Iradokizuna:" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "Gomendioa:" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "Gatazka:" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "Ordeztea:" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "Zaharkitzea:" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "Apurturik" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "garrantzitsua" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "beharrezkoa" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "estandarra" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "aukerakoa" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "estra" @@ -2756,12 +2756,12 @@ msgstr "%s irekitzen" msgid "Line %u too long in source list %s." msgstr "%2$s iturburu zerrendako %1$u lerroa luzeegia da." -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (type)" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "'%s' mota ez da ezagutzen %u lerroan %s Iturburu zerrendan" @@ -2923,14 +2923,14 @@ msgstr "Katxearen bertsio sistema ez da bateragarria" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 +#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 +#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 +#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 +#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 +#: apt-pkg/pkgcachegen.cc:561 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Errorea gertatu da %s prozesatzean (FindPkg)" @@ -2951,26 +2951,26 @@ msgstr "APT honek maneia dezakeen azalpen kopurua gainditu duzu." msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "APT honek maneia dezakeen mendekotasun muga gainditu duzu." -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:568 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "%s %s paketea ez da aurkitu fitxategi mendekotasunak prozesatzean" -#: apt-pkg/pkgcachegen.cc:1150 +#: apt-pkg/pkgcachegen.cc:1197 #, c-format msgid "Couldn't stat source package list %s" msgstr "Ezin da atzitu %s iturburu paketeen zerrenda" -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 +#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 msgid "Reading package lists" msgstr "Pakete Zerrenda irakurtzen" -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1302 msgid "Collecting File Provides" msgstr "Fitxategiaren erreferentziak biltzen" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 msgid "IO Error saving source cache" msgstr "S/I errorea iturburu katxea gordetzean" @@ -3177,22 +3177,22 @@ msgstr "Jatorri zerrenda berria idazten\n" msgid "Source list entries for this disc are:\n" msgstr "Diskoarentzako jatorri sarrerak:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 #, c-format msgid "Wrote %i records.\n" msgstr "%i erregistro grabaturik.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i erregistro eta %i galdutako fitxategi grabaturik.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i erregistro eta %i okerreko fitxategi grabaturik\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/fi.po b/po/fi.po index 0157fcf3b..183d7c395 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2008-12-11 14:52+0200\n" "Last-Translator: Tapio Lehtonen \n" "Language-Team: Finnish \n" @@ -157,7 +157,7 @@ msgstr " Versiotaulukko:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1578,7 +1578,7 @@ msgstr "Sisäinen virhe" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 @@ -1704,7 +1704,7 @@ msgstr "" " -c=? Lue tämä asetustiedosto\n" " -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 #, c-format msgid "Unable to write to %s" msgstr "Tiedostoon %s kirjoittaminen ei onnistu" @@ -1713,32 +1713,32 @@ msgstr "Tiedostoon %s kirjoittaminen ei onnistu" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Ohjelman debconf versiota ei saa selvitettyä. Onko debconf asennettu?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "Paketin laajennuslista on liian pitkä" #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format msgid "Error processing directory %s" msgstr "Tapahtui virhe käsiteltäessa kansiota %s" -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "Lähteiden laajennuslista on liian pitkä" -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "" "Tapahtui virhe kirjoitettaessa otsikkotietoa sisällysluettelotiedostoon" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, c-format msgid "Error processing contents %s" msgstr "Tapahtui virhe käsiteltäessä sisällysluetteloa %s" -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1820,11 +1820,11 @@ msgstr "" " -c=? Lue tämä asetustiedosto\n" " -o=? Aseta mikä asetusvalitsin tahansa" -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "Mitkään valinnat eivät täsmänneet" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Pakettitiedostojen ryhmästä \"%s\" puuttuu joitain tiedostoja" @@ -1853,8 +1853,8 @@ msgstr "" msgid "Unable to open DB file %s: %s" msgstr "Tietokantatiedostoa %s ei saatu avattua: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "Tiedostolle %s ei toimi stat" @@ -1932,22 +1932,22 @@ msgstr " DeLinkin yläraja %st saavutettu.\n" msgid "Archive had no package field" msgstr "Arkistossa ei ollut pakettikenttää" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr " %s:llä ei ole poikkeustietuetta\n" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:814 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s ylläpitäjä on %s eikä %s\n" -#: ftparchive/writer.cc:708 +#: ftparchive/writer.cc:711 #, c-format msgid " %s has no source override entry\n" msgstr " %s:llä ei ole poikkeustietuetta\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:715 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s:llä ei ole binääristäkään poikkeustietuetta\n" @@ -2021,7 +2021,7 @@ msgstr "Lukeminen ei onnistunut laskettaessa MD5:ttä" msgid "Problem unlinking %s" msgstr "Ilmeni pulmia poistettaessa tiedosto %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Nimen muuttaminen %s -> %s ei onnistunut" @@ -2166,54 +2166,54 @@ msgstr "Tiedoston %s kirjoittaminen ei onnistunut" msgid "Failed to close file %s" msgstr "Tiedoston %s sulkeminen ei onnistunut" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "Polku %s on liian pitkä" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "Purettiin %s useammin kuin kerran" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "Kansio %s on korvautunut" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Paketti yrittää kirjoittaa korvautuksen kohteeseen %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" msgstr "Korvautuspolku on liian pitkä" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Kansiota %s ollaan korvaamassa muulla kuin kansiolla" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "Solmua ei löytynyt sen hajautuslokerosta" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "Polku on liian pitkä" -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Päälle kirjoitettava paketti täsmää mutta paketille %s ei ole versiota" -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Tiedosto %s/%s kirjoitetaan paketista %s tulleen päälle" -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Tiedostolle %s ei toimi stat" @@ -2596,59 +2596,59 @@ msgstr "Tämä APT ei tue versionhallintajärjestelmää \"%s\"" msgid "The package cache was built for a different architecture" msgstr "Pakettivarasto on tehty muulle arkkitehtuurille" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "Riippuvuudet" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "Esiriippuvuudet" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "Ehdotukset" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "Suosittelut" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "Ristiriidat" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "Korvaavuudet" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "Täydet korvaavuudet" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "Rikkoo" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "tärkeä" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "välttämätön" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "perus" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "valinnainen" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "ylimääräinen" @@ -2748,12 +2748,12 @@ msgstr "Avataan %s" msgid "Line %u too long in source list %s." msgstr "Rivi %u on liian pitkä lähdeluettelossa %s." -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Rivi %u on väärän muotoinen lähdeluettelossa %s (tyyppi)" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s" @@ -2914,14 +2914,14 @@ msgstr "Pakettivaraston versionhallintajärjestelmä ei ole yhteensopiva" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 +#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 +#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 +#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 +#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 +#: apt-pkg/pkgcachegen.cc:561 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Tapahtui virhe käsiteltäessä %s (FindPkg)" @@ -2943,26 +2943,26 @@ msgstr "Jummijammi, tämä APT ei osaa käsitellä noin montaa kuvausta." msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Jummijammi, annoit enemmän riippuvuuksia kuin tämä APT osaa käsitellä." -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:568 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Pakettia %s %s ei löytynyt käsiteltäessä tiedostojen riippuvuuksia." -#: apt-pkg/pkgcachegen.cc:1150 +#: apt-pkg/pkgcachegen.cc:1197 #, c-format msgid "Couldn't stat source package list %s" msgstr "stat ei toiminut lähdepakettiluettelolle %s" -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 +#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 msgid "Reading package lists" msgstr "Luetaan pakettiluetteloita" -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1302 msgid "Collecting File Provides" msgstr "Kootaan tiedostojen tarjoamistietoja" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 msgid "IO Error saving source cache" msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa" @@ -3169,22 +3169,22 @@ msgstr "Kirjoitetaan uusi lähdeluettelo\n" msgid "Source list entries for this disc are:\n" msgstr "Tämän levyn lähdekoodipakettien luettelon tietueita ovat:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 #, c-format msgid "Wrote %i records.\n" msgstr "Kirjoitettiin %i tietuetta.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Kirjoitettiin %i tietuetta joissa oli %i puuttuvaa tiedostoa.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Kirjoitettiin %i tietuetta joissa oli %i paritonta tiedostoa\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/fr.po b/po/fr.po index 7fed47867..e7de53c30 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2013-03-24 08:57+0100\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" @@ -156,7 +156,7 @@ msgstr " Table de version :" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1663,7 +1663,7 @@ msgstr "Erreur interne" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 @@ -1793,7 +1793,7 @@ msgstr "" " -c=? Lit ce fichier de configuration\n" " -o=? Spécifie une option de configuration, p. ex. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 #, c-format msgid "Unable to write to %s" msgstr "Impossible d'écrire sur %s" @@ -1803,31 +1803,31 @@ msgid "Cannot get debconf version. Is debconf installed?" msgstr "" "Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "La liste d'extension du paquet est trop longue" #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format msgid "Error processing directory %s" msgstr "Erreur lors du traitement du répertoire %s" -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "La liste d'extension des sources est trop grande" -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "Erreur lors de l'écriture de l'en-tête du fichier contenu" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, c-format msgid "Error processing contents %s" msgstr "Erreur du traitement du contenu %s" -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1910,11 +1910,11 @@ msgstr "" " -c=? Lit ce fichier de configuration\n" " -o=? Place une option de configuration arbitraire" -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "Aucune sélection ne correspond" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "" @@ -1943,8 +1943,8 @@ msgstr "" msgid "Unable to open DB file %s: %s" msgstr "Impossible d'ouvrir le fichier de base de données %s : %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "Impossible de statuer %s" @@ -2022,22 +2022,22 @@ msgstr " Seuil de delink de %so atteint.\n" msgid "Archive had no package field" msgstr "L'archive ne possède pas de champ de paquet" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr "%s ne possède pas d'entrée « override »\n" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:814 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " le responsable de %s est %s et non %s\n" -#: ftparchive/writer.cc:708 +#: ftparchive/writer.cc:711 #, c-format msgid " %s has no source override entry\n" msgstr " %s ne possède pas d'entrée « source override »\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:715 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s ne possède pas également pas d'entrée « binary override »\n" @@ -2111,7 +2111,7 @@ msgstr "Impossible de lire lors du calcul de la somme MD5" msgid "Problem unlinking %s" msgstr "Problème en déliant %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Impossible de changer le nom %s en %s" @@ -2259,54 +2259,54 @@ msgstr "Erreur d'écriture du fichier %s" msgid "Failed to close file %s" msgstr "Échec de clôture du fichier %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "Le chemin %s est trop long" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "Veuillez décompresser %s plus d'une fois" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "Le répertoire %s est détourné" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Le paquet est en train d'essayer d'écrire sur la cible détournée %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" msgstr "Le chemin de déviation est trop long" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Le répertoire %s va être remplacé par un non-répertoire" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "Échec pour localiser le nœud dans la table de hachage" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "Le chemin est trop long" -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Écrase la correspondance de paquet sans version pour %s " -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Le fichier %s/%s écrase celui inclus dans le paquet %s" -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Impossible de statuer pour %s." @@ -2705,59 +2705,59 @@ msgstr "Cet APT ne supporte pas le système de version « %s »" msgid "The package cache was built for a different architecture" msgstr "Le cache des paquets a été construit pour une architecture différente" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "Dépend" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "Pré-Dépend" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "Suggère" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "Recommande" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "Est en conflit avec" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "Remplace" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "Rend obsolète" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "Casse" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "Améliore" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "important" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "nécessaire" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "optionnel" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "supplémentaire" @@ -2867,12 +2867,12 @@ msgstr "Ouverture de %s" msgid "Line %u too long in source list %s." msgstr "La ligne %u du fichier des listes de sources %s est trop longue." -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Ligne %u mal formée dans la liste des sources %s (type)" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" @@ -3049,14 +3049,14 @@ msgstr "Le cache possède un système de version incompatible" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 +#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 +#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 +#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 +#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 +#: apt-pkg/pkgcachegen.cc:561 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Erreur apparue lors du traitement de %s (%s%d)" @@ -3085,28 +3085,28 @@ msgstr "" "Vous avez dépassé le nombre de dépendances que cette version d'APT est " "capable de traiter." -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:568 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Le paquet %s %s n'a pu être trouvé lors du traitement des dépendances des " "fichiers" -#: apt-pkg/pkgcachegen.cc:1150 +#: apt-pkg/pkgcachegen.cc:1197 #, c-format msgid "Couldn't stat source package list %s" msgstr "Impossible de localiser la liste des paquets sources %s" -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 +#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 msgid "Reading package lists" msgstr "Lecture des listes de paquets" -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1302 msgid "Collecting File Provides" msgstr "Assemblage des fichiers listés dans les champs Provides" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 msgid "IO Error saving source cache" msgstr "" "Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources" @@ -3325,22 +3325,22 @@ msgstr "Écriture de la nouvelle liste de sources\n" msgid "Source list entries for this disc are:\n" msgstr "Les entrées de listes de sources pour ce disque sont :\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 #, c-format msgid "Wrote %i records.\n" msgstr "%i enregistrements écrits.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i enregistrements écrits avec %i fichiers manquants.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i enregistrements écrits avec %i fichiers qui ne correspondent pas\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/gl.po b/po/gl.po index 0ce8a5354..4cc56f784 100644 --- a/po/gl.po +++ b/po/gl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_gl\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2011-05-12 15:28+0100\n" "Last-Translator: Miguel Anxo Bouzada \n" "Language-Team: galician \n" @@ -161,7 +161,7 @@ msgstr " Táboa de versións:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1614,7 +1614,7 @@ msgstr "Produciuse un erro interno" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 @@ -1743,7 +1743,7 @@ msgstr "" " -o=? Estabelece unha opción de configuración, por exemplo: -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 #, c-format msgid "Unable to write to %s" msgstr "Non é posíbel escribir en %s" @@ -1752,31 +1752,31 @@ msgstr "Non é posíbel escribir en %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Non é posíbel obter a versión de debconf. Debconf está instalado?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "A lista de extensións de paquetes é longa de máis" #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format msgid "Error processing directory %s" msgstr "Produciuse un erro ao procesar o directorio %s" -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "A lista de extensións de fontes é longa de máis" -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "Produciuse un erro ao gravar a cabeceira no ficheiro de contido" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, c-format msgid "Error processing contents %s" msgstr "Produciuse un erro ao procesar o contido %s" -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1859,11 +1859,11 @@ msgstr "" " -c=? Le este ficheiro de configuración\n" " -o=? Estabelece unha opción de configuración" -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "Non coincide ningunha selección" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Faltan ficheiros no grupo de ficheiros de paquetes «%s»" @@ -1891,8 +1891,8 @@ msgstr "" msgid "Unable to open DB file %s: %s" msgstr "Non é posíbel abrir o ficheiro de base de datos %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "Non foi posíbel determinar o estado %s" @@ -1970,22 +1970,22 @@ msgstr " Acadouse o límite de desligado de %sB.\n" msgid "Archive had no package field" msgstr "O arquivo non tiña un campo Package" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr " %s non ten unha entrada de «override»\n" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:814 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " O mantedor de %s é %s, non %s\n" -#: ftparchive/writer.cc:708 +#: ftparchive/writer.cc:711 #, c-format msgid " %s has no source override entry\n" msgstr " %s non ten unha entrada de «override» de código fonte\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:715 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s tampouco ten unha entrada de «override» de binarios\n" @@ -2059,7 +2059,7 @@ msgstr "Non foi posíbel ler ao calcular o MD5" msgid "Problem unlinking %s" msgstr "Xurdiu un problema ao desligar %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Non foi posíbel cambiar o nome de %s a %s" @@ -2206,54 +2206,54 @@ msgstr "Non foi posíbel escribir no ficheiro «%s»" msgid "Failed to close file %s" msgstr "Non foi posíbel pechar o ficheiro %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "A ruta %s é longa de máis" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "Desempaquetando %s máis dunha vez" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "O directorio %s está desviado" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "O paquete tenta escribir no destino do desvío %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" msgstr "A ruta do desvío é longa de máis" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "O directorio %s estase a substituír por algo que non é un directorio" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "Non foi posíbel atopar o nodo no seu contedor hash" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "A ruta é longa de máis" -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Coincidencia na sobrescritura sen versión para %s" -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "O ficheiro %s/%s sobrescribe o do paquete %s" -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Non é posíbel determinar o estado %s" @@ -2647,59 +2647,59 @@ msgstr "Este APT non admite o sistema de versionado «%s»" msgid "The package cache was built for a different architecture" msgstr "A caché de paquetes construíuse para unha arquitectura diferente" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "Depende" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "PreDepende" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "Suxire" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "Recomenda" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "Conflitos" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "Substitúe a" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "Fai obsoleto a" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "Estraga" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "Mellora" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "importante" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "requirido" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "estándar" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "opcional" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "extra" @@ -2803,12 +2803,12 @@ msgstr "Abrindo %s" msgid "Line %u too long in source list %s." msgstr "Liña %u longa de máis na lista de orixes %s." -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Liña %u mal construída na lista de orixes %s (tipo)" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "O tipo «%s» non se coñece na liña %u da lista de orixes %s" @@ -2976,14 +2976,14 @@ msgstr "A caché ten un sistema de versionado incompatíbel" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 +#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 +#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 +#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 +#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 +#: apt-pkg/pkgcachegen.cc:561 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Produciuse un erro ao procesar %s (FindPkg)" @@ -3005,28 +3005,28 @@ msgstr "Vaites!, superou o número de descricións que este APT pode manexar." msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Vaites!, superou o número de dependencias que este APT pode manexar." -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:568 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Non foi posíbel atopar o paquete %s %s ao procesar as dependencias de " "ficheiros" -#: apt-pkg/pkgcachegen.cc:1150 +#: apt-pkg/pkgcachegen.cc:1197 #, c-format msgid "Couldn't stat source package list %s" msgstr "Non foi posíbel atopar a lista de paquetes fonte %s" -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 +#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 msgid "Reading package lists" msgstr "Lendo as listas de paquetes" -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1302 msgid "Collecting File Provides" msgstr "Recollendo as provisións de ficheiros" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 msgid "IO Error saving source cache" msgstr "Produciuse un erro de E/S ao gravar a caché de fontes" @@ -3241,22 +3241,22 @@ msgstr "Escribindo a nova lista de orixes\n" msgid "Source list entries for this disc are:\n" msgstr "As entradas da lista de orixes deste disco son:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 #, c-format msgid "Wrote %i records.\n" msgstr "Escribíronse %i rexistros.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Escribíronse %i rexistros con %i ficheiros que faltan.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Escribíronse %i rexistros con %i ficheiros que non coinciden\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/hu.po b/po/hu.po index a5714f56d..5fb2a35b0 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt trunk\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2012-06-25 17:09+0200\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -159,7 +159,7 @@ msgstr " Verziótáblázat:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1620,7 +1620,7 @@ msgstr "Belső hiba" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 @@ -1748,7 +1748,7 @@ msgstr "" " -c=? Ezt a konfigurációs fájlt olvassa be\n" " -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 #, c-format msgid "Unable to write to %s" msgstr "Nem lehet írni ebbe: %s" @@ -1757,31 +1757,31 @@ msgstr "Nem lehet írni ebbe: %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nem lehet megállapítani a debconf verziót. A debconf telepítve van?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "A csomagkiterjesztések listája túl hosszú" #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format msgid "Error processing directory %s" msgstr "Hiba a(z) %s könyvtár feldolgozásakor" -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "A forráskiterjesztések listája túl hosszú" -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "Hiba a tartalomfájl fejlécének írásakor" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, c-format msgid "Error processing contents %s" msgstr "Hiba %s tartalmának feldolgozásakor" -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1863,11 +1863,11 @@ msgstr "" " -c=? Ezt a konfigurációs fájlt olvassa be\n" " -o=? Beállít egy tetszőleges konfigurációs opciót" -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "Nincs illeszkedő kiválasztás" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Néhány fájl hiányzik a(z) „%s” csomagfájlcsoportból" @@ -1895,8 +1895,8 @@ msgstr "" msgid "Unable to open DB file %s: %s" msgstr "A(z) %s DB fájlt nem lehet megnyitni: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "%s elérése sikertelen" @@ -1974,22 +1974,22 @@ msgstr " a DeLink korlátja (%sB) elérve.\n" msgid "Archive had no package field" msgstr "Az archívumnak nem volt csomag mezője" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr " %s nem rendelkezik felülbíráló bejegyzéssel\n" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:814 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s karbantartója %s, nem %s\n" -#: ftparchive/writer.cc:708 +#: ftparchive/writer.cc:711 #, c-format msgid " %s has no source override entry\n" msgstr " %s nem rendelkezik forrás-felülbíráló bejegyzéssel\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:715 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s nem rendelkezik bináris-felülbíráló bejegyzéssel sem\n" @@ -2063,7 +2063,7 @@ msgstr "Olvasási hiba az MD5 kiszámításakor" msgid "Problem unlinking %s" msgstr "Hiba %s törlésekor" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "„%s” átnevezése sikertelen erre: %s" @@ -2209,54 +2209,54 @@ msgstr "A(z) %s fájl írása sikertelen" msgid "Failed to close file %s" msgstr "A(z) %s fájl bezárása sikertelen" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "A(z) %s útvonal túl hosszú" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "A(z) %s többszöri kicsomagolása" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "A(z) %s könyvtár eltérítve" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "A csomag megpróbál írni a(z) %s/%s eltérített célpontba" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" msgstr "Az eltérített útvonal túl hosszú" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "A(z) %s könyvtár nem egy könyvtárral lesz helyettesítve" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "Nem sikerült a node helyét megtalálni a hashtárolóban" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "Az útvonal túl hosszú" -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Csomagtalálat felülírása %s verziója nélkül" -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "A(z) %s/%s fájl felülírja a(z) %s csomagban levőt" -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "%s nem érhető el" @@ -2648,59 +2648,59 @@ msgstr "Ez az APT nem támogatja a(z) „%s” verziórendszert" msgid "The package cache was built for a different architecture" msgstr "A csomaggyorsítótár egy másik architektúrához készült" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "Függ ettől" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "Függ ettől (előfüggés)" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "Javasolja" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "Ajánlja" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "Ütközik" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "Kicseréli" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "Elavulttá teszi" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "Töri" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "Bővíti" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "fontos" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "szükséges" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "szabványos" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "opcionális" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "extra" @@ -2810,12 +2810,12 @@ msgstr "%s megnyitása" msgid "Line %u too long in source list %s." msgstr "A(z) %u. sor túl hosszú a(z) %s forráslistában." -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "A(z) %u. sor hibás a(z) %s forráslistában (típus)" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "„%1$s” típus nem ismert a(z) %3$s forráslista %2$u. sorában" @@ -2983,14 +2983,14 @@ msgstr "A gyorsítótárnak inkompatibilis verziórendszere van" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 +#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 +#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 +#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 +#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 +#: apt-pkg/pkgcachegen.cc:561 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Hiba történt a(z) %s feldolgozása során (%s%d)" @@ -3011,29 +3011,29 @@ msgstr "Az APT által kezelhető csomagleírások száma túllépve." msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Az APT által kezelhető függőségek száma túllépve." -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:568 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "A(z) %s %s csomag nem volt megtalálható a fájl függőségeinek feldolgozása " "közben" -#: apt-pkg/pkgcachegen.cc:1150 +#: apt-pkg/pkgcachegen.cc:1197 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nem lehet a(z) %s forrás csomaglistáját elérni" -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 +#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 msgid "Reading package lists" msgstr "Csomaglisták olvasása" # FIXME -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1302 msgid "Collecting File Provides" msgstr "„Biztosítja” kapcsolatok összegyűjtése" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 msgid "IO Error saving source cache" msgstr "IO hiba a forrás-gyorsítótár mentésekor" @@ -3247,22 +3247,22 @@ msgstr "Új forráslista írása\n" msgid "Source list entries for this disc are:\n" msgstr "A lemezhez tartozó forráslistabejegyzések a következők:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 #, c-format msgid "Wrote %i records.\n" msgstr "%i rekord kiírva.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i rekord kiírva, %i hiányzó fájllal.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i rekord kiírva %i eltérő fájllal\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "%i rekord kiírva %i hiányzó és %i eltérő fájllal\n" diff --git a/po/it.po b/po/it.po index 18613cd41..e67e03e0c 100644 --- a/po/it.po +++ b/po/it.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2012-06-25 21:54+0200\n" "Last-Translator: Milo Casagrande \n" "Language-Team: Italian \n" @@ -159,7 +159,7 @@ msgstr " Tabella versione:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1644,7 +1644,7 @@ msgstr "Errore interno" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 @@ -1776,7 +1776,7 @@ msgstr "" " -c=? Legge come configurazione il file specificato\n" " -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 #, c-format msgid "Unable to write to %s" msgstr "Impossibile scrivere in %s" @@ -1785,31 +1785,31 @@ msgstr "Impossibile scrivere in %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Impossibile trovare la versione di debconf. È installato?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "L'elenco dell'estensione del pacchetto è troppo lungo" #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format msgid "Error processing directory %s" msgstr "Errore nell'elaborare la directory %s" -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "L'elenco dell'estensione del sorgente è troppo lungo" -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "Errore nella scrittura dell'intestazione nel file \"contents\"" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, c-format msgid "Error processing contents %s" msgstr "Errore nell'elaborare i contenuti %s" -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1890,11 +1890,11 @@ msgstr "" " -c=? Legge come configurazione il file specificato\n" " -o=? Imposta un'opzione arbitraria di configurazione" -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "Nessuna selezione corrisponde" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Mancano alcuni file nel file group di pacchetti \"%s\"" @@ -1922,8 +1922,8 @@ msgstr "" msgid "Unable to open DB file %s: %s" msgstr "Impossibile aprire il file del database %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "Impossibile eseguire stat su %s" @@ -2004,22 +2004,22 @@ msgstr " Raggiunto il limite di DeLink di %sB.\n" msgid "Archive had no package field" msgstr "L'archivio non ha un campo \"package\"" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr " %s non ha un campo override\n" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:814 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " il responsabile di %s è %s non %s\n" -#: ftparchive/writer.cc:708 +#: ftparchive/writer.cc:711 #, c-format msgid " %s has no source override entry\n" msgstr " %s non ha un campo source override\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:715 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s non ha neppure un campo binario override\n" @@ -2093,7 +2093,7 @@ msgstr "Lettura durante l'elaborazione MD5 non riuscita" msgid "Problem unlinking %s" msgstr "Problema nell'unlink di %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Rinomina di %s in %s non riuscita" @@ -2237,55 +2237,55 @@ msgstr "Scrittura del file %s non riuscita" msgid "Failed to close file %s" msgstr "Chiusura del file %s non riuscita" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "Il percorso %s è troppo lungo" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "Estrazione di %s eseguita più di una volta" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "La directory %s è deviata" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "" "Il pacchetto sta cercando di scrivere nell'obiettivo di deviazione %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" msgstr "Il percorso della deviazione è troppo lungo" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "La directory %s sta per essere sostituita da una non-directory" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "Localizzazione del nodo nel suo hash bucket non riuscita" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "Il percorso è troppo lungo" -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Il pacchetto sovrascritto corrisponde senza versione per %s" -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Il file %s/%s sovrascrive quello nel pacchetto %s" -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Impossibile eseguire stat su %s" @@ -2685,59 +2685,59 @@ msgid "The package cache was built for a different architecture" msgstr "" "Il file della cache dei pacchetti è stato generato per un'altra architettura" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "Dipende" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "Pre-dipende" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "Consiglia" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "Raccomanda" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "Va in conflitto" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "Sostituisce" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "Rende obsoleto" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "Rompe" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "Migliora" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "importante" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "richiesto" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "opzionale" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "extra" @@ -2847,12 +2847,12 @@ msgstr "Apertura di %s" msgid "Line %u too long in source list %s." msgstr "Riga %u troppo lunga nel file %s." -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "La riga %u nel file %s non è corretta (type)" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipo \"%s\" non riconosciuto alla riga %u nel file %s" @@ -3026,14 +3026,14 @@ msgstr "La cache ha un sistema di gestione delle versioni incompatibile" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 +#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 +#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 +#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 +#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 +#: apt-pkg/pkgcachegen.cc:561 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Si è verificato un errore nell'elaborare %s (%s%d)" @@ -3056,29 +3056,29 @@ msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "È stato superato il numero di dipendenze che questo APT può gestire." # (ndt) il primo è il nome del pacchetto, il secondo la versione -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:568 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Il pacchetto %s v.%s non è stato trovato durante l'elaborazione delle " "dipendenze" -#: apt-pkg/pkgcachegen.cc:1150 +#: apt-pkg/pkgcachegen.cc:1197 #, c-format msgid "Couldn't stat source package list %s" msgstr "Impossibile eseguire stat sull'elenco dei pacchetti sorgente %s" -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 +#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 msgid "Reading package lists" msgstr "Lettura elenco dei pacchetti" # (ndt) non mi convince per niente, ma vediamo cosa salta fuori -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1302 msgid "Collecting File Provides" msgstr "Il file fornisce" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 msgid "IO Error saving source cache" msgstr "Errore di I/O nel salvare la cache sorgente" @@ -3295,22 +3295,22 @@ msgstr "Scrittura nuovo elenco sorgenti\n" msgid "Source list entries for this disc are:\n" msgstr "Le voci dell'elenco sorgenti per questo disco sono:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 #, c-format msgid "Wrote %i records.\n" msgstr "Scritti %i record.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Scritti %i record con %i file mancanti.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Scritti %i record con %i file senza corrispondenze\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/ja.po b/po/ja.po index 7f02fa9af..44b51b4d9 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.1\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2012-07-01 00:14+0900\n" "Last-Translator: Kenshi Muto \n" "Language-Team: Debian Japanese List \n" @@ -156,7 +156,7 @@ msgstr " バージョンテーブル:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1617,7 +1617,7 @@ msgstr "内部エラー" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 @@ -1742,7 +1742,7 @@ msgstr "" " -c=? 指定した設定ファイルを読み込む\n" " -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 #, c-format msgid "Unable to write to %s" msgstr "%s に書き込めません" @@ -1752,31 +1752,31 @@ msgid "Cannot get debconf version. Is debconf installed?" msgstr "" "debconf のバージョンを取得できません。debconf はインストールされていますか?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "パッケージ拡張子リストが長すぎます" #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format msgid "Error processing directory %s" msgstr "ディレクトリ %s の処理中にエラーが発生しました" -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "ソース拡張子リストが長すぎます" -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "Contents ファイルへのヘッダの書き込み中にエラーが発生しました" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, c-format msgid "Error processing contents %s" msgstr "Contents %s の処理中にエラーが発生しました" -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1857,11 +1857,11 @@ msgstr "" " -c=? 指定の設定ファイルを読む\n" " -o=? 任意の設定オプションを設定する" -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "選択にマッチするものがありません" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "パッケージファイルグループ `%s' に見当たらないファイルがあります" @@ -1889,8 +1889,8 @@ msgstr "" msgid "Unable to open DB file %s: %s" msgstr "DB ファイル %s を開くことができません: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "%s の状態を取得するのに失敗しました" @@ -1968,22 +1968,22 @@ msgstr " リンクを外す制限の %sB に到達しました。\n" msgid "Archive had no package field" msgstr "アーカイブにパッケージフィールドがありませんでした" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr " %s に override エントリがありません\n" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:814 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %1$s メンテナは %3$s ではなく %2$s です\n" -#: ftparchive/writer.cc:708 +#: ftparchive/writer.cc:711 #, c-format msgid " %s has no source override entry\n" msgstr " %s にソース override エントリがありません\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:715 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s にバイナリ override エントリがありません\n" @@ -2057,7 +2057,7 @@ msgstr "MD5 の計算中に読み込みに失敗しました" msgid "Problem unlinking %s" msgstr "%s のリンク解除で問題が発生しました" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "%s を %s に名前変更できませんでした" @@ -2201,55 +2201,55 @@ msgstr "ファイル %s の書き込みに失敗しました" msgid "Failed to close file %s" msgstr "%s のクローズに失敗しました" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "パス %s は長すぎます" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "%s を複数回展開しています" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "ディレクトリ %s は divert されています" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "" "このパッケージは diversion のターゲットの %s/%s に書き込もうとしています" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" msgstr "diversion パスが長すぎます" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "ディレクトリ %s が非ディレクトリに置換されようとしています" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "ハッシュバケツ内でノードを特定するのに失敗しました" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "パスが長すぎます" -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "%s に対するバージョンのないパッケージマッチを上書きします" -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "ファイル %s/%s がパッケージ %s のものを上書きします" -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "%s の状態を取得できません" @@ -2637,59 +2637,59 @@ msgstr "この APT はバージョニングシステム '%s' をサポートし msgid "The package cache was built for a different architecture" msgstr "パッケージキャッシュが異なるアーキテクチャ用に構築されています" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "依存" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "先行依存" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "提案" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "推奨" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "競合" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "置換" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "廃止" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "破壊" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "拡張" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "重要" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "要求" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "標準" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "任意" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "特別" @@ -2793,12 +2793,12 @@ msgstr "%s をオープンしています" msgid "Line %u too long in source list %s." msgstr "ソースリスト %2$s の %1$u 行目が長すぎます。" -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "ソースリスト %2$s の %1$u 行目が不正です (type)" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "ソースリスト %3$s の %2$u 行にあるタイプ '%1$s' は不明です" @@ -2971,14 +2971,14 @@ msgstr "キャッシュに非互換なバージョニングシステムがあり #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 +#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 +#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 +#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 +#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 +#: apt-pkg/pkgcachegen.cc:561 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "%s を処理中にエラーが発生しました (%s%d)" @@ -2999,26 +2999,26 @@ msgstr "この APT が対応している以上の数の説明が要求されま msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "この APT が対応している以上の数の依存関係が発生しました。" -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:568 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "パッケージ %s %s がファイル依存の処理中に見つかりませんでした" -#: apt-pkg/pkgcachegen.cc:1150 +#: apt-pkg/pkgcachegen.cc:1197 #, c-format msgid "Couldn't stat source package list %s" msgstr "ソースパッケージリスト %s の状態を取得できません" -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 +#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 msgid "Reading package lists" msgstr "パッケージリストを読み込んでいます" -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1302 msgid "Collecting File Provides" msgstr "ファイル提供情報を収集しています" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 msgid "IO Error saving source cache" msgstr "ソースキャッシュの保存中に IO エラーが発生しました" @@ -3235,22 +3235,22 @@ msgstr "新しいソースリストを書き込んでいます\n" msgid "Source list entries for this disc are:\n" msgstr "このディスクのソースリストのエントリ:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 #, c-format msgid "Wrote %i records.\n" msgstr "%i レコードを書き込みました。\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i レコードを書き込みました。%i 個のファイルが存在しません。\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i レコードを書き込みました。%i 個の適合しないファイルがあります。\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/km.po b/po/km.po index e6048afdc..17d6bf77b 100644 --- a/po/km.po +++ b/po/km.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_km\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2006-10-10 09:48+0700\n" "Last-Translator: Khoem Sokhem \n" "Language-Team: Khmer \n" @@ -161,7 +161,7 @@ msgstr " តារាង​កំណែ ៖" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1558,7 +1558,7 @@ msgstr "កំហុស​ខាង​ក្នុង​" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 @@ -1681,7 +1681,7 @@ msgstr "" " -c=? អាន​ឯកសារ​ការ​កំណត់​រចនាស្ព័ន្ធ​នេះ\n" " -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. eg -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 #, c-format msgid "Unable to write to %s" msgstr "មិន​អាច​សរសេរ​ទៅ %s" @@ -1690,31 +1690,31 @@ msgstr "មិន​អាច​សរសេរ​ទៅ %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "មិន​អាច​ទទួល​យក​កំណែ​ debconf  ។ តើ​ debconf បានដំឡើង​ឬ ?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "បញ្ជី​ផ្នែក​បន្ថែម​កញ្ចប់​វែង​ពេក" #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format msgid "Error processing directory %s" msgstr "​កំហុស​ដំណើរការ​ថត​ %s" -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "បញ្ជី​ផ្នែក​បន្ថែម​ប្រភព​វែង​ពេក" -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "កំហុស​សរសេរ​បឋម​កថា​ទៅ​ឯកសារ​មាតិកា" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, c-format msgid "Error processing contents %s" msgstr "កំហុស​ដំណើរការ​មាតិកា​ %s" -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1795,11 +1795,11 @@ msgstr "" " -c=? អាន​ឯកសារ​ការកំណត់​រចនាសម្ព័ន្ធ​នេះ​\n" " -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត" -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "គ្មាន​ការ​ជ្រើស​​ដែល​ផ្គួផ្គង​" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "ឯកសារ​មួយ​ចំនួន​បាត់បងពី​ក្រុម​ឯកសារ​កញ្ចប់​ `%s'" @@ -1828,8 +1828,8 @@ msgstr "" msgid "Unable to open DB file %s: %s" msgstr "មិន​អាច​បើក​ឯកសារ​ DB បានទេ %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "បាន​បរាជ័យ​ក្នុង​ការថ្លែង %s" @@ -1907,22 +1907,22 @@ msgstr " DeLink កំណត់​នៃ​ការ​វាយ %sB ។\n" msgid "Archive had no package field" msgstr "ប័ណ្ណសារ​គ្មាន​វាល​កញ្ចប់​" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr " %s គ្មាន​ធាតុធាតុបញ្ចូល​​បដិសេធឡើយ\n" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:814 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " អ្នក​ថែទាំ %s គឺ %s មិនមែន​ %s\n" -#: ftparchive/writer.cc:708 +#: ftparchive/writer.cc:711 #, c-format msgid " %s has no source override entry\n" msgstr " %s គ្មាន​ធាតុ​បដិសេធ​ប្រភព\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:715 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s គ្មាន​ធាតុប​ដិសេធគោល​ពីរ​ដែរ\n" @@ -1996,7 +1996,7 @@ msgstr "បាន​បរាជ័យ​ក្នុង​ការអាន​ msgid "Problem unlinking %s" msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់តំណ %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ្មោះ %s ទៅ %s" @@ -2141,54 +2141,54 @@ msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯក msgid "Failed to close file %s" msgstr "បរាជ័យ​ក្នុងការ​បិទឯកសារ %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "ផ្លូវ​ %s វែង​ពេក" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "កំពុង​ពន្លា​ %s ច្រើន​ជាង​ម្តង​" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "ថត​ %s ត្រូវបាន​បង្វែរ" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "កញ្ចប់ ​កំពុង​ព្យាយាម​សរសេរ​ទៅកាន់​គោលដៅ​បង្វែរ​ %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" msgstr "ផ្លូវ​បង្វែរ វែងពេក" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "ថត​ %s ត្រូវ​បាន​ជំនួស​ដោយ​មិនមែន​ជា​ថត​" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "បរាជ័យ​ក្នុងការ​ដាក់ថ្នាំង​នៅក្នុង​ធុង​រាយប៉ាយ​របស់វា" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "ផ្លូវ​វែង​ពេក" -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "សរសេរ​ជាន់​លើកញ្ចប់ផ្គួផ្គង​ដោយ​គ្មាន​កំណែ​សម្រាប់ %s" -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "ឯកសារ​ %s/%s សរសេរជាន់​ពីលើ​មួយ​ក្នុង​កញ្ចប់ %s" -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "មិន​អាច​ថ្លែង %s បានឡើយ" @@ -2570,59 +2570,59 @@ msgstr "APT នេះ មិនគាំទ្រ​ប្រព័ន្ធ​ msgid "The package cache was built for a different architecture" msgstr "ឃ្លាំង​សម្ងាត់​កញ្ចប់ត្រូវ​បានស្ថាបនា់​សម្រាប់ស្ថាបត្យករ​ខុស​ៗគ្នា​​" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "អាស្រ័យ​" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "អាស្រ័យជា​មុន" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "ផ្ដល់យោបល់​" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "ផ្តល់​អនុសាសន៍​" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "ប៉ះទង្គិច" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "ជំនួស​" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "លែង​ប្រើ" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "សំខាន់​" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "បាន​ទាមទារ" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "គំរូ" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "ស្រេចចិត្ត" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "បន្ថែម" @@ -2723,12 +2723,12 @@ msgstr "កំពុង​បើក​ %s" msgid "Line %u too long in source list %s." msgstr "បន្ទាត់​ %u មាន​ប្រវែង​វែងពេកនៅ​ក្នុង​បញ្ជី​ប្រភព​ %s ។" -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "បន្ទាត់​ Malformed %u ក្នុង​បញ្ជី​ប្រភព​ %s (ប្រភេទ​)" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ" @@ -2887,14 +2887,14 @@ msgstr "ឃ្លាំងសម្ងាត់​មិន​ត្រូវ​ #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 +#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 +#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 +#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 +#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 +#: apt-pkg/pkgcachegen.cc:561 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "កំហុស​បានកើតឡើង​ខណៈពេល​កំពុង​ដំណើរការ​ %s (FindPkg)" @@ -2916,26 +2916,26 @@ msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​ល msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "អស្ចារ្យ​, អ្នក​មាន​ភាពអាស្រ័យ​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​ ។" -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:568 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "កញ្ចប់​ %s %s រក​មិន​ឃើញ​ខណៈ​ពេល​កំពុង​ដំណើរការ​ភាពអាស្រ័យ​​ឯកសារ" -#: apt-pkg/pkgcachegen.cc:1150 +#: apt-pkg/pkgcachegen.cc:1197 #, c-format msgid "Couldn't stat source package list %s" msgstr "មិនអាចថ្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s" -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 +#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 msgid "Reading package lists" msgstr "កំពុង​អាន​បញ្ជី​កញ្ចប់" -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1302 msgid "Collecting File Provides" msgstr "ការផ្ដល់​ឯកសារ​ប្រមូលផ្ដុំ" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 msgid "IO Error saving source cache" msgstr "IO កំហុសក្នុងការររក្សាទុក​ឃ្លាំង​សម្ងាត់​ប្រភព​" @@ -3139,22 +3139,22 @@ msgstr "កំពុងសរសេរ​បញ្ជី​ប្រភព​ថ msgid "Source list entries for this disc are:\n" msgstr "ធាតុបញ្ចូល​បញ្ជីប្រភព​សម្រាប់​ឌីស​នេះគឺ ៖\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 #, c-format msgid "Wrote %i records.\n" msgstr "បានសរសេរ %i កំណត់ត្រា ។\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "បានសរសេរ %i កំណត់ត្រា​ជាមួយ​ %i ឯកសារ​ដែល​បាត់បង់ ។\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "បានសរសេរ​ %i កំណត់ត្រា​ជាមួយួយ​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "បានសរសេរ %i កំណត់ត្រា​ជាមួយ​ %i ឯកសារ​ដែល​បាត់បង់​ និង​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​ ​\n" diff --git a/po/ko.po b/po/ko.po index 7cfbbc32c..08a7dc594 100644 --- a/po/ko.po +++ b/po/ko.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2010-08-30 02:31+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" @@ -152,7 +152,7 @@ msgstr " 버전 테이블:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1576,7 +1576,7 @@ msgstr "내부 오류" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 @@ -1702,7 +1702,7 @@ msgstr "" " -c=? 설정 파일을 읽습니다\n" " -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 #, c-format msgid "Unable to write to %s" msgstr "%s에 쓸 수 없습니다" @@ -1711,31 +1711,31 @@ msgstr "%s에 쓸 수 없습니다" msgid "Cannot get debconf version. Is debconf installed?" msgstr "debconf 버전을 알 수 없습니다. debconf가 설치되었습니까?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "패키지 확장 목록이 너무 깁니다" #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format msgid "Error processing directory %s" msgstr "%s 디렉터리를 처리하는데 오류가 발생했습니다" -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "소스 확장 목록이 너무 깁니다" -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "컨텐츠 파일에 헤더를 쓰는데 오류가 발생했습니다" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, c-format msgid "Error processing contents %s" msgstr "%s 컨텐츠를 처리하는데 오류가 발생했습니다" -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1816,11 +1816,11 @@ msgstr "" " -c=? 이 설정 파일을 읽습니다\n" " -o=? 임의의 옵션을 설정합니다" -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "맞는 패키지가 없습니다" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "`%s' 패키지 파일 그룹에 몇몇 파일이 빠졌습니다" @@ -1848,8 +1848,8 @@ msgstr "" msgid "Unable to open DB file %s: %s" msgstr "DB 파일, %s 파일을 열 수 없습니다: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "%s의 정보를 읽는데 실패했습니다" @@ -1929,22 +1929,22 @@ msgstr " DeLink 한계값 %s바이트에 도달했습니다.\n" msgid "Archive had no package field" msgstr "아카이브에 패키지 필드가 없습니다" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr " %s에는 override 항목이 없습니다\n" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:814 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s 관리자가 %s입니다 (%s 아님)\n" -#: ftparchive/writer.cc:708 +#: ftparchive/writer.cc:711 #, c-format msgid " %s has no source override entry\n" msgstr " %s에는 source override 항목이 없습니다\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:715 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s에는 binary override 항목이 없습니다\n" @@ -2018,7 +2018,7 @@ msgstr "MD5를 계산하는 동안 읽는데 실패했습니다" msgid "Problem unlinking %s" msgstr "%s의 링크를 해제하는데 문제가 있습니다" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "%s 파일의 이름을 %s(으)로 바꾸는데 실패했습니다" @@ -2164,54 +2164,54 @@ msgstr "%s 파일을 쓰는데 실패했습니다" msgid "Failed to close file %s" msgstr "%s 파일을 닫는데 실패했습니다" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "경로 %s이(가) 너무 깁니다" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "%s을(를) 두 번 이상 풀었습니다" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "%s 디렉터리가 전환되었습니다" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "이 패키지에서 전환된 대상에 쓰려고 합니다 (%s/%s)" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" msgstr "전환하는 경로가 너무 깁니다" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "%s 디렉터리를 디렉터리가 아닌 파일로 덮어쓰려고 합니다" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "해시 버킷에서 노드를 찾는데 실패했습니다" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "경로가 너무 깁니다" -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "덮어 쓰는 패키지가 %s 패키지의 어떤 버전과도 맞지 않습니다" -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "%s/%s 파일은 %s 패키지에 있는 파일을 덮어 씁니다" -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "%s의 정보를 읽을 수 없습니다" @@ -2593,59 +2593,59 @@ msgstr "이 APT는 '%s' 버전 시스템을 지원하지 않습니다" msgid "The package cache was built for a different architecture" msgstr "패키지 캐시가 다른 아키텍쳐용입니다." -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "의존" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "미리의존" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "제안" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "추천" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "충돌" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "대체" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "없앰" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "망가뜨림" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "향상" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "중요" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "필수" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "표준" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "옵션" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "별도" @@ -2746,12 +2746,12 @@ msgstr "%s 파일을 여는 중입니다" msgid "Line %u too long in source list %s." msgstr "소스 리스트 %2$s의 %1$u번 줄이 너무 깁니다." -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (타입)" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "소스 목록 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다" @@ -2915,14 +2915,14 @@ msgstr "캐시의 버전 시스템이 호환되지 않습니다" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 +#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 +#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 +#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 +#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 +#: apt-pkg/pkgcachegen.cc:561 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "%s 처리 중에 오류가 발생했습니다 (FindPkg)" @@ -2943,26 +2943,26 @@ msgstr "우와, 이 APT가 처리할 수 있는 설명 개수를 넘어갔습니 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "우와, 이 APT가 처리할 수 있는 의존성 개수를 넘어갔습니다." -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:568 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "파일 의존성을 처리하는 데, %s %s 패키지가 없습니다" -#: apt-pkg/pkgcachegen.cc:1150 +#: apt-pkg/pkgcachegen.cc:1197 #, c-format msgid "Couldn't stat source package list %s" msgstr "소스 패키지 목록 %s의 정보를 읽을 수 없습니다" -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 +#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 msgid "Reading package lists" msgstr "패키지 목록을 읽는 중입니다" -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1302 msgid "Collecting File Provides" msgstr "파일에서 제공하는 것을 모으는 중입니다" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 msgid "IO Error saving source cache" msgstr "소스 캐시를 저장하는데 입출력 오류가 발생했습니다" @@ -3170,22 +3170,22 @@ msgstr "새 소스 리스트를 쓰는 중입니다\n" msgid "Source list entries for this disc are:\n" msgstr "이 디스크의 소스 리스트 항목은 다음과 같습니다:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 #, c-format msgid "Wrote %i records.\n" msgstr "레코드 %i개를 썼습니다.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "레코드 %i개를 파일 %i개가 빠진 상태로 썼습니다.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "레코드 %i개를 파일 %i개가 맞지 않은 상태로 썼습니다\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "레코드 %i개를 파일 %i개가 빠지고 %i개가 맞지 않은 상태로 썼습니다\n" diff --git a/po/ku.po b/po/ku.po index bc2725550..d94563913 100644 --- a/po/ku.po +++ b/po/ku.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-ku\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2008-05-08 12:48+0200\n" "Last-Translator: Erdal Ronahi \n" "Language-Team: ku \n" @@ -160,7 +160,7 @@ msgstr " Tabloya guhertoyan:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1461,7 +1461,7 @@ msgstr "Çewtiya hundirîn" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 @@ -1572,7 +1572,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 #, c-format msgid "Unable to write to %s" msgstr "Nivîsandin ji bo %s ne pêkane" @@ -1581,31 +1581,31 @@ msgstr "Nivîsandin ji bo %s ne pêkane" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Guhertoya debconf nehate stendin. debconf sazkirî ye?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "Lîsteya dirêjahiya pakêtê zêde dirêj e" #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format msgid "Error processing directory %s" msgstr "Di şixulandina pêrista %s de çewtî" -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e" -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, c-format msgid "Error processing contents %s" msgstr "Dema şixulandina naveroka %s çewtî" -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1647,11 +1647,11 @@ msgid "" " -o=? Set an arbitrary configuration option" msgstr "" -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Di koma pelgehên pakêta '%s' de hin pelgeh kêm in" @@ -1677,8 +1677,8 @@ msgstr "" msgid "Unable to open DB file %s: %s" msgstr "Danegira %s nehate vekirin: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "" @@ -1756,22 +1756,22 @@ msgstr "" msgid "Archive had no package field" msgstr "Di arşîvê de qada pakêtê tuneye" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:814 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" -#: ftparchive/writer.cc:708 +#: ftparchive/writer.cc:711 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:715 #, c-format msgid " %s has no binary override entry either\n" msgstr "" @@ -1845,7 +1845,7 @@ msgstr "" msgid "Problem unlinking %s" msgstr "" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "" @@ -1984,55 +1984,55 @@ msgstr "Nivîsîna pelê %s biserneket" msgid "Failed to close file %s" msgstr "Girtina pelê %s biserneket" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "Rêça %s zêde dirêj e" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, 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:155 apt-inst/extract.cc:299 #, fuzzy msgid "The diversion path is too long" msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "Rêç zêde dirêj e" -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "" -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "" -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, fuzzy, c-format msgid "Unable to stat %s" msgstr "Nivîsandin ji bo %s ne pêkane" @@ -2413,59 +2413,59 @@ msgstr "" msgid "The package cache was built for a different architecture" msgstr "" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "Bindest" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "PêşBindest" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "Pêşniyaz dike" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "Tawsiye dike" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "Nakokî" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "Dikeve şunve" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "Kevin dike" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "Dişkîne" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "girîng" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "pêwist" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "opsiyonel" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "ekstra" @@ -2565,12 +2565,12 @@ msgstr "%s tê vekirin" msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" @@ -2722,14 +2722,14 @@ msgstr "" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 +#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 +#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 +#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 +#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 +#: apt-pkg/pkgcachegen.cc:561 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Dema şixulandina naveroka %s çewtî" @@ -2750,26 +2750,26 @@ msgstr "" msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:568 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:1150 +#: apt-pkg/pkgcachegen.cc:1197 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 +#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 msgid "Reading package lists" msgstr "Lîsteya pakêtan tê xwendin" -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1302 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 msgid "IO Error saving source cache" msgstr "" @@ -2966,22 +2966,22 @@ msgstr "" msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 #, c-format msgid "Wrote %i records.\n" msgstr "%i tomar hatin nivîsîn.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/lt.po b/po/lt.po index d6a7cc6e4..f23aee529 100644 --- a/po/lt.po +++ b/po/lt.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2008-08-02 01:47-0400\n" "Last-Translator: Gintautas Miliauskas \n" "Language-Team: Lithuanian \n" @@ -158,7 +158,7 @@ msgstr " Versijų lentelė:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1484,7 +1484,7 @@ msgstr "Vidinė klaida" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 @@ -1612,7 +1612,7 @@ msgstr "" " -c=? Nuskaityti šį konfigūracijų failą\n" " -o=? Nustatyti savarankiškas nuostatas, pvz.: -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 #, c-format msgid "Unable to write to %s" msgstr "Nepavyko įrašyti į %s" @@ -1621,31 +1621,31 @@ msgstr "Nepavyko įrašyti į %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nepavyko sužinoti debconf versijos. Ar įdiegtas debconf?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "Paketo plėtinių sąrašas yra per ilgas" #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format msgid "Error processing directory %s" msgstr "Klaida apdorojant aplanką %s" -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "Šaltinio plėtinys yra per ilgas" -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "Klaida įrašant antraštę į turinio failą" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, c-format msgid "Error processing contents %s" msgstr "Klaida apdorojant turinį %s" -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1731,11 +1731,11 @@ msgstr "" " -c=? Perskaityti šį nuostatų failą\n" " -o=? Nustatyti savarankišką konfigūracijos nuostatą" -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "Nėra atitikmenų" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Kai kurių failų nėra paketų grupėje „%s“" @@ -1764,8 +1764,8 @@ msgstr "" msgid "Unable to open DB file %s: %s" msgstr "Nepavyko atverti DB failo %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "Nepavyko patikrinti %s" @@ -1843,22 +1843,22 @@ msgstr "" msgid "Archive had no package field" msgstr "Archyvas neturėjo paketo lauko" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr " %s neturi perrašymo įrašo\n" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:814 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s prižiūrėtojas yra %s, o ne %s\n" -#: ftparchive/writer.cc:708 +#: ftparchive/writer.cc:711 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:715 #, c-format msgid " %s has no binary override entry either\n" msgstr "" @@ -1932,7 +1932,7 @@ msgstr "Skaitymo klaida skaičiuojant MD5" msgid "Problem unlinking %s" msgstr "" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Nepavyko pervadinti %s į %s" @@ -2079,54 +2079,54 @@ msgstr "" msgid "Failed to close file %s" msgstr "" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "Kelias %s per ilgas" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, 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:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" msgstr "" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "Kelias per ilgas" -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "" -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "" -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "" @@ -2507,59 +2507,59 @@ msgstr "" msgid "The package cache was built for a different architecture" msgstr "" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "Priklauso" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "Priešpriklauso" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "Siūlo" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "Rekomenduoja" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "Konfliktuoja" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "Pakeičia" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "Pakeičia" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "Sugadina" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "Svarbu" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "privaloma" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "standartinis" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "nebūtinas" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "papildomas" @@ -2659,12 +2659,12 @@ msgstr "Atveriama %s" msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" @@ -2821,14 +2821,14 @@ msgstr "" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 +#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 +#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 +#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 +#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 +#: apt-pkg/pkgcachegen.cc:561 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Klaida apdorojant turinį %s" @@ -2849,26 +2849,26 @@ msgstr "" msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:568 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:1150 +#: apt-pkg/pkgcachegen.cc:1197 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 +#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 msgid "Reading package lists" msgstr "Skaitomi paketų sąrašai" -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1302 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 msgid "IO Error saving source cache" msgstr "" @@ -3065,22 +3065,22 @@ msgstr "Rašomas naujas šaltinių sąrašas\n" msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/mr.po b/po/mr.po index 9bb37debd..ceeeaf33e 100644 --- a/po/mr.po +++ b/po/mr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2008-11-20 23:27+0530\n" "Last-Translator: Sampada \n" "Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India " @@ -155,7 +155,7 @@ msgstr "आवृत्ती कोष्टक:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1562,7 +1562,7 @@ msgstr "अंतर्गत त्रुटी" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 @@ -1686,7 +1686,7 @@ msgstr "" " -c=? ही संरचना संचिका वाचा \n" " -o=? एखादा अहेतुक संरचना पर्याय निर्धारित करा जसे- -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 #, c-format msgid "Unable to write to %s" msgstr "%s मध्ये लिहिण्यास असमर्थ " @@ -1695,31 +1695,31 @@ msgstr "%s मध्ये लिहिण्यास असमर्थ " msgid "Cannot get debconf version. Is debconf installed?" msgstr "debconf आवृत्ती मिळू शकत नाही,debconf अधिष्ठापित झाली काय?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "पॅकेजेसची विस्तारित यादी खूप मोठी आहे" #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format msgid "Error processing directory %s" msgstr "त्रुटी प्रक्रिया मार्गदर्शिका%s " -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "उगमस्थानाची विस्तारित यादी खूप मोठी आहे" -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "शीर्षक संचिकेमधून मजकूर संचिकेत लिहिण्यात त्रुटी" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, c-format msgid "Error processing contents %s" msgstr "त्रुटी प्रक्रिया मजकूर %s" -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1800,11 +1800,11 @@ msgstr "" " -c=? ही संरचना संचिका वाचा \n" " -o=? एखादा अहेतुक संरचना पर्याय निर्धारित करा" -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "निवडक भाग जुळत नाही" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "`%s' पॅकेज संचिका समुहातील काही संचिका गहाळ आहेत" @@ -1833,8 +1833,8 @@ msgstr "" msgid "Unable to open DB file %s: %s" msgstr "%s: %s DB संचिका उघडण्यास असमर्थ" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "%s स्टेट करण्यास असमर्थ" @@ -1912,22 +1912,22 @@ msgstr "%sB हीट ची डिलींक मर्यादा\n" msgid "Archive had no package field" msgstr "अर्काईव्ह ला पॅकेज जागा नाही" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr "%s ला ओव्हरराईड/दुर्लक्षित जागा नाही\n" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:814 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "%s देखभालकर्ता हा %s आणि %s नाही \n" -#: ftparchive/writer.cc:708 +#: ftparchive/writer.cc:711 #, c-format msgid " %s has no source override entry\n" msgstr "%s ला उगम ओव्हरराईड/दुर्लक्षित जागा नाही\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:715 #, c-format msgid " %s has no binary override entry either\n" msgstr "%s ला द्वयंक ओव्हरराईड जागा नाही\n" @@ -2001,7 +2001,7 @@ msgstr "MD5 कामप्युटींग करतांना वाचण msgid "Problem unlinking %s" msgstr "%s दुवा मोकळा/सुटा करण्यास अडचण" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "%s ला पुनर्नामांकन %s करण्यास असमर्थ " @@ -2147,54 +2147,54 @@ msgstr "%s फाईल मध्ये लिहिण्यास असमर msgid "Failed to close file %s" msgstr "%s फाईल बंद करण्यास असमर्थ" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "मार्ग %s हा खूप लांब आहे" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "%s एकापेक्षा जास्त वेळा उघडत आहे" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "%s संचिका डायव्हर्ट केली आहे/वळवली आहे" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "डायव्हर्जन इच्छित %s/%s मध्ये लिहिण्याचा पॅकेज प्रयत्न करत आहे" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" msgstr "डायव्हर्जन मार्ग हा खूप लांब आहे" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "%s संचिका ही संचिका नसलेल्या संचिकेबरोबर बदललेली आहे" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "नोडचे त्याच्या हॅश बकेटमध्ये/बादलीत स्थान निश्चित करण्यास असमर्थ" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "मार्ग खूप लांब आहे" -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "%s च्या आवृत्तीशी पुनः लिहिलेल्या पॅकेज जुळत नाही" -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "File %s/%s, %s पॅकेज मधल्या एका वर पुनर्लिखित होते" -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "%s स्टॅट करण्यास असमर्थ" @@ -2575,59 +2575,59 @@ msgstr "'%s' आवृत्तीकरण प्रणालीला हे A msgid "The package cache was built for a different architecture" msgstr "पॅकेज अस्थाई स्मृतीकोष वेगळ्या वास्तुविद्ये साठी बनवला गेला" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "अवलंबित" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "पूर्व अवलंबित" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "सुचवणे" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "शिफारस" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "परस्परविरोध" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "परत त्याठिकाणी आणा" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "अप्रचलित" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "तोडले" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "अत्यावश्यक" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "आवश्यक" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "मानक" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "एच्छिक" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "अधिक" @@ -2727,12 +2727,12 @@ msgstr "%s उघडत आहे" msgid "Line %u too long in source list %s." msgstr "%s स्त्रोत सुचीमध्ये ओळ %u खूप लांब आहे." -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "स्त्रोत सुची %s (प्रकार) मध्ये %u वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही " @@ -2893,14 +2893,14 @@ msgstr "अस्थायी स्मृतिकोष मध्ये वि #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 +#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 +#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 +#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 +#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 +#: apt-pkg/pkgcachegen.cc:561 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "%s (पॅकेज शोधतांना) प्रक्रिया करीत असतांना दोष आढळून आला" @@ -2926,26 +2926,26 @@ msgstr "" "अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही अवलंबित/विसंबून असलेल्या संख्येची मर्यादा " "ओलांडली आहे." -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:568 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "अवलंबित/विसंबून असणाऱ्या संचिकांची प्रक्रिया करीत असतांना पॅकेज %s %s सापडले नाही " -#: apt-pkg/pkgcachegen.cc:1150 +#: apt-pkg/pkgcachegen.cc:1197 #, c-format msgid "Couldn't stat source package list %s" msgstr "%s उगम पॅकेज यादी सुरू करता येत नाही" -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 +#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 msgid "Reading package lists" msgstr "पॅकेज याद्या वाचत आहोत" -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1302 msgid "Collecting File Provides" msgstr "तरतूद/पुरवलेल्या संचिका संग्रहित करीत आहे" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 msgid "IO Error saving source cache" msgstr "IO त्रुटी उगम निवडक संचयस्थानात संग्रहित होत आहे" @@ -3152,22 +3152,22 @@ msgstr "नविन स्त्रोत सूची लिहित आह msgid "Source list entries for this disc are:\n" msgstr "ह्या डिस्क/चकती करिता स्त्रोत सूचीच्या प्रवेशिका आहेत: \n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 #, c-format msgid "Wrote %i records.\n" msgstr "%i माहितीसंच लिहिले.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i गहाळ संचिकाबरोबर %i माहिती संच लिहिले.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i विजोड संचिकांबरोबर %i माहिती संच लिहिले\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "%i गहाळ संचिकाबरोबर आणि %i विजोड संचिकाबरोबर %i माहिती संच लिहिले\n" diff --git a/po/nb.po b/po/nb.po index 1934a25c8..1cab4eab2 100644 --- a/po/nb.po +++ b/po/nb.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2010-09-01 21:10+0200\n" "Last-Translator: Hans Fredrik Nordhaug \n" "Language-Team: Norwegian Bokmål \n" @@ -160,7 +160,7 @@ msgstr " Versjonstabell:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1591,7 +1591,7 @@ msgstr "Intern feil" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 @@ -1720,7 +1720,7 @@ msgstr "" " -c=? Les denne innstillingsfila.\n" " -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 #, c-format msgid "Unable to write to %s" msgstr "Kan ikke skrive til %s" @@ -1729,31 +1729,31 @@ msgstr "Kan ikke skrive til %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Kan ikke fastslå debconf-versjonen. Er debconf installert?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "Lista over pakkeutvidelser er for lang" #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format msgid "Error processing directory %s" msgstr "Feil ved lesing av katalogen %s" -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "Lista over kildeutvidelser er for lang" -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "Feil ved skriving av topptekst til innholdsfila" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, c-format msgid "Error processing contents %s" msgstr "Det oppsto en feil ved lesing av %s" -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1835,11 +1835,11 @@ msgstr "" " -c=? Les denne oppsettsfila.\n" " -o=? Setter en vilkårlig innstilling" -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "Ingen utvalg passet" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Enkelte filer mangler i pakkegruppa «%s»" @@ -1867,8 +1867,8 @@ msgstr "" msgid "Unable to open DB file %s: %s" msgstr "Klarte ikke å åpne Databasefila %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "Klarte ikke å få statusen på %s" @@ -1946,22 +1946,22 @@ msgstr " DeLink-grensa på %s B er nådd.\n" msgid "Archive had no package field" msgstr "Arkivet har ikke noe pakkefelt" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr " %s har ingen overstyringsoppføring\n" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:814 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s-vedlikeholderen er %s, ikke %s\n" -#: ftparchive/writer.cc:708 +#: ftparchive/writer.cc:711 #, c-format msgid " %s has no source override entry\n" msgstr " %s har ingen kildeoverstyringsoppføring\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:715 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s har ingen binæroverstyringsoppføring heller\n" @@ -2035,7 +2035,7 @@ msgstr "Klarte ikke å lese under utregning av MD5" msgid "Problem unlinking %s" msgstr "Problem ved oppheving av lenken til %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Klarte ikke å endre navnet på %s til %s" @@ -2181,54 +2181,54 @@ msgstr "Klarte ikke å skrive fila %s" msgid "Failed to close file %s" msgstr "Klarte ikke å lukke fila %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "Stien %s er for lang" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "Pakker ut %s mer enn en gang" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "Katalogen %s er avledet" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Pakken prøver å skrive til avledningsmålet %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" msgstr "Avledningsstien er for lang" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Mappa %s blir byttet ut med noe som ikke er en mappe" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "Fant ikke knutepunktet i dens hash-spann" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "Stien er for lang" -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Skriver over pakketreff uten versjon for %s" -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Fila %s/%s skriver over den tilsvarende fila i pakken %s" -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Klarte ikke å få statusen på %s" @@ -2615,59 +2615,59 @@ msgstr "Denne APT støtter ikke versjonssystemet «%s»" msgid "The package cache was built for a different architecture" msgstr "Pakkelageret ble bygd for en annen arkitektur" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "Avhenger av" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "Forutsetter" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "Foreslår" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "Anbefaler" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "Er i konflikt med" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "Erstatter" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "Nuller" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "Ødelegger" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "Forbedrer" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "viktig" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "påkrevet" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "vanlig" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "valgfri" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "tillegg" @@ -2767,12 +2767,12 @@ msgstr "Åpner %s" msgid "Line %u too long in source list %s." msgstr "Linje %u i kildelista %s er for lang" -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Feil på %u i kildelista %s (type)" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen «%s» er ukjent i linje %u i kildelista %s" @@ -2937,14 +2937,14 @@ msgstr "Lageret har et uoverensstemmende versjonssystem" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 +#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 +#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 +#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 +#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 +#: apt-pkg/pkgcachegen.cc:561 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Feil oppsto under behandling av %s (FindPkg)" @@ -2965,26 +2965,26 @@ msgstr "Jøss, du har overgått antallet beskrivelser denne APT klarer." msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Jøss, du har overgått antallet avhengighetsforhold denne APT klarer." -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:568 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Fant ikke pakken %s %s ved behandling av filkrav" -#: apt-pkg/pkgcachegen.cc:1150 +#: apt-pkg/pkgcachegen.cc:1197 #, c-format msgid "Couldn't stat source package list %s" msgstr "Klarte ikke finne informasjon om %s - lista over kildekodepakker" -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 +#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 msgid "Reading package lists" msgstr "Leser pakkelister" -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1302 msgid "Collecting File Provides" msgstr "Samler inn filtilbud" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 msgid "IO Error saving source cache" msgstr "IO-feil ved lagring av kildekode-lager" @@ -3194,22 +3194,22 @@ msgstr "Skriver ny kildeliste\n" msgid "Source list entries for this disc are:\n" msgstr "Kildelisteoppføringer for denne CD-en er:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 #, c-format msgid "Wrote %i records.\n" msgstr "Skrev %i poster.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Skrev %i poster med %i manglende filer.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Skrev %i poster med %i feile filer.\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Skrev %i poster med %i manglende filer og %i feile filer.\n" diff --git a/po/ne.po b/po/ne.po index 66064f559..48623413d 100644 --- a/po/ne.po +++ b/po/ne.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2006-06-12 14:35+0545\n" "Last-Translator: Shiva Pokharel \n" "Language-Team: Nepali \n" @@ -158,7 +158,7 @@ msgstr " संस्करण तालिका:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1559,7 +1559,7 @@ msgstr "आन्तरिक त्रुटि" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 @@ -1684,7 +1684,7 @@ msgstr "" " -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n" " -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 #, c-format msgid "Unable to write to %s" msgstr " %s मा लेख्न असक्षम" @@ -1693,31 +1693,31 @@ msgstr " %s मा लेख्न असक्षम" msgid "Cannot get debconf version. Is debconf installed?" msgstr " debconf संस्करण प्राप्त गर्न सकिएन । के debconf स्थापना भयो ? " -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "प्याकेज विस्तार सूचि अति लामो छ" #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format msgid "Error processing directory %s" msgstr "डाइरेक्ट्री %s प्रक्रिया गर्दा त्रुटि" -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "स्रोत विस्तार सूचि अति लामो छ" -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "सामाग्री फाइलहरुमा हेडर लेख्दा त्रुटि" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, c-format msgid "Error processing contents %s" msgstr "सामग्री %sप्रक्रिया गर्दा त्रुटि" -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1800,11 +1800,11 @@ msgstr "" " -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n" " -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्" -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "कुनै चयनहरू मेल खाएन" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "केही फाइलहरू प्याकेज फाइल समूह `%s' मा हराइरहेको छ" @@ -1830,8 +1830,8 @@ msgstr "" msgid "Unable to open DB file %s: %s" msgstr "DB फाइल %s असक्षम भयो: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr " %s स्थिर गर्न असफल" @@ -1909,22 +1909,22 @@ msgstr "यस %sB हिटको डि लिङ्क सिमा।\n" msgid "Archive had no package field" msgstr "संग्रह संग कुनै प्याकेज फाँट छैन" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:814 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s संभारकर्ता %s हो %s होइन\n" -#: ftparchive/writer.cc:708 +#: ftparchive/writer.cc:711 #, fuzzy, c-format msgid " %s has no source override entry\n" msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:715 #, fuzzy, c-format msgid " %s has no binary override entry either\n" msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n" @@ -1998,7 +1998,7 @@ msgstr "MD5 गणना गर्दा पढ्न असफल भयो" msgid "Problem unlinking %s" msgstr "समस्या अनलिङ्क भइरहेछ %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr " %s मा %s पुन:नामकरण असफल भयो" @@ -2143,54 +2143,54 @@ msgstr "फाइल %s लेख्न असफल भयो" msgid "Failed to close file %s" msgstr "%s फाइल बन्द गर्न असफल भयो" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "बाटो %s अति लामो छ " -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "एक भन्दा बढी %s अनप्याक गरिदैछ" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "डाइरेक्ट्री %s फेरियो " -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "प्याकेज लक्षित मोडमा लेख्ने प्यास गर्दैछ %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" msgstr "घुम्ती बाटो अति लामो छ" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "डाइरेक्ट्री %s डाइरेक्ट्री विहिन द्वारा बदलिदैछ" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "यसको ह्यास बाल्टीमा नोड स्थित गर्न असफल भयो" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "बाटो अति लामो छ" -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr " %s को लागि संस्करन बिना अधिलेखन प्याकेज मेल खायो" -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "फाइल %s/%s ले प्याकेज %s मा एउटा अधिलेखन गर्दछ" -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "%s स्थिर गर्न असक्षम भयो" @@ -2572,59 +2572,59 @@ msgstr "यो APT ले संस्करण प्रणालीलाई msgid "The package cache was built for a different architecture" msgstr "प्याकेज क्यास विभिन्न वास्तुकलाको लागि निर्माण भएको हो" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "आधारित" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "पुन:आधारित" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "सुझाव दिन्छ" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "सिफारिस गर्दछ" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "द्वन्दहरू" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "बदल्छ" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "वेकायमहरू" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "महत्वपूर्ण" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "आवश्यक" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "मानक" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "वैकल्पिक" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "अतिरिक्त" @@ -2725,12 +2725,12 @@ msgstr "%s खोलिदैछ" msgid "Line %u too long in source list %s." msgstr "लाइन %u स्रोत सूचि %s मा अति लामो छ ।" -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "वैरुप्य लाइन %u स्रोत सूचिमा %s (प्रकार)" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन" @@ -2890,14 +2890,14 @@ msgstr "क्यास संग एउटा नमिल्दो संस #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 +#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 +#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 +#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 +#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 +#: apt-pkg/pkgcachegen.cc:561 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (pkg फेला पार्नुहोस् )" @@ -2919,26 +2919,26 @@ msgstr "वाऊ, APT ले सक्षम गरेको संस्कर msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "वाऊ, APT ले सक्षम गरेको निर्भरताहरुको नम्बरलाई तपाईँले उछिन्नुभयो । " -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:568 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "फाइल निर्भरताहरू प्रक्रिया गर्दा प्याकेज %s %s फेला परेन" -#: apt-pkg/pkgcachegen.cc:1150 +#: apt-pkg/pkgcachegen.cc:1197 #, c-format msgid "Couldn't stat source package list %s" msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन " -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 +#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 msgid "Reading package lists" msgstr "प्याकेज सूचिहरू पढिदैछ" -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1302 msgid "Collecting File Provides" msgstr "फाइल उपलब्धताहरू संकलन गरिदैछ" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 msgid "IO Error saving source cache" msgstr "स्रोत क्यास बचत गर्दा IO त्रुटि" @@ -3143,22 +3143,22 @@ msgstr "नयाँ स्रोत सूचि लेखिदैछ\n" msgid "Source list entries for this disc are:\n" msgstr "यो डिस्कको लागि स्रोत सूचि प्रविष्टिहरू:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 #, c-format msgid "Wrote %i records.\n" msgstr "%i रेकर्डहरू लेखियो ।\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "हराइरहेको फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "मेल नखाएका फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "हराइरहेको फाइल %i हरू र मेल नखाएका फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n" diff --git a/po/nl.po b/po/nl.po index 408ce4b8b..4d770805b 100644 --- a/po/nl.po +++ b/po/nl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.15.9\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2011-12-05 17:10+0100\n" "Last-Translator: Jeroen Schot \n" "Language-Team: Debian l10n Dutch \n" @@ -158,7 +158,7 @@ msgstr " Versietabel:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1613,7 +1613,7 @@ msgstr "Interne fout" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 @@ -1746,7 +1746,7 @@ msgstr "" " -c=? Lees dit configuratiebestand.\n" " -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 #, c-format msgid "Unable to write to %s" msgstr "Kan niet naar %s schrijven" @@ -1755,31 +1755,31 @@ msgstr "Kan niet naar %s schrijven" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Kan versie van debconf niet bepalen. Is debconf geïnstalleerd?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "Pakket-extensielijst is te lang" #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format msgid "Error processing directory %s" msgstr "Fout bij het verwerken van map %s" -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "Bron-extensielijst is te lang" -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "Fout bij wegschrijven van de koptekst naar het 'contents'-bestand" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, c-format msgid "Error processing contents %s" msgstr "Fout bij het verwerken van de inhoud van %s" -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1863,11 +1863,11 @@ msgstr "" " -c=? Lees dit configuratiebestand in\n" " -o=? Stel een willekeurige configuratie optie in" -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "Geen van de selecties kwam overeen" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Sommige bestanden zijn niet aanwezig in de pakketbestandsgroep '%s'" @@ -1895,8 +1895,8 @@ msgstr "" msgid "Unable to open DB file %s: %s" msgstr "Kan het DB-bestand %s niet openen: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "stat op %s is mislukt" @@ -1974,22 +1974,22 @@ msgstr " Ontlinklimiet van %sB bereikt.\n" msgid "Archive had no package field" msgstr "Archief heeft geen 'package'-veld" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr " %s heeft geen voorrangsingang\n" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:814 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s beheerder is %s, niet %s\n" -#: ftparchive/writer.cc:708 +#: ftparchive/writer.cc:711 #, c-format msgid " %s has no source override entry\n" msgstr " %s heeft geen voorrangsingang voor bronpakketten\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:715 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s heeft ook geen voorrangsingang voor binaire pakketten\n" @@ -2063,7 +2063,7 @@ msgstr "Lezen tijdens het berekenen van de MD5 is mislukt" msgid "Problem unlinking %s" msgstr "Probleem bij het ontlinken van %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Hernoemen van %s naar %s is mislukt" @@ -2209,54 +2209,54 @@ msgstr "Wegschrijven van bestand %s is mislukt" msgid "Failed to close file %s" msgstr "Sluiten van bestand %s is mislukt" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "Het pad %s is te lang" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "%s wordt meer dan eens uitgepakt" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "De map %s is al omgeleid" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Het pakket probeert om het omleidingsdoel %s/%s weg te schrijven" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" msgstr "Het omleidingspad is te lang" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "De map %s wordt vervangen door een niet-map" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "Vinden van de knoop in de hash-emmer is mislukt" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "Het pad is te lang" -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Pakket-overeenkomst wordt overschreven met 'no version' voor %s" -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Het bestand %s/%s overschrijft het bestand van pakket %s" -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Kan de status van %s niet opvragen" @@ -2650,59 +2650,59 @@ msgstr "Deze APT ondersteunt het versienummeringssysteem '%s' niet" msgid "The package cache was built for a different architecture" msgstr "De pakketcache was aangemaakt voor een andere architectuur" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "Vereisten" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "Voor-Vereisten" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "Suggesties" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "Aanbevelingen" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "Conflicteert met" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "Vervangt" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "Verouderd" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "Breekt" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "Vult aan" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "belangrijk" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "noodzakelijk" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "standaard" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "optioneel" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "extra" @@ -2803,12 +2803,12 @@ msgstr "%s wordt geopend" msgid "Line %u too long in source list %s." msgstr "Regel %u van de bronlijst %s is te lang." -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Misvormde regel %u in bronlijst %s (type)" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Type '%s' op regel %u in bronlijst %s is onbekend" @@ -2981,14 +2981,14 @@ msgstr "Cache heeft een niet-compatibel versienummeringssysteem" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 +#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 +#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 +#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 +#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 +#: apt-pkg/pkgcachegen.cc:561 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Fout tijdens verwerken van %s (FindPkg)" @@ -3011,28 +3011,28 @@ msgstr "" msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Wauw, u heeft meer afhankelijkheden dan deze APT aan kan." -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:568 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Pakket %s %s werd niet gevonden bij het verwerken van de " "bestandsafhankelijkheden" -#: apt-pkg/pkgcachegen.cc:1150 +#: apt-pkg/pkgcachegen.cc:1197 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kon de status van de bronpakketlijst %s niet opvragen" -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 +#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 msgid "Reading package lists" msgstr "Pakketlijsten worden ingelezen" -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1302 msgid "Collecting File Provides" msgstr "Voorziene bestanden worden verzameld" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 msgid "IO Error saving source cache" msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakket-cache" @@ -3245,22 +3245,22 @@ msgstr "Nieuwe bronlijst wordt weggeschreven\n" msgid "Source list entries for this disc are:\n" msgstr "Bronlijst-ingangen voor de schijf zijn:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 #, c-format msgid "Wrote %i records.\n" msgstr "%i records weggeschreven.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i records weggeschreven met %i missende bestanden.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i records weggeschreven met %i niet overeenkomende bestanden\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/nn.po b/po/nn.po index 768999104..61a662795 100644 --- a/po/nn.po +++ b/po/nn.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_nn\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Havard Korsvoll \n" "Language-Team: Norwegian nynorsk \n" @@ -160,7 +160,7 @@ msgstr " Versjonstabell:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1576,7 +1576,7 @@ msgstr "Intern feil" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 @@ -1699,7 +1699,7 @@ msgstr "" " -c=? Les denne innstillingsfila.\n" " -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 #, c-format msgid "Unable to write to %s" msgstr "Klarte ikkje skriva til %s" @@ -1708,31 +1708,31 @@ msgstr "Klarte ikkje skriva til %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Finn ikkje debconf-versjonen. Er debconf installert?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "Lista over pakkeutvidingar er for lang" #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format msgid "Error processing directory %s" msgstr "Feil ved lesing av katalogen %s" -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "Lista over kjeldeutvidingar er for lang" -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "Feil ved skriving av topptekst til innhaldsfila" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, c-format msgid "Error processing contents %s" msgstr "Feil ved lesing av %s" -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 #, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" @@ -1812,11 +1812,11 @@ msgstr "" " -c=? Les denne oppsettsfila.\n" " -o=? Set ei vilkrleg innstilling." -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "Ingen utval passa" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Enkelte filer manglar i pakkefilgruppa %s" @@ -1842,8 +1842,8 @@ msgstr "" msgid "Unable to open DB file %s: %s" msgstr "Klarte ikkje opna DB-fila %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "Klarte ikkje f status til %s" @@ -1921,22 +1921,22 @@ msgstr " DeLink-grensa p msgid "Archive had no package field" msgstr "Arkivet har ikkje noko pakkefelt" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr " %s har inga overstyringsoppfring\n" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:814 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s-vedlikehaldaren er %s, ikkje %s\n" -#: ftparchive/writer.cc:708 +#: ftparchive/writer.cc:711 #, fuzzy, c-format msgid " %s has no source override entry\n" msgstr " %s har inga overstyringsoppfring\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:715 #, fuzzy, c-format msgid " %s has no binary override entry either\n" msgstr " %s har inga overstyringsoppfring\n" @@ -2010,7 +2010,7 @@ msgstr "Klarte ikkje lesa under utrekning av MD5" msgid "Problem unlinking %s" msgstr "Problem ved oppheving av lenkje til %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Klarte ikkje endra namnet p %s til %s" @@ -2155,54 +2155,54 @@ msgstr "Klarte ikkje skriva fila %s" msgid "Failed to close file %s" msgstr "Klarte ikkje lukka fila %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "Stigen %s er for lang" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "Pakkar ut %s meir enn in gong" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "Katalogen %s er avleidd" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Pakken prver skriva til avleiingsmlet %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" msgstr "Avleiingsstigen er for lang" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Katalogen %s vert bytt ut med ein ikkje-katalog" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "Fann ikkje noden i nkkelbtta" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "Stigen er for lang" -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Skriv over pakketreff utan versjon for %s" -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Fila %s/%s skriv over den tilsvarande fila i pakken %s" -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Klarte ikkje f status til %s" @@ -2585,59 +2585,59 @@ msgstr "APT st msgid "The package cache was built for a different architecture" msgstr "Pakkelageret er bygd for ein annan arkitektur" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "Krav" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "Forkrav" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "Forslag" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "Tilrdingar" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "Konflikt" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "Byter ut" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "Foreldar" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "viktig" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "pkravd" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "vanleg" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "valfri" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "tillegg" @@ -2738,12 +2738,12 @@ msgstr "Opnar %s" msgid "Line %u too long in source list %s." msgstr "Linja %u i kjeldelista %s er for lang." -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Misforma linje %u i kjeldelista %s (type)" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, fuzzy, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen %s er ukjend i linja %u i kjeldelista %s" @@ -2909,14 +2909,14 @@ msgstr "Mellomlageret brukar eit inkompatibelt versjonssystem" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 +#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 +#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 +#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 +#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 +#: apt-pkg/pkgcachegen.cc:561 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Feil ved behandling av %s (FindPkg)" @@ -2938,26 +2938,26 @@ msgstr "J msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Jss, du har overgtt talet p krav som APT kan handtera." -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:568 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Fann ikkje pakken %s %s ved behandling av filkrav" -#: apt-pkg/pkgcachegen.cc:1150 +#: apt-pkg/pkgcachegen.cc:1197 #, c-format msgid "Couldn't stat source package list %s" msgstr "Klarte ikkje f status p kjeldepakkelista %s" -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 +#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 msgid "Reading package lists" msgstr "Les pakkelister" -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1302 msgid "Collecting File Provides" msgstr "Samlar inn filtilbod" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 msgid "IO Error saving source cache" msgstr "IU-feil ved lagring av kjeldelager" @@ -3162,22 +3162,22 @@ msgstr "Skriv ny kjeldeliste\n" msgid "Source list entries for this disc are:\n" msgstr "Kjeldelisteoppfringar for denne disken er:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 #, c-format msgid "Wrote %i records.\n" msgstr "Skreiv %i postar.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Skreiv %i postar med %i manglande filer.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Skreiv %i postar med %i filer som ikkje passa\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Skreiv %i postar med %i manglande filer og %i filer som ikkje passa\n" diff --git a/po/pl.po b/po/pl.po index 61c3cd2b3..3d7636dab 100644 --- a/po/pl.po +++ b/po/pl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.3\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2012-07-28 21:53+0200\n" "Last-Translator: Michał Kułach \n" "Language-Team: Polish \n" @@ -162,7 +162,7 @@ msgstr " Tabela wersji:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1650,7 +1650,7 @@ msgstr "Błąd wewnętrzny" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 @@ -1780,7 +1780,7 @@ msgstr "" " -c=? Czyta wskazany plik konfiguracyjny.\n" " -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 #, c-format msgid "Unable to write to %s" msgstr "Nie udało się pisać do %s" @@ -1789,31 +1789,31 @@ msgstr "Nie udało się pisać do %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nie udało się pobrać wersji debconf. Czy debconf jest zainstalowany?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "Lista rozszerzeń pakietów jest zbyt długa" #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format msgid "Error processing directory %s" msgstr "Błąd przetwarzania katalogu %s" -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "Lista rozszerzeń źródeł jest zbyt długa" -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "Błąd przy zapisywaniu nagłówka do pliku zawartości" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, c-format msgid "Error processing contents %s" msgstr "Błąd podczas przetwarzania zawartości %s" -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1896,11 +1896,11 @@ msgstr "" " -c=? Czyta wskazany plik konfiguracyjny\n" " -o=? Ustawia dowolną opcję konfiguracji" -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "Nie dopasowano żadnej nazwy" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Brakuje pewnych plików w grupie plików pakietów \"%s\"" @@ -1928,8 +1928,8 @@ msgstr "" msgid "Unable to open DB file %s: %s" msgstr "Nie udało się otworzyć pliku bazy %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "Nie udało się wykonać operacji stat na %s" @@ -2007,22 +2007,22 @@ msgstr " Osiągnięto ograniczenie odłączania %sB.\n" msgid "Archive had no package field" msgstr "Archiwum nie posiadało pola pakietu" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr " %s nie posiada wpisu w pliku override\n" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:814 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " opiekunem %s jest %s, a nie %s\n" -#: ftparchive/writer.cc:708 +#: ftparchive/writer.cc:711 #, c-format msgid " %s has no source override entry\n" msgstr " %s nie posiada wpisu w pliku override źródeł\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:715 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s nie posiada również wpisu w pliku override binariów\n" @@ -2096,7 +2096,7 @@ msgstr "Nie udało się czytanie w czasie liczenia skrótu MD5" msgid "Problem unlinking %s" msgstr "Problem przy usuwaniu %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Nie udało się zmienić nazwy %s na %s" @@ -2241,54 +2241,54 @@ msgstr "Nie udało się zapisać pliku %s" msgid "Failed to close file %s" msgstr "Nie udało się zamknąć pliku %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "Ścieżka %s jest zbyt długa" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "Wypakowanie %s więcej niż raz" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "Ominięcie katalogu %s" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Pakiet próbuje pisać do celu ominięcia %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" msgstr "Zbyt długa ścieżka ominięcia" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Katalog %s został zastąpiony obiektem nie będącym katalogiem" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "Nie udało się znaleźć węzła w jego kubełku haszującym" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "Ścieżka jest zbyt długa" -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Nadpisujący pakiet nie pasuje z wersją %s" -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Plik %s/%s nadpisuje plik w pakiecie %s" -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Nie można wykonać operacji stat na %s" @@ -2681,59 +2681,59 @@ msgstr "Ta wersja APT nie obsługuje systemu wersji \"%s\"" msgid "The package cache was built for a different architecture" msgstr "Ten magazyn podręczny pakietów został zbudowany dla innej architektury" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "Wymaga" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "Wymaga wstępnie" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "Sugeruje" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "Poleca" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "W konflikcie z" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "Zastępuje" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "Dezaktualizuje" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "Narusza zależności" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "Rozszerza" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "ważny" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "wymagany" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "standardowy" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "opcjonalny" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "dodatkowy" @@ -2835,12 +2835,12 @@ msgstr "Otwieranie %s" msgid "Line %u too long in source list %s." msgstr "Linia %u w liście źródeł %s jest zbyt długa." -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Nieprawidłowa linia %u w liście źródeł %s (typ)" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ \"%s\" jest nieznany w linii %u listy źródeł %s" @@ -3007,14 +3007,14 @@ msgstr "Magazyn podręczny ma niezgodny system wersji" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 +#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 +#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 +#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 +#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 +#: apt-pkg/pkgcachegen.cc:561 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Wystąpił błąd podczas przetwarzania %s (%s%d)" @@ -3035,27 +3035,27 @@ msgstr "Przekroczono liczbę opisów, którą ten APT jest w stanie obsłużyć. msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Przekroczono liczbę zależności, którą ten APT jest w stanie obsłużyć." -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:568 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Pakiet %s %s nie został odnaleziony podczas przetwarzania zależności plików" -#: apt-pkg/pkgcachegen.cc:1150 +#: apt-pkg/pkgcachegen.cc:1197 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nie udało się wykonać operacji stat na liście pakietów źródłowych %s" -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 +#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 msgid "Reading package lists" msgstr "Czytanie list pakietów" -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1302 msgid "Collecting File Provides" msgstr "Zbieranie zapewnień plików" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 msgid "IO Error saving source cache" msgstr "Błąd wejścia/wyjścia przy zapisywaniu podręcznego magazynu źródeł" @@ -3269,22 +3269,22 @@ msgstr "Zapisywanie nowej listy źródeł\n" msgid "Source list entries for this disc are:\n" msgstr "Źródła dla tej płyty to:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 #, c-format msgid "Wrote %i records.\n" msgstr "Zapisano %i rekordów.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Zapisano %i rekordów z %i brakującymi plikami.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Zapisano %i rekordów z %i niepasującymi plikami\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Zapisano %i rekordów z %i brakującymi plikami i %i niepasującymi\n" diff --git a/po/pt.po b/po/pt.po index 542e1efba..e958ead56 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2012-06-29 15:45+0100\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" @@ -158,7 +158,7 @@ msgstr " Tabela de Versão:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1625,7 +1625,7 @@ msgstr "Erro interno" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 @@ -1757,7 +1757,7 @@ msgstr "" " -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 #, c-format msgid "Unable to write to %s" msgstr "Não conseguiu escrever para %s" @@ -1766,31 +1766,31 @@ msgstr "Não conseguiu escrever para %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Não pode obter a versão do debconf. O debconf está instalado?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "A lista de extensão de pacotes é demasiado longa" #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format msgid "Error processing directory %s" msgstr "Erro ao processar o directório %s" -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "Lista de extensão de códigos-fonte é demasiado longa" -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "Erro ao escrever o cabeçalho no ficheiro de conteúdo" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, c-format msgid "Error processing contents %s" msgstr "Erro ao processar o conteúdo %s" -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1871,11 +1871,11 @@ msgstr "" " -c=? Ler este ficheiro de configuração\n" " -o=? Definir uma opção de configuração arbitrária" -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "Nenhuma selecção coincidiu" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Faltam alguns ficheiros no grupo `%s' do ficheiro do pacote" @@ -1903,8 +1903,8 @@ msgstr "" msgid "Unable to open DB file %s: %s" msgstr "Não foi possível abrir o ficheiro %s da base de dados: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "Falha stat %s" @@ -1982,22 +1982,22 @@ msgstr " Limite DeLink de %sB atingido.\n" msgid "Archive had no package field" msgstr "Arquivo não possuía campo package" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr " %s não possui entrada override\n" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:814 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " o maintainer de %s é %s, não %s\n" -#: ftparchive/writer.cc:708 +#: ftparchive/writer.cc:711 #, c-format msgid " %s has no source override entry\n" msgstr " %s não possui fonte de entrada de 'override'\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:715 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s também não possui entrada binária de 'override'\n" @@ -2071,7 +2071,7 @@ msgstr "Falhou ler durante o cálculo de MD5" msgid "Problem unlinking %s" msgstr "Problema ao executar unlinking %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Falhou renomear %s para %s" @@ -2216,54 +2216,54 @@ msgstr "Falhou escrever o ficheiro %s" msgid "Failed to close file %s" msgstr "Falhou fechar o ficheiro %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "O caminho %s é demasiado longo" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "A descompactar %s mais de uma vez" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "O directório %s é desviado" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "O pacote está a tentar escrever no alvo de desvio %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" msgstr "O caminho de desvio é muito longo" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "O directório %s está a ser substituído por um não-directório" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "Falhou localizar o nó no seu hash bucket" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "O caminho é demasiado longo" -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Substituir o pacote correspondente sem versão para %s" -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "O ficheiro %s/%s substitui o que está no pacote %s" -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Não foi possível fazer stat %s" @@ -2658,59 +2658,59 @@ msgstr "Este APT não suporta o sistema de versões '%s'" msgid "The package cache was built for a different architecture" msgstr "A cache de pacotes foi gerada para uma arquitectura diferente" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "Depende" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "Pré-Depende" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "Sugere" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "Recomenda" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "Em Conflito" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "Substitui" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "Obsoleta" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "Estraga" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "Aumenta" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "importante" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "necessário" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "padrão" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "opcional" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "extra" @@ -2813,12 +2813,12 @@ msgstr "A abrir %s" msgid "Line %u too long in source list %s." msgstr "Linha %u é demasiado longa na lista de fontes %s." -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Linha mal formada %u na lista de fontes %s (tipo)" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s" @@ -2990,14 +2990,14 @@ msgstr "A cache possui um sistema de versões incompatível" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 +#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 +#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 +#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 +#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 +#: apt-pkg/pkgcachegen.cc:561 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Ocorreu um erro ao processar %s (%s%d)" @@ -3023,27 +3023,27 @@ msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Uau, você excedeu o número de dependências que este APT é capaz de suportar." -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:568 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "O pacote %s %s não foi encontrado ao processar as dependências de ficheiros" -#: apt-pkg/pkgcachegen.cc:1150 +#: apt-pkg/pkgcachegen.cc:1197 #, c-format msgid "Couldn't stat source package list %s" msgstr "Não foi possível executar stat à lista de pacotes de código fonte %s" -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 +#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 msgid "Reading package lists" msgstr "A ler as listas de pacotes" -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1302 msgid "Collecting File Provides" msgstr "A obter File Provides" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 msgid "IO Error saving source cache" msgstr "Erro de I/O ao gravar a cache de código fonte" @@ -3262,22 +3262,22 @@ msgstr "A escrever lista de novas source\n" msgid "Source list entries for this disc are:\n" msgstr "As entradas de listas de Source para este Disco são:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 #, c-format msgid "Wrote %i records.\n" msgstr "Escreveu %i registos.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Escreveu %i registos com %i ficheiros em falta.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Escreveu %i registos com %i ficheiros não coincidentes\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 86a90305b..922279f9e 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2008-11-17 02:33-0200\n" "Last-Translator: Felipe Augusto van de Wiel (faw) \n" "Language-Team: Brazilian Portuguese \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2008-11-15 02:21+0200\n" "Last-Translator: Eddy Petrișor \n" "Language-Team: Romanian \n" @@ -159,7 +159,7 @@ msgstr " Tabela de versiuni:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1600,7 +1600,7 @@ msgstr "Eroare internă" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 @@ -1726,7 +1726,7 @@ msgstr "" " -c=? Citește acest fișier de configurare\n" " -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 #, c-format msgid "Unable to write to %s" msgstr "Nu s-a putut scrie în %s" @@ -1735,31 +1735,31 @@ msgstr "Nu s-a putut scrie în %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nu s-a putut citi versiunea debconf. Este instalat debconf?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "Lista de extensii pentru pachet este prea lungă" #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format msgid "Error processing directory %s" msgstr "Eroare la prelucrarea directorului %s" -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "Lista de extensii pentru sursă este prea lungă" -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "Eroare la scrierea antetului în fișierul index" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, c-format msgid "Error processing contents %s" msgstr "Eroare la prelucrarea conținutului %s" -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1847,11 +1847,11 @@ msgstr "" " -c=? Citește acest fișier de configurare\n" " -o=? Ajustează o opțiune de configurare arbitrară" -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "Nu s-a potrivit nici o selecție" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Unele fișiere lipsesc din grupul fișierului pachet '%s'" @@ -1880,8 +1880,8 @@ msgstr "" msgid "Unable to open DB file %s: %s" msgstr "Nu s-a putut deschide fișierul DB %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "Eșec la „stat” pentru %s" @@ -1959,22 +1959,22 @@ msgstr " Limita de %sB a dezlegării a fost atinsă.\n" msgid "Archive had no package field" msgstr "Arhiva nu are câmp de pachet" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr " %s nu are intrare de înlocuire\n" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:814 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s responsabil este %s nu %s\n" -#: ftparchive/writer.cc:708 +#: ftparchive/writer.cc:711 #, c-format msgid " %s has no source override entry\n" msgstr " %s nu are nici o intrare sursă de înlocuire\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:715 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s nu are nici intrare binară de înlocuire\n" @@ -2048,7 +2048,7 @@ msgstr "Eșec la citire în timpul calculului sumei MD5" msgid "Problem unlinking %s" msgstr "Problemă la desfacerea %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Eșec la redenumirea lui %s în %s" @@ -2196,55 +2196,55 @@ msgstr "Eșec la scrierea fișierului %s" msgid "Failed to close file %s" msgstr "Eșec la închiderea fișierului %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "Calea %s este prea lungă" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "Se despachetează %s de mai multe ori" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "Directorul %s este redirectat" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Pachetul încearcă să scrie în ținta redirectării %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" msgstr "Calea de redirectare este prea lungă" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Directorul %s este înlocuit de un non-director" # XXX: nu-mi place, hash bucket ar trebui tradus mai elegant -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "Eșec la localizarea nodului în clasa lui din tabela de dispersie" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "Calea este prea lungă" -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Pachet suprascris fără nici o versiune pentru %s" -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Fișierul %s/%s îl suprascrie pe cel din pachetul %s" -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Nu se poate executa „stat” pe %s" @@ -2630,59 +2630,59 @@ msgstr "Acest APT nu suportă versioning system '%s'" msgid "The package cache was built for a different architecture" msgstr "Cache-ul pachetului a fost construit pentru o arhitectură diferită" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "Depinde" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "Pre-depinde" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "Sugerează" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "Recomandă" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "Este în conflict" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "Înlocuiește" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "Învechit" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "Corupe" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "important" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "cerut" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "opțional" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "extra" @@ -2782,12 +2782,12 @@ msgstr "Deschidere %s" msgid "Line %u too long in source list %s." msgstr "Linia %u prea lungă în lista sursă %s." -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Linie greșită %u în lista sursă %s (tip)" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s" @@ -2953,14 +2953,14 @@ msgstr "Cache are un versioning system incompatibil" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 +#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 +#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 +#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 +#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 +#: apt-pkg/pkgcachegen.cc:561 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Eroare apărută în timpul procesării %s (FindPkg)" @@ -2986,27 +2986,27 @@ msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Mamăăă, ați depășit numărul de dependențe de care este capabil acest APT." -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:568 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Nu s-a găsit pachetul %s %s în timpul procesării dependențelor de fișiere" -#: apt-pkg/pkgcachegen.cc:1150 +#: apt-pkg/pkgcachegen.cc:1197 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nu pot determina starea listei surse de pachete %s" -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 +#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 msgid "Reading package lists" msgstr "Citire liste de pachete" -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1302 msgid "Collecting File Provides" msgstr "Colectare furnizori fișier" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 msgid "IO Error saving source cache" msgstr "Eroare IO în timpul salvării sursei cache" @@ -3216,22 +3216,22 @@ msgstr "Scriere noua listă sursă\n" msgid "Source list entries for this disc are:\n" msgstr "Intrările listei surselor pentru acest disc sunt:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 #, c-format msgid "Wrote %i records.\n" msgstr "S-au scris %i înregistrări.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "S-au scris %i înregistrări cu %i fișiere lipsă.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "S-au scris %i înregistrări cu %i fișiere nepotrivite\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/ru.po b/po/ru.po index c33fb9844..01dd870f7 100644 --- a/po/ru.po +++ b/po/ru.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: apt rev2227.1.3\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2012-06-30 08:47+0400\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" @@ -163,7 +163,7 @@ msgstr " Таблица версий:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1645,7 +1645,7 @@ msgstr "Внутренняя ошибка" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 @@ -1773,7 +1773,7 @@ msgstr "" " -c=? Читать указанный файл настройки\n" " -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 #, c-format msgid "Unable to write to %s" msgstr "Невозможно записать в %s" @@ -1782,32 +1782,32 @@ msgstr "Невозможно записать в %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Невозможно определить версию debconf. Он установлен?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "Список расширений, допустимых для пакетов, слишком длинен" #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format msgid "Error processing directory %s" msgstr "Ошибка обработки каталога %s" -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "Список расширений источников слишком длинен" -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "" "Ошибка записи заголовка в полный перечень содержимого пакетов (Contents)" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, c-format msgid "Error processing contents %s" msgstr "ошибка обработки полного перечня содержимого пакетов (Contents) %s" -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1893,11 +1893,11 @@ msgstr "" " -c=? Использовать указанный файл настройки\n" " -o=? Задать значение произвольному параметру настройки" -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "Совпадений не обнаружено" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "В группе пакетов «%s» отсутствуют некоторые файлы" @@ -1925,8 +1925,8 @@ msgstr "" msgid "Unable to open DB file %s: %s" msgstr "Не удалось открыть DB файл %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "Не удалось получить атрибуты %s" @@ -2004,22 +2004,22 @@ msgstr " Превышен лимит в %sB в DeLink.\n" msgid "Archive had no package field" msgstr "В архиве нет поля package" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr " Нет записи о переназначении (override) для %s\n" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:814 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " пакет %s сопровождает %s, а не %s\n" -#: ftparchive/writer.cc:708 +#: ftparchive/writer.cc:711 #, c-format msgid " %s has no source override entry\n" msgstr " Нет записи source override для %s\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:715 #, c-format msgid " %s has no binary override entry either\n" msgstr " Нет записи binary override для %s\n" @@ -2094,7 +2094,7 @@ msgstr "Ошибка чтения во время вычисления MD5" msgid "Problem unlinking %s" msgstr "Не удалось удалить %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Не удалось переименовать %s в %s" @@ -2239,54 +2239,54 @@ msgstr "Не удалось записать в файл %s" msgid "Failed to close file %s" msgstr "Не удалось закрыть файл %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "Слишком длинный путь %s" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "Повторная распаковка %s" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "Каталог %s входит в список diverted" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Пакет пытается писать в diversion %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" msgstr "Путь diversion слишком длинен" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Каталог %s был заменён не-каталогом" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "Не удалось разместить узел в хеше" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "Путь слишком длинен" -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Файлы заменяются содержимым пакета %s без версии" -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Файл %s/%s переписывает файл в пакете %s" -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Невозможно получить атрибуты %s" @@ -2682,59 +2682,59 @@ msgstr "Эта версия APT не поддерживает систему в msgid "The package cache was built for a different architecture" msgstr "Кэш пакетов был собран для другой архитектуры" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "Зависит" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "ПредЗависит" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "Предлагает" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "Рекомендует" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "Конфликтует" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "Заменяет" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "Замещает" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "Ломает" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "Улучшает" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "важный" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "необходимый" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "стандартный" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "необязательный" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "дополнительный" @@ -2838,12 +2838,12 @@ msgstr "Открытие %s" msgid "Line %u too long in source list %s." msgstr "Строка %u в списке источников %s слишком длинна." -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Искажённая строка %u в списке источников %s (тип)" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Неизвестный тип «%s» в строке %u в списке источников %s" @@ -3009,14 +3009,14 @@ msgstr "Кэш имеет несовместимую систему версий #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 +#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 +#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 +#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 +#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 +#: apt-pkg/pkgcachegen.cc:561 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Произошла ошибка во время обработки %s (%s%d)" @@ -3043,26 +3043,26 @@ msgstr "" "Превышено допустимое количество зависимостей, которое способен обработать " "APT." -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:568 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Во время обработки файла зависимостей не найден пакет %s %s" -#: apt-pkg/pkgcachegen.cc:1150 +#: apt-pkg/pkgcachegen.cc:1197 #, c-format msgid "Couldn't stat source package list %s" msgstr "Не удалось получить атрибуты списка пакетов исходного кода %s" -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 +#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 msgid "Reading package lists" msgstr "Чтение списков пакетов" -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1302 msgid "Collecting File Provides" msgstr "Сбор информации о Provides" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 msgid "IO Error saving source cache" msgstr "Ошибка ввода/вывода при попытке сохранить кэш источников" @@ -3275,22 +3275,22 @@ msgstr "Запись нового списка источников\n" msgid "Source list entries for this disc are:\n" msgstr "Записи в списке источников для этого диска:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 #, c-format msgid "Wrote %i records.\n" msgstr "Сохранено %i записей.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Сохранено %i записей с %i отсутствующими файлами.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Сохранено %i записей с %i несовпадающими файлами\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/sk.po b/po/sk.po index 883ad8b2f..033dd8f40 100644 --- a/po/sk.po +++ b/po/sk.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2012-06-28 20:49+0100\n" "Last-Translator: Ivan Masár \n" "Language-Team: Slovak \n" @@ -159,7 +159,7 @@ msgstr " Tabuľka verzií:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1618,7 +1618,7 @@ msgstr "Vnútorná chyba" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 @@ -1745,7 +1745,7 @@ msgstr "" " -c=? Načíta tento konfiguračný súbor\n" " -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 #, c-format msgid "Unable to write to %s" msgstr "Do %s sa nedá zapisovať" @@ -1754,31 +1754,31 @@ msgstr "Do %s sa nedá zapisovať" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nedá sa určiť verzia programu debconf. Je debconf nainštalovaný?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "Zoznam rozšírení balíka je príliš dlhý" #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format msgid "Error processing directory %s" msgstr "Chyba pri spracovávaní adresára %s" -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "Zoznam zdrojových rozšírení je príliš dlhý" -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "Chyba pri zapisovaní hlavičky do súboru" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, c-format msgid "Error processing contents %s" msgstr "Chyba pri spracovávaní obsahu %s" -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1858,11 +1858,11 @@ msgstr "" " -c=? Načíta tento konfiguračný súbor\n" " -o=? Nastaví ľubovoľnú voľbu" -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "Nevyhovel žiaden výber" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "V súbore balíka skupiny „%s“ chýbajú niektoré súbory" @@ -1890,8 +1890,8 @@ msgstr "" msgid "Unable to open DB file %s: %s" msgstr "Nedá sa otvoriť DB súbor %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "%s sa nedá vyhodnotiť" @@ -1969,22 +1969,22 @@ msgstr " Bol dosiahnutý odlinkovací limit %sB.\n" msgid "Archive had no package field" msgstr "Archív neobsahuje pole „package“" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr " %s nemá žiadnu položku override\n" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:814 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " správcom %s je %s, nie %s\n" -#: ftparchive/writer.cc:708 +#: ftparchive/writer.cc:711 #, c-format msgid " %s has no source override entry\n" msgstr " %s nemá žiadnu položku „source override“\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:715 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s nemá žiadnu položku „binary override“\n" @@ -2058,7 +2058,7 @@ msgstr "Chyba čítania pri výpočte MD5" msgid "Problem unlinking %s" msgstr "Problém s odlinkovaním %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Premenovanie %s na %s zlyhalo" @@ -2202,54 +2202,54 @@ msgstr "Zápis súboru %s zlyhal" msgid "Failed to close file %s" msgstr "Zatvorenie súboru %s zlyhalo" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "Cesta %s je príliš dlhá" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "%s sa rozbaľuje viackrát" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "Adresár %s je divertovaný" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Balík sa pokúša zapisovať do diverzného cieľa %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" msgstr "Diverzná cesta je príliš dlhá" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Adresár %s sa nahradí neadresárom" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "Nedá sa nájsť uzol na adrese jeho hašu" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "Cesta je príliš dlhá" -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Prepísať zodpovedajúci balík bez udania verzie pre %s" -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Súbor %s/%s prepisuje ten z balíka %s" -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Nedá sa vyhodnotiť %s" @@ -2635,59 +2635,59 @@ msgstr "Tento APT nepodporuje systém na správu verzií „%s“" msgid "The package cache was built for a different architecture" msgstr "Súbor vyrovnávacej pamäti balíkov bol vytvorený pre inú architektúru" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "Závisí na" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "Predzávisí na" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "Navrhuje" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "Odporúča" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "Koliduje s" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "Nahrádza" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "Zneplatňuje" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "Kazí" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "Rozširuje" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "dôležitý" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "požadovaný" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "štandardný" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "voliteľný" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "extra" @@ -2788,12 +2788,12 @@ msgstr "Otvára sa %s" msgid "Line %u too long in source list %s." msgstr "Riadok %u v zozname zdrojov %s je príliš dlhý." -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ „%s“ je neznámy na riadku %u v zozname zdrojov %s" @@ -2956,14 +2956,14 @@ msgstr "Vyrovnávacia pamäť má nezlučiteľný systém na správu verzií" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 +#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 +#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 +#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 +#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 +#: apt-pkg/pkgcachegen.cc:561 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Vyskytla sa chyba pri spracovávaní %s (%s%d)" @@ -2986,26 +2986,26 @@ msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Fíha, prekročili ste počet závislostí, ktoré toto APT zvládne spracovať." -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:568 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Pri spracovaní závislostí nebol nájdený balík %s %s" -#: apt-pkg/pkgcachegen.cc:1150 +#: apt-pkg/pkgcachegen.cc:1197 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nedá sa vyhodnotiť zoznam zdrojových balíkov %s" -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 +#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 msgid "Reading package lists" msgstr "Načítavajú sa zoznamy balíkov" -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1302 msgid "Collecting File Provides" msgstr "Collecting File poskytuje" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 msgid "IO Error saving source cache" msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäti" @@ -3218,22 +3218,22 @@ msgstr "Zapisuje sa nový zoznam zdrojov\n" msgid "Source list entries for this disc are:\n" msgstr "Položky zoznamu zdrojov pre tento disk sú:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 #, c-format msgid "Wrote %i records.\n" msgstr "Zapísaných %i záznamov.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Zapísaných %i záznamov s %i chýbajúcimi súbormi.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Zapísaných %i záznamov s %i chybnými súbormi\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Zapísaných %i záznamov s %i chýbajúcimi a %i chybnými súbormi\n" diff --git a/po/sl.po b/po/sl.po index 1a0155f39..ce627366c 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2012-06-27 21:29+0000\n" "Last-Translator: Andrej Znidarsic \n" "Language-Team: Slovenian \n" @@ -157,7 +157,7 @@ msgstr " Preglednica različic:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1616,7 +1616,7 @@ msgstr "Notranja napaka" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 @@ -1744,7 +1744,7 @@ msgstr "" " -c=? Prebere podano datoteko z nastavitvami\n" " -o=? Nastavi poljubno nastavitveno možnost, na primer. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 #, c-format msgid "Unable to write to %s" msgstr "Ni mogoče pisati na %s" @@ -1753,31 +1753,31 @@ msgstr "Ni mogoče pisati na %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Ni mogoče ugotoviti različice debconfa. Je sploh nameščen?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "Seznam razširitev paketov je predolg" #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format msgid "Error processing directory %s" msgstr "Napaka med obdelavo mape %s" -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "Seznam razširitev virov je predolg" -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "Napaka med pisanjem glave v datoteko vsebine" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, c-format msgid "Error processing contents %s" msgstr "Napaka med obdelavo vsebine %s" -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1857,11 +1857,11 @@ msgstr "" " -c=? prebere to nastavitveno datoteko\n" " -o=? nastavi poljubno možnost nastavitve" -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "Nobena izbira se ne ujema" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Nekatere datoteke manjkajo v skupini datotek paketov `%s'" @@ -1889,8 +1889,8 @@ msgstr "" msgid "Unable to open DB file %s: %s" msgstr "Ni mogoče odprti datoteke PZ %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "Napaka med določitvijo %s" @@ -1968,22 +1968,22 @@ msgstr " Dosežena meja RazVezovanja %sB.\n" msgid "Archive had no package field" msgstr "Arhiv ni imel polja s paketom" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr " %s nima prepisanega vnosa\n" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:814 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " Vzdrževalec %s je %s in ne %s\n" -#: ftparchive/writer.cc:708 +#: ftparchive/writer.cc:711 #, c-format msgid " %s has no source override entry\n" msgstr " %s nima izvornega vnosa prepisa\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:715 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s nima tudi binarnega vnosa prepisa\n" @@ -2057,7 +2057,7 @@ msgstr "Med računanjem MD5 ni mogoče brati" msgid "Problem unlinking %s" msgstr "Napaka med odvezovanjem %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Ni mogoče preimenovati %s v %s" @@ -2203,54 +2203,54 @@ msgstr "Zapisovanje datoteke %s je spodletelo" msgid "Failed to close file %s" msgstr "Napaka med zapiranjem datoteke %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "Pot %s je predolga" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "Odpakiranje %s več kot enkrat" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "Mapa %s je odklonjena" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Paket poskuša pisati v tarčo odklona %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" msgstr "Pot odklona je predloga" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Mapa %s je bil zamenjana z ne-mapo" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "Iskanje vozlišča v njegovem razpršenem vedru ni uspelo" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "Pot je predolga" -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Prepiši zadetek paketa brez vnosa različice za %s" -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Datoteka %s/%s prepisuje datoteko v paketu %s" -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Ni mogoče določiti %s" @@ -2635,59 +2635,59 @@ msgstr "Ta APT ne podpira sistema različic '%s'" msgid "The package cache was built for a different architecture" msgstr "Predpomnilnik paketov je bil izgrajen za drugačno arhitekturo" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "Odvisen od" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "Predodvisen od" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "Priporoča" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "Priporoča" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "V sporu z" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "Zamenja" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "Zastara" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "Pokvari" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "Izboljša" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "pomembno" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "obvezno" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "običajni" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "izbirno" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "dodatno" @@ -2793,12 +2793,12 @@ msgstr "Odpiranje %s" msgid "Line %u too long in source list %s." msgstr "Vrstica %u v seznamu virov %s je predolga." -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Slabo oblikovana vrstica %u v seznamu virov %s (vrsta)" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Vrsta '%s' v vrstici %u na seznamu virov %s ni znana" @@ -2961,14 +2961,14 @@ msgstr "Predpomnilnik ima neustrezen sistem različic" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 +#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 +#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 +#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 +#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 +#: apt-pkg/pkgcachegen.cc:561 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Med obdelovanjem %s je prišlo do napake (%s%d)" @@ -2989,26 +2989,26 @@ msgstr "Čestitamo, presegli ste število opisov, ki jih je zmožen APT." msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Čestitamo, presegli ste število odvisnosti, ki jih zmore APT." -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:568 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Paketa %s %s ni bilo mogoče najti med obdelavo odvisnosti datotek" -#: apt-pkg/pkgcachegen.cc:1150 +#: apt-pkg/pkgcachegen.cc:1197 #, c-format msgid "Couldn't stat source package list %s" msgstr "Ni mogoče določiti seznama izvornih paketov %s" -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 +#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 msgid "Reading package lists" msgstr "Branje seznama paketov" -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1302 msgid "Collecting File Provides" msgstr "Zbiranje dobaviteljev datotek" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 msgid "IO Error saving source cache" msgstr "Napaka VI med shranjevanjem predpomnilnika virov" @@ -3223,22 +3223,22 @@ msgstr "Pisanje novega seznama virov\n" msgid "Source list entries for this disc are:\n" msgstr "Izvorni vnosi za ta disk so:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 #, c-format msgid "Wrote %i records.\n" msgstr "Zapisanih je bilo %i zapisov.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Zapisanih je bilo %i zapisov z %i manjkajočimi datotekami.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Zapisanih je bilo %i zapisov z %i neujemajočimi datotekami.\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/sv.po b/po/sv.po index 021578ace..ad79067a1 100644 --- a/po/sv.po +++ b/po/sv.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2010-08-24 21:18+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -157,7 +157,7 @@ msgstr " Versionstabell:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1608,7 +1608,7 @@ msgstr "Internt fel" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 @@ -1738,7 +1738,7 @@ msgstr "" " -c=? Läs denna konfigurationsfil.\n" " -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 #, c-format msgid "Unable to write to %s" msgstr "Kunde inte skriva till %s" @@ -1747,31 +1747,31 @@ msgstr "Kunde inte skriva till %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Kan inte ta reda på debconf-version. Är debconf installerat?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "Listan över filtillägg för Packages är för lång" #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format msgid "Error processing directory %s" msgstr "Fel vid behandling av katalogen %s" -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "Listan över filtillägg för Sources är för lång" -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "Fel vid skrivning av rubrik till innehållsfil" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, c-format msgid "Error processing contents %s" msgstr "Fel vid behandling av innehållet %s" -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1852,11 +1852,11 @@ msgstr "" " -c=? Läs denna konfigurationsfil\n" " -o=? Ställ in en godtycklig konfigurationsflagga" -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "Inga val träffades" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Några filer saknas i paketfilsgruppen \"%s\"" @@ -1884,8 +1884,8 @@ msgstr "" msgid "Unable to open DB file %s: %s" msgstr "Kunde inte öppna DB-filen %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "Misslyckades med att ta status på %s" @@ -1965,23 +1965,23 @@ msgstr " Avlänkningsgränsen på %sB nåddes.\n" msgid "Archive had no package field" msgstr "Arkivet har inget package-fält" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr " %s har ingen post i override-filen\n" # parametrar: paket, ny, gammal -#: ftparchive/writer.cc:479 ftparchive/writer.cc:814 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " ansvarig för paketet %s är %s ej %s\n" -#: ftparchive/writer.cc:708 +#: ftparchive/writer.cc:711 #, c-format msgid " %s has no source override entry\n" msgstr " %s har ingen källåsidosättningspost\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:715 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s har heller ingen binär åsidosättningspost\n" @@ -2057,7 +2057,7 @@ msgstr "Misslyckades med att läsa vid beräkning av MD5" msgid "Problem unlinking %s" msgstr "Problem med att länka ut %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Misslyckades med att byta namn på %s till %s" @@ -2202,54 +2202,54 @@ msgstr "Misslyckades med att skriva filen %s" msgid "Failed to close file %s" msgstr "Misslyckades med att stänga filen %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "Sökvägen %s är för lång" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "Packar upp %s flera gånger" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "Katalogen %s är omdirigerad" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Paketet försöker att skriva till omdirigeringsmålet %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" msgstr "Omdirigeringssökvägen är för lång" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Katalogen %s ersätts av en icke-katalog" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "Misslyckades med att hitta noden i sin hashkorg" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "Sökvägen är för lång" -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Skriv över paketträff utan version för %s" -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Filen %s/%s skriver över den i paketet %s" -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Kunde inte ta status på %s" @@ -2636,61 +2636,61 @@ msgstr "Denna APT saknar stöd för versionssystemet \"%s\"" msgid "The package cache was built for a different architecture" msgstr "Paketcachen byggdes för en annan arkitektur" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "Beroende av" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "Förberoende av" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "Föreslår" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "Rekommenderar" # "Konfliktar"? -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "Står i konflikt med" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "Ersätter" # "Föråldrar"? -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "Föråldrar" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "Gör sönder" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "Utökar" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "viktigt" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "nödvändigt" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "valfri" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "extra" @@ -2790,12 +2790,12 @@ msgstr "Öppnar %s" msgid "Line %u too long in source list %s." msgstr "Rad %u är för lång i källistan %s." -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Rad %u i källistan %s har fel format (typ)" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ \"%s\" är inte känd på rad %u i listan över källor %s" @@ -2963,14 +2963,14 @@ msgstr "Cachen har ett inkompatibelt versionssystem" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 +#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 +#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 +#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 +#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 +#: apt-pkg/pkgcachegen.cc:561 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Fel uppstod vid hantering av %s (FindPkg)" @@ -2991,27 +2991,27 @@ msgstr "Grattis, du överskred antalet beskrivningar som denna APT kan hantera." msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Grattis, du överskred antalet beroenden som denna APT kan hantera." -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:568 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Paketet %s %s hittades inte när filberoenden hanterades" -#: apt-pkg/pkgcachegen.cc:1150 +#: apt-pkg/pkgcachegen.cc:1197 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kunde inte ta status på källkodspaketlistan %s" -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 +#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 msgid "Reading package lists" msgstr "Läser paketlistor" # Bättre ord? -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1302 msgid "Collecting File Provides" msgstr "Samlar filtillhandahållningar" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 msgid "IO Error saving source cache" msgstr "In-/utfel vid lagring av källcache" @@ -3221,22 +3221,22 @@ msgstr "Skriver ny källista\n" msgid "Source list entries for this disc are:\n" msgstr "Poster i källistan för denna skiva:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 #, c-format msgid "Wrote %i records.\n" msgstr "Skrev %i poster.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Skrev %i poster med %i saknade filer.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Skrev %i poster med %i filer som inte stämmer\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Skrev %i poster med %i saknade filer och %i filer som inte stämmer\n" diff --git a/po/th.po b/po/th.po index 5e2f51c1e..4d8229465 100644 --- a/po/th.po +++ b/po/th.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2012-10-27 22:44+0700\n" "Last-Translator: Theppitak Karoonboonyanan \n" "Language-Team: Thai \n" @@ -155,7 +155,7 @@ msgstr " ตารางรุ่น:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1571,7 +1571,7 @@ msgstr "ข้อผิดพลาดภายใน" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 @@ -1693,7 +1693,7 @@ msgstr "" " -c=? อ่านแฟ้มค่าตั้งนี้\n" " -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 #, c-format msgid "Unable to write to %s" msgstr "ไม่สามารถเขียนลงแฟ้ม %s" @@ -1702,31 +1702,31 @@ msgstr "ไม่สามารถเขียนลงแฟ้ม %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "ไม่สามารถอ่านรุ่นของ debconf ได้ ได้ติดตั้ง debconf ไว้หรือไม่?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "รายชื่อนามสกุลแพกเกจยาวเกินไป" #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format msgid "Error processing directory %s" msgstr "เกิดข้อผิดพลาดขณะประมวลผลไดเรกทอรี %s" -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "รายชื่อนามสกุลซอร์สยาวเกินไป" -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "เกิดข้อผิดพลาดขณะเขียนข้อมูลส่วนหัวลงในแฟ้มสารบัญ" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, c-format msgid "Error processing contents %s" msgstr "เกิดข้อผิดพลาดขณะประมวลผลสารบัญ %s" -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1803,11 +1803,11 @@ msgstr "" " -c=? อ่านแฟ้มค่าตั้งนี้\n" " -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว" -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "ไม่มีรายการเลือกที่ตรง" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "บางแฟ้มขาดหายไปในกลุ่มแฟ้มแพกเกจ `%s'" @@ -1833,8 +1833,8 @@ msgstr "ฟอร์แมตของ DB ผิด ถ้าคุณเพิ msgid "Unable to open DB file %s: %s" msgstr "ไม่สามารถเปิดแฟ้ม DB %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "stat %s ไม่สำเร็จ" @@ -1912,22 +1912,22 @@ msgstr " มาถึงขีดจำกัดการ DeLink ที่ %sB msgid "Archive had no package field" msgstr "แพกเกจไม่มีช่องข้อมูล 'Package'" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr " %s ไม่มีข้อมูล override\n" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:814 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " ผู้ดูแล %s คือ %s ไม่ใช่ %s\n" -#: ftparchive/writer.cc:708 +#: ftparchive/writer.cc:711 #, c-format msgid " %s has no source override entry\n" msgstr " %s ไม่มีข้อมูล override สำหรับซอร์ส\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:715 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s ไม่มีข้อมูล override สำหรับไบนารีเช่นกัน\n" @@ -2001,7 +2001,7 @@ msgstr "อ่านแฟ้มไม่สำเร็จขณะคำนว msgid "Problem unlinking %s" msgstr "มีปัญหาขณะลบแฟ้ม %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "ไม่สามารถเปลี่ยนชื่อ %s ไปเป็น %s" @@ -2146,54 +2146,54 @@ msgstr "ไม่สามารถเขียนแฟ้ม %s" msgid "Failed to close file %s" msgstr "ไม่สามารถปิดแฟ้ม %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "พาธ %s ยาวเกินไป" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "พยายามแตกแพกเกจ %s มากกว่าหนึ่งครั้ง" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "ไดเรกทอรี %s ถูก divert" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "แพกเกจนี้พยายามเขียนลงปลายทางของ diversion %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" msgstr "พาธของ diversion ยาวเกินไป" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "ไดเรกทอรี %s กำลังจะถูกแทนที่ด้วยสิ่งที่ไม่ใช่ไดเรกทอรี" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "หาโหนดใน bucket ของแฮชไม่พบ" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "พาธยาวเกินไป" -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "พบแพกเกจที่เขียนทับโดยไม่มีข้อมูลรุ่นสำหรับ %s" -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "แฟ้ม %s/%s เขียนทับแฟ้มในแพกเกจ %s" -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "ไม่สามารถ stat %s" @@ -2573,59 +2573,59 @@ msgstr "APT รุ่นนี้ไม่รองรับระบบนั msgid "The package cache was built for a different architecture" msgstr "แคชของแพกเกจถูกสร้างมาสำหรับสถาปัตยกรรมอื่น" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "ต้องใช้" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "ต้องใช้ขณะติดตั้ง" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "แนะนำ" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "ควรใช้ร่วมกับ" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "ขัดแย้งกับ" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "แทนที่" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "ใช้แทน" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "ทำให้พัง" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "เพิ่มความสามารถ" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "สำคัญ" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "จำเป็น" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "มาตรฐาน" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "ตัวเลือก" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "ส่วนเสริม" @@ -2725,12 +2725,12 @@ msgstr "กำลังเปิด %s" msgid "Line %u too long in source list %s." msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ยาวเกินไป" -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ชนิด)" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "ไม่รู้จักชนิด '%s' ที่บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s" @@ -2890,14 +2890,14 @@ msgstr "แคชมีระบบนับรุ่นที่ไม่ตร #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 +#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 +#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 +#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 +#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 +#: apt-pkg/pkgcachegen.cc:561 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (%s%d)" @@ -2918,26 +2918,26 @@ msgstr "โอ้ คุณมาถึงขีดจำกัดจำนว msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนความสัมพันธ์ระหว่างแพกเกจที่ APT สามารถรองรับได้แล้ว" -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:568 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "ไม่พบแพกเกจ %s %s ขณะประมวลผลความขึ้นต่อแฟ้ม" -#: apt-pkg/pkgcachegen.cc:1150 +#: apt-pkg/pkgcachegen.cc:1197 #, c-format msgid "Couldn't stat source package list %s" msgstr "ไม่สามารถ stat รายการแพกเกจซอร์ส %s" -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 +#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 msgid "Reading package lists" msgstr "กำลังอ่านรายชื่อแพกเกจ" -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1302 msgid "Collecting File Provides" msgstr "กำลังเก็บข้อมูลแฟ้มที่ตระเตรียมให้" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 msgid "IO Error saving source cache" msgstr "เกิดข้อผิดพลาด IO ขณะบันทึกแคชของซอร์ส" @@ -3144,22 +3144,22 @@ msgstr "กำลังเขียนรายชื่อแหล่งแพ msgid "Source list entries for this disc are:\n" msgstr "บรรทัดรายชื่อแหล่งแพกเกจสำหรับแผ่นนี้คือ:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 #, c-format msgid "Wrote %i records.\n" msgstr "เขียนแล้ว %i ระเบียน\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มขาดหาย %i แฟ้ม\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มผิดขนาด %i แฟ้ม\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มขาดหาย %i แฟ้ม และแฟ้มผิดขนาด %i แฟ้ม\n" diff --git a/po/tl.po b/po/tl.po index fd21cdeeb..6672d42c3 100644 --- a/po/tl.po +++ b/po/tl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2007-03-29 21:36+0800\n" "Last-Translator: Eric Pareja \n" "Language-Team: Tagalog \n" @@ -161,7 +161,7 @@ msgstr " Talaang Bersyon:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1586,7 +1586,7 @@ msgstr "Internal na error" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 @@ -1712,7 +1712,7 @@ msgstr "" " -c=? Basahin ang talaksang pagkaayos na ito\n" " -o=? Itakda ang isang optiong pagkaayos, hal. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 #, c-format msgid "Unable to write to %s" msgstr "Hindi makapagsulat sa %s" @@ -1721,31 +1721,31 @@ msgstr "Hindi makapagsulat sa %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Hindi makuha ang bersyon ng debconf. Nakaluklok ba ang debconf?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "Mahaba masyado ang talaan ng extensyon ng mga pakete" #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format msgid "Error processing directory %s" msgstr "Error sa pagproseso ng directory %s" -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "Mahaba masyado ang talaan ng extensyon ng pagkukunan (source)" -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "Error sa pagsulat ng panimula sa talaksang nilalaman (contents)" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, c-format msgid "Error processing contents %s" msgstr "Error sa pagproseso ng Contents %s" -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1830,11 +1830,11 @@ msgstr "" " -c=? Basahin itong talaksang pagkaayos\n" " -o=? Itakda ang isang option na pagkaayos" -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "Walang mga pinili na tugma" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "May mga talaksang kulang sa grupo ng talaksang pakete `%s'" @@ -1863,8 +1863,8 @@ msgstr "" msgid "Unable to open DB file %s: %s" msgstr "Hindi mabuksan ang talaksang DB %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "Bigo ang pag-stat ng %s" @@ -1942,22 +1942,22 @@ msgstr " DeLink limit na %sB tinamaan.\n" msgid "Archive had no package field" msgstr "Walang field ng pakete ang arkibo" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr " %s ay walang override entry\n" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:814 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " Tagapangalaga ng %s ay %s hindi %s\n" -#: ftparchive/writer.cc:708 +#: ftparchive/writer.cc:711 #, c-format msgid " %s has no source override entry\n" msgstr " %s ay walang override entry para sa pinagmulan\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:715 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s ay wala ring override entry na binary\n" @@ -2031,7 +2031,7 @@ msgstr "Bigo ang pagbasa habang tinutuos ang MD5" msgid "Problem unlinking %s" msgstr "Problema sa pag-unlink ng %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Bigo ang pagpangalan muli ng %s tungong %s" @@ -2177,54 +2177,54 @@ msgstr "Bigo sa pagsulat ng talaksang %s" msgid "Failed to close file %s" msgstr "Bigo sa pagsara ng talaksang %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "Sobrang haba ang path na %s" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "Binubuklat ang %s ng labis sa isang beses" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "Ang directory %s ay divertado" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Ang pakete ay sumusubok na magsulat sa target na diversion %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" msgstr "Sobrang haba ng path na diversion" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Ang directory %s ay papalitan ng hindi-directory" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "Bigo ang paghanap ng node sa kanyang hash bucket" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "Sobrang haba ng path" -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Patungan ng paketeng nag-match na walang bersion para sa %s" -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Ang talaksang %s/%s ay pumapatong sa isang talaksan sa paketeng %s" -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Hindi ma-stat ang %s" @@ -2614,59 +2614,59 @@ msgstr "Ang APT na ito ay hindi nagsusuporta ng versioning system '%s'" msgid "The package cache was built for a different architecture" msgstr "Ang cache ng pakete ay binuo para sa ibang arkitektura" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "Dependensiya" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "PreDepends" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "Mungkahi" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "Rekomendado" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "Tunggali" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "Pumapalit" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "Linalaos" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "importante" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "kailangan" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "optional" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "extra" @@ -2767,12 +2767,12 @@ msgstr "Binubuksan %s" msgid "Line %u too long in source list %s." msgstr "Labis ang haba ng linyang %u sa talaksang pagkukunan %s." -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (uri)" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s" @@ -2940,14 +2940,14 @@ msgstr "Hindi akma ang versioning system ng cache" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 +#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 +#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 +#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 +#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 +#: apt-pkg/pkgcachegen.cc:561 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "May naganap na error habang prinoseso ang %s (FindPkg)" @@ -2970,27 +2970,27 @@ msgstr "Wow, nalagpasan niyo ang bilang ng bersyon na kaya ng APT na ito." msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Wow, nalagpasan niyo ang bilang ng dependensiya na kaya ng APT na ito." -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:568 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Hindi nahanap ang paketeng %s %s habang prinoseso ang mga dependensiya." -#: apt-pkg/pkgcachegen.cc:1150 +#: apt-pkg/pkgcachegen.cc:1197 #, c-format msgid "Couldn't stat source package list %s" msgstr "Hindi ma-stat ang talaan ng pagkukunan ng pakete %s" -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 +#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 msgid "Reading package lists" msgstr "Binabasa ang Listahan ng mga Pakete" -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1302 msgid "Collecting File Provides" msgstr "Kinukuha ang Talaksang Provides" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 msgid "IO Error saving source cache" msgstr "IO Error sa pag-imbak ng source cache" @@ -3199,22 +3199,22 @@ msgstr "Sinusulat ang bagong listahan ng pagkukunan\n" msgid "Source list entries for this disc are:\n" msgstr "Mga nakatala sa Listahan ng Source para sa Disc na ito ay:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 #, c-format msgid "Wrote %i records.\n" msgstr "Nagsulat ng %i na record.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Nagsulat ng %i na record na may %i na talaksang kulang.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Nagsulat ng %i na record na may %i na talaksang mismatch\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/uk.po b/po/uk.po index 0dac6fb6d..2af2bd7ee 100644 --- a/po/uk.po +++ b/po/uk.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-all\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2012-09-25 20:19+0300\n" "Last-Translator: A. Bondarenko \n" "Language-Team: Українська \n" @@ -164,7 +164,7 @@ msgstr " Таблиця версій:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1639,7 +1639,7 @@ msgstr "Внутрішня помилка" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 @@ -1769,7 +1769,7 @@ msgstr "" " -c=? Читати зазначений конфігураційний файл\n" " -o=? Вказати довільну опцію, наприклад, -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 #, c-format msgid "Unable to write to %s" msgstr "Неможливо записати в %s" @@ -1778,33 +1778,33 @@ msgstr "Неможливо записати в %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Неможливо визначити версію debconf. Він встановлений?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "Список розширень, припустимих для пакунків, занадто довгий" #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format msgid "Error processing directory %s" msgstr "Помилка обробки директорії %s" -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "" "Список розширень, припустимих для пакунків з вихідними текстами, занадто " "довгий" -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "Помилка запису заголовка в повний перелік вмісту пакунків (Contents)" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, c-format msgid "Error processing contents %s" msgstr "Помилка обробки повного переліку вмісту пакунків (Contents) %s" -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1892,11 +1892,11 @@ msgstr "" " -c=? Використати зазначений конфігураційний файл\n" " -o=? Вказати довільний параметр конфігурації" -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "Збігів не виявлено" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "У групі пакунків '%s' відсутні деякі файли" @@ -1924,8 +1924,8 @@ msgstr "" 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 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "Не вдалося одержати атрибути %s" @@ -2003,22 +2003,22 @@ msgstr " Перевищено ліміт в %sB в DeLink.\n" msgid "Archive had no package field" msgstr "Архів не мав поля 'package'" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, fuzzy, c-format msgid " %s has no override entry\n" msgstr " Відсутній запис про перепризначення (override) для %s\n" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:814 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " пакунок %s супроводжується %s, а не %s\n" -#: ftparchive/writer.cc:708 +#: ftparchive/writer.cc:711 #, fuzzy, c-format msgid " %s has no source override entry\n" msgstr " Відсутній запис про перепризначення вихідних текстів для %s\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:715 #, fuzzy, c-format msgid " %s has no binary override entry either\n" msgstr " Крім того, відсутній запис про бінарне перепризначення для %s\n" @@ -2092,7 +2092,7 @@ msgstr "Помилка зчитування під час обчислення M msgid "Problem unlinking %s" msgstr "Не вдалося видалити %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Не вдалося перейменувати %s на %s" @@ -2241,56 +2241,56 @@ msgstr "Не вдалося записати файл %s" msgid "Failed to close file %s" msgstr "Не вдалося закрити файл %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "Шлях %s занадто довгий" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "Розпакування %s більш ніж один раз" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, fuzzy, c-format msgid "The directory %s is diverted" msgstr "Директорія %s є відхиленою (diverted)" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Пакунок пробує записати у ціль з diversion %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 #, fuzzy msgid "The diversion path is too long" msgstr "Шлях 'diversion' є занадто довгим" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Директорія %s замінюється не директорією" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 #, fuzzy msgid "Failed to locate node in its hash bucket" msgstr "Не вдалося знайти вузол у його наборі хешів" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "Шлях занадто довгий" -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Перезаписати відповідність пакунка без версії для %s" -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Файл %s/%s перезаписує інший файл в пакунку %s" -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Неможливо прочитати атрибути %s" @@ -2683,59 +2683,59 @@ msgstr "Цей APT не підтримує систему призначення msgid "The package cache was built for a different architecture" msgstr "Кеш пакунків був побудований для іншої архітектури" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "Залежності (Depends)" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "Пре-Залежності (PreDepends)" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "Пропонує (Suggests)" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "Рекомендує (Recommends)" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "Конфлікти (Conflicts)" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "Заміняє (Replaces)" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "Застарілі (Obsoletes)" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "Ламає (Breaks)" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "Покращує (Enhances)" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "важливі (important)" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "необхідні (required)" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "стандартні (standard)" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "необов'язкові (optional)" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "додаткові (extra)" @@ -2837,12 +2837,12 @@ msgstr "Відкриття %s" msgid "Line %u too long in source list %s." msgstr "Рядок %u є занадто довгим у переліку джерел %s." -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Спотворений рядок %u у переліку джерел %s (тип)" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Невідомий тип '%s' на рядку %u в переліку джерел %s" @@ -3008,14 +3008,14 @@ msgstr "Кеш має несумісну систему призначення #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 +#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 +#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 +#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 +#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 +#: apt-pkg/pkgcachegen.cc:561 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Виникла помилка під час обробки %s (%s%d)" @@ -3036,27 +3036,27 @@ msgstr "Ого! Ви перевищили кількість описів, як msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Ого! Ви перевищили кількість залежностей, які APT може обробити." -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:568 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Пакунок %s %s не був знайдений під час обробки залежностей" -#: apt-pkg/pkgcachegen.cc:1150 +#: apt-pkg/pkgcachegen.cc:1197 #, c-format msgid "Couldn't stat source package list %s" msgstr "Не вдалося прочитати атрибути переліку вихідних текстів %s" -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 +#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 msgid "Reading package lists" msgstr "Зчитування переліків пакунків" -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1302 #, fuzzy msgid "Collecting File Provides" msgstr "Збирання інформації про 'File Provides'" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 msgid "IO Error saving source cache" msgstr "Помилка IO під час збереження кешу вихідних текстів" @@ -3270,22 +3270,22 @@ msgstr "Записується новий перелік вихідних тек msgid "Source list entries for this disc are:\n" msgstr "Перелік вихідних текстів для цього диска:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 #, c-format msgid "Wrote %i records.\n" msgstr "Записано %i записів.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Записано %i записів з %i відсутніми файлами.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Записано %i записів з %i невідповідними файлам\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Записано %i записів з %i відсутніми і %i невідповідними файлами\n" diff --git a/po/vi.po b/po/vi.po index ec6fdc6fc..9e8c1a78a 100644 --- a/po/vi.po +++ b/po/vi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2012-11-20 14:12+0700\n" "Last-Translator: Trần Ngọc Quân \n" "Language-Team: Vietnamese \n" @@ -160,7 +160,7 @@ msgstr " Bảng phiên bản:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1619,7 +1619,7 @@ msgstr "Gặp lỗi nội bộ" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 @@ -1750,7 +1750,7 @@ msgstr "" " -c=? Đọc tập tin cấu hình này\n" " -o=? Đặt một tùy chọn cấu hình nhiệm ý, v.d. “-o dir::cache=/tmp”\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 #, c-format msgid "Unable to write to %s" msgstr "Không thể ghi vào %s" @@ -1759,31 +1759,31 @@ msgstr "Không thể ghi vào %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Không thể lấy phiên bản debconf. Debconf có được cài đặt chưa?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "Danh sách mở rộng gói quá dài" #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format msgid "Error processing directory %s" msgstr "Gặp lỗi khi xử lý thư mục %s" -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "Danh sách mở rộng nguồn quá dài" -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "Gặp lỗi khi ghi phần đầu vào tập tin nộị dung" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, c-format msgid "Error processing contents %s" msgstr "Gặp lỗi khi xử lý nội dung %s" -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1879,11 +1879,11 @@ msgstr "" " -c=? \t\tĐọc tập tin cấu hình này\n" " -o=? \t\tLập một tùy chọn cấu hình nhiệm ý, v.d. “-o dir::cache=/tmp”" -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "Không có điều đã chọn khớp được" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Thiếu một số tập tin trong nhóm tập tin gói “%s”." @@ -1911,8 +1911,8 @@ msgstr "" msgid "Unable to open DB file %s: %s" msgstr "Không thể mở tập tin cơ sở dữ liệu %s: %s." -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "Việc lấy thông tin toàn bộ cho %s bị lỗi" @@ -1990,22 +1990,22 @@ msgstr " Hết hạn bỏ liên kết của %sB.\n" msgid "Archive had no package field" msgstr "Kho không có trường gói" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr " %s không có mục ghi đè\n" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:814 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " người bảo trì %s là %s không phải %s\n" -#: ftparchive/writer.cc:708 +#: ftparchive/writer.cc:711 #, c-format msgid " %s has no source override entry\n" msgstr " %s không có mục ghi đè nguồn\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:715 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s cũng không có mục ghi đè nhị phân\n" @@ -2079,7 +2079,7 @@ msgstr "Việc đọc khi tính MD5 bị lỗi" msgid "Problem unlinking %s" msgstr "Gặp lỗi khi bỏ liên kết %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Việc đổi tên %s thành %s bị lỗi" @@ -2226,54 +2226,54 @@ msgstr "Việc ghi tập tin %s gặp lỗi" msgid "Failed to close file %s" msgstr "Việc đóng tập tin %s gặp lỗi" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "Đường dẫn %s quá dài" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "Đang giải nén %s nhiều lần" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "Thư mục %s bị trệch hướng" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Gói này đang cố ghi vào đích trệch đi %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" msgstr "Đường dẫn trệch đi quá dài." -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Thư mục %s đang được thay thế do điều không phải là thư mục" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "Việc định vị điểm nút trong hộp băm nó bị lỗi" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "Đường dẫn quá dài" -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Ghi đè lên gói đã khớp mà không có phiên bản cho %s" -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Tập tin %s/%s ghi đè lên điều trong gói %s" -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Không thể lấy các thông tin về %s" @@ -2663,59 +2663,59 @@ msgstr "Trình APT này không hỗ trợ hệ thống điều khiển phiên b msgid "The package cache was built for a different architecture" msgstr "Bộ nhớ tạm gói được xây dựng cho một kiến trức khác" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "Phụ thuộc" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "Phụ thuộc sẵn" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "Đề nghị" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "Khuyến khích" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "Xung đột" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "Thay thế" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "Làm cũ" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "Làm hư" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "Tăng cường" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "quan trọng" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "yêu cầu" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "chuẩn" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "tùy chọn" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "bổ sung" @@ -2824,12 +2824,12 @@ msgstr "Đang mở %s" msgid "Line %u too long in source list %s." msgstr "Dòng %u quá dài trong danh sách nguồn %s." -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Gặp dòng dạng sai %u trong danh sách nguồn %s (kiểu)." -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Không biết kiểu “%s” trên dòng %u trong danh sách nguồn %s." @@ -2996,14 +2996,14 @@ msgstr "Bộ nhớ tạm có hệ thống điêu khiển phiên bản không tư #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 +#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 +#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 +#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 +#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 +#: apt-pkg/pkgcachegen.cc:561 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Gặp lỗi khi xử lý %s (%s%d)" @@ -3024,26 +3024,26 @@ msgstr "Ồ, bạn đã vượt quá số mô tả mà trình APT này có thể msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Ồ, bạn đã vượt quá số cách phụ thuộc mà trình APT này có thể quản lý." -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:568 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Không tìm thấy gói %s %s khi xử lý quan hệ phụ thuộc của tập tin" -#: apt-pkg/pkgcachegen.cc:1150 +#: apt-pkg/pkgcachegen.cc:1197 #, c-format msgid "Couldn't stat source package list %s" msgstr "Không thể lấy các thông tin về danh sách gói nguồn %s" -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 +#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 msgid "Reading package lists" msgstr "Đang đọc các danh sách gói" -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1302 msgid "Collecting File Provides" msgstr "Đang tập hợp các Nhà cung cấp Tập tin" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 msgid "IO Error saving source cache" msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn" @@ -3261,22 +3261,22 @@ msgstr "Đang ghi danh sách nguồn mới\n" msgid "Source list entries for this disc are:\n" msgstr "Các mục nhập danh sách nguồn cho đĩa này:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 #, c-format msgid "Wrote %i records.\n" msgstr "Mới ghi %i mục ghi.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Mới ghi %i mục ghi với %i tập tin còn thiếu.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Mới ghi %i mục ghi với %i tập tin không khớp với nhau\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index b5e3a8c2a..6ac4536b9 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.0~pre1\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2010-08-26 14:42+0800\n" "Last-Translator: Aron Xu \n" "Language-Team: Chinese (simplified) \n" @@ -156,7 +156,7 @@ msgstr " 版本列表：" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" @@ -1557,7 +1557,7 @@ msgstr "内部错误" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 @@ -1678,7 +1678,7 @@ msgstr "" " -c=? 读指定的配置文件\n" " -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 #, c-format msgid "Unable to write to %s" msgstr "无法写入 %s" @@ -1687,31 +1687,31 @@ msgstr "无法写入 %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "无法获得 debconf 的版本。您安装了 debconf 吗？" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "软件包的扩展列表太长" #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format msgid "Error processing directory %s" msgstr "处理目录 %s 时出错" -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "源扩展列表太长" -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "将头写入到目录文件时出错" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, c-format msgid "Error processing contents %s" msgstr "处理目录 %s 时出错" -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1791,11 +1791,11 @@ msgstr "" " -c=? 读取指定配置文件\n" " -o=? 设置任意指定的配置选项" -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "没有任何选定项是匹配的" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "软件包文件组“%s”中缺少一些文件" @@ -1822,8 +1822,8 @@ msgstr "" 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 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "无法获得 %s 的状态" @@ -1901,22 +1901,22 @@ msgstr " 达到了 DeLink 的上限 %sB。\n" msgid "Archive had no package field" msgstr "归档文件没有包含 package 字段" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr " %s 中没有 override 项\n" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:814 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s 的维护者 %s 并非 %s\n" -#: ftparchive/writer.cc:708 +#: ftparchive/writer.cc:711 #, c-format msgid " %s has no source override entry\n" msgstr " %s 没有源代码的 override 项\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:715 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s 中没有二进制文件的 override 项\n" @@ -1990,7 +1990,7 @@ msgstr "在计算 MD5 校验和时无法读取数据" msgid "Problem unlinking %s" msgstr "在使用 unlink 删除 %s 时出错" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "无法将 %s 重命名为 %s" @@ -2135,54 +2135,54 @@ msgstr "无法写入文件 %s" msgid "Failed to close file %s" msgstr "无法关闭文件 %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "路径名 %s 太长" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "%s 被解包了不只一次" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "目录 %s 已被转移" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "该软件包正尝试写入转移对象 %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" msgstr "该转移路径太长" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "目录 %s 要被一个非目录的文件替换" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "无法在其散列桶中分配节点" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "路径名太长" -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "用来覆盖的软件包不属于 %s 的任何版本" -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件" -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "无法读取 %s 的状态" @@ -2563,59 +2563,59 @@ msgstr "本程序目前不支持“%s”版本系统" msgid "The package cache was built for a different architecture" msgstr "软件包缓存区是为其它架构的硬件构建的" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "依赖" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "预依赖" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "建议" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "推荐" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "冲突" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "替换" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "废弃" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "破坏" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "增强" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "重要" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "必需" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "标准" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "可选" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "额外" @@ -2715,12 +2715,12 @@ msgstr "正在打开 %s" msgid "Line %u too long in source list %s." msgstr "源列表 %2$s 的第 %1$u 行太长了。" -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”" @@ -2883,14 +2883,14 @@ msgstr "软件包暂存区使用的是不兼容的版本控制系统" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 +#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 +#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 +#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 +#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 +#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 +#: apt-pkg/pkgcachegen.cc:561 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "处理 %s (FindPkg)时出错" @@ -2911,26 +2911,26 @@ msgstr "哇，软件包说明数量超出了本 APT 的处理能力。" msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "哇，依赖关系数量超出了本 APT 的处理能力。" -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:568 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "当处理文件依赖关系时，无法找到软件包 %s %s" -#: apt-pkg/pkgcachegen.cc:1150 +#: apt-pkg/pkgcachegen.cc:1197 #, c-format msgid "Couldn't stat source package list %s" msgstr "无法获取源软件包列表 %s 的状态" -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 +#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 msgid "Reading package lists" msgstr "正在读取软件包列表" -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1302 msgid "Collecting File Provides" msgstr "正在收集文件所提供的软件包" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 msgid "IO Error saving source cache" msgstr "无法读取或写入软件源缓存" @@ -3137,22 +3137,22 @@ msgstr "正在写入新的源列表\n" msgid "Source list entries for this disc are:\n" msgstr "对应于该盘片的软件源设置项是：\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 #, c-format msgid "Wrote %i records.\n" msgstr "已写入 %i 条记录。\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "已写入 %i 条记录，并有 %i 个文件缺失。\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "已写入 %i 条记录，并有 %i 个文件不匹配\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不匹配\n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 31d72e553..11d299a3b 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.5.4\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0200\n" +"POT-Creation-Date: 2013-04-08 15:40+0200\n" "PO-Revision-Date: 2009-01-28 10:41+0800\n" "Last-Translator: Tetralet \n" "Language-Team: Debian-user in Chinese [Big5] Date: Mon, 8 Apr 2013 17:30:18 +0200 Subject: releasing version 0.9.7.9~exp3 --- configure.in | 2 +- debian/changelog | 4 ++-- doc/apt-verbatim.ent | 2 +- doc/po/apt-doc.pot | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.in b/configure.in index 0e2ced4fd..91a157c33 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) PACKAGE="apt" -PACKAGE_VERSION="0.9.7.9~exp2" +PACKAGE_VERSION="0.9.7.9~exp3" PACKAGE_MAIL="APT Development Team " AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION") diff --git a/debian/changelog b/debian/changelog index 2910501b8..242cd9303 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.9.7.9~exp3) UNRELEASED; urgency=low +apt (0.9.7.9~exp3) experimental; urgency=low [ Michael Vogt ] * apt-pkg/sourcelist.cc: @@ -30,7 +30,7 @@ apt (0.9.7.9~exp3) UNRELEASED; urgency=low [ Marc Deslauriers ] * make apt-ftparchive generate missing deb-src hashes (LP: #1078697) - -- Michael Vogt Mon, 08 Apr 2013 08:43:21 +0200 + -- Michael Vogt Mon, 08 Apr 2013 17:09:00 +0200 apt (0.9.7.9~exp2) experimental; urgency=low diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index ff8f3485d..2d6e96091 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -213,7 +213,7 @@ "> - + diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index e23f5699f..9ecd1ac03 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 0.9.7.9~exp2\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-03 14:20+0300\n" +"POT-Creation-Date: 2013-04-08 15:40+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -- cgit v1.2.3 From 8cfdf5a04e05b9cada084f04259a2590be9c7cca Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Tue, 9 Apr 2013 07:54:11 +0200 Subject: Fix typo --- doc/po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/po/fr.po b/doc/po/fr.po index 11e30906c..437a75d71 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -4224,7 +4224,7 @@ msgid "" "locale (where the order would be \"fr, de, en\"). " msgstr "" -"La liste par défaut contient « environment » and « en ». La valeur " +"La liste par défaut contient « environment » et « en ». La valeur " "« environment » a une signification spéciale : elle sera remplacée, à " "l'exécution, par les codes de langues utilisés dans la variable " "d'environnement LC_MESSAGES. Les codes utilisés en double " -- cgit v1.2.3 From c90c334748c4eabbe3fc190ad320b193bf9cfb71 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Tue, 9 Apr 2013 07:54:52 +0200 Subject: Reformat PO file --- doc/po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/po/fr.po b/doc/po/fr.po index 437a75d71..b785968bc 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -4251,7 +4251,7 @@ msgid "" "files which are found in /var/lib/apt/lists/ will be " "added to the end of the list (after an implicit \"none\")." msgstr "" -"Note : afin d'éviter des problèmes lorsqu'APT est exécuté dans différents " +"Note : afin d'éviter des problèmes lorsqu'APT est exécuté dans différents " "environnements (p. ex. par différents utilisateurs ou différents " "programmes), tous les fichiers « Translation »qui sont trouvés dans " "/var/lib/apt/lists/ seront ajoutés à la fin de la liste " -- cgit v1.2.3 From 8c1b831e8a93c5baa0c8423e7885d44d25beb13d Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Tue, 9 Apr 2013 07:56:45 +0200 Subject: Complete translation --- doc/po/fr.po | 293 +++++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 196 insertions(+), 97 deletions(-) diff --git a/doc/po/fr.po b/doc/po/fr.po index b785968bc..8663c0758 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -5,13 +5,13 @@ # Translators: # Jérôme Marant, 2000. # Philippe Batailler, 2005. -# Christian Perrier , 2009, 2010, 2011, 2012. +# Christian Perrier , 2009, 2010, 2011, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: APT Development Team \n" "POT-Creation-Date: 2013-04-02 15:13+0300\n" -"PO-Revision-Date: 2012-07-04 21:08-0600\n" +"PO-Revision-Date: 2013-04-09 07:56+0200\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" "Language: fr\n" @@ -51,7 +51,8 @@ msgid "" msgstr "" "\n" -"\t\tPage qualité\n" +"\t\tPage qualité" +"\n" "\t\n" "\">\n" @@ -73,7 +74,8 @@ msgstr "" "\n" "Bogues\n" -" Page des bogues d'APT. \n" +" Page des bogues d'APT<" +"/ulink>. \n" " Si vous souhaitez signaler un bogue à propos d'APT, veuillez lire\n" " /usr/share/doc/debian/bug-reporting.txt ou utiliser\n" " la commande &reportbug;.\n" @@ -88,7 +90,8 @@ msgid "" "\n" "Author\n" -" APT was written by the APT team apt@packages.debian.org.\n" +" APT was written by the APT team apt@packages.debian.org<" +"/email>.\n" " \n" " \n" "\">\n" @@ -96,7 +99,8 @@ msgstr "" "\n" "Author\n" -" APT a été écrit par l'équipe de développement APT apt@packages.debian.org.\n" +" APT a été écrit par l'équipe de développement APT " +"apt@packages.debian.org.\n" " \n" " \n" "\">\n" @@ -152,10 +156,12 @@ msgid "" " \n" " \n" " \n" -" Configuration File; Specify a configuration file to use. \n" +" Configuration File; Specify a configuration file to use. " +"\n" " The program will read the default configuration file and then this \n" " configuration file. If configuration settings need to be set before the\n" -" default configuration files are parsed specify a file with the APT_CONFIG\n" +" default configuration files are parsed specify a file with the " +"APT_CONFIG\n" " environment variable. See &apt-conf; for syntax information.\n" " \n" " \n" @@ -164,10 +170,15 @@ msgstr "" " \n" " \n" " \n" -" Fichier de configuration ; indique le fichier de configuration à utiliser. \n" -" Le programme lira le fichier de configuration par défaut puis le fichier indiqué ici. \n" -" Si les réglages de configuration doivent être établis avant l'analyse des fichiers\n" -" de configuration par défaut, un fichier peut être indiqué avec la variable d'environnement APT_CONFIG. Veuillez consulter &apt-conf; pour des informations sur la syntaxe d'utilisation. \n" +" Fichier de configuration ; indique le fichier de " +"configuration à utiliser. \n" +" Le programme lira le fichier de configuration par défaut puis le fichier " +"indiqué ici. \n" +" Si les réglages de configuration doivent être établis avant l'analyse " +"des fichiers\n" +" de configuration par défaut, un fichier peut être indiqué avec la " +"variable d'environnement APT_CONFIG. Veuillez consulter " +"&apt-conf; pour des informations sur la syntaxe d'utilisation. \n" " \n" " \n" " \n" @@ -192,8 +203,10 @@ msgstr "" " \n" " \n" " Définir une option de configuration ; permet de régler\n" -" une option de configuration donnée. La syntaxe est .\n" -" et peuvent être utilisées plusieurs fois\n" +" une option de configuration donnée. La syntaxe est .\n" +" et peuvent être utilisées " +"plusieurs fois\n" " pour définir des options différentes.\n" " \n" " \n" @@ -207,7 +220,8 @@ msgid "" "\n" "All command line options may be set using the configuration file, the\n" +" All command line options may be set using the configuration file, " +"the\n" " descriptions indicate the configuration option to set. For boolean\n" " options you can override the config file by using something like \n" " ,, \n" @@ -218,9 +232,12 @@ msgstr "" "\n" "Toutes les options de la ligne de commande peuvent être définies dans le fichier de configuration, \n" -" les descriptions indiquant l'option de configuration concernée. Pour les options\n" -" booléennes, vous pouvez inverser les réglages du fichiers de configuration avec \n" +" Toutes les options de la ligne de commande peuvent être définies " +"dans le fichier de configuration, \n" +" les descriptions indiquant l'option de configuration concernée. Pour les " +"options\n" +" booléennes, vous pouvez inverser les réglages du fichiers de configuration " +"avec \n" " ,, \n" " et d'autres variantes analogues.\n" " \n" @@ -233,13 +250,15 @@ msgid "" "/etc/apt/apt.conf\n" " APT configuration file.\n" -" Configuration Item: Dir::Etc::Main.\n" +" Configuration Item: Dir::Etc::Main." +"\n" " \n" msgstr "" "/etc/apt/apt.conf\n" " Fichier de configuration d'APT.\n" -" Élément de configuration : Dir::Etc::Main.\n" +" Élément de configuration : Dir::Etc::Main.<" +"/listitem>\n" " \n" #. type: Plain text @@ -248,13 +267,15 @@ msgstr "" msgid "" " /etc/apt/apt.conf.d/\n" " APT configuration file fragments.\n" -" Configuration Item: Dir::Etc::Parts.\n" +" Configuration Item: Dir::Etc::Parts." +"\n" " \n" "\">\n" msgstr "" " /etc/apt/apt.conf.d/\n" " Fragments du fichier de configuration d'APT.\n" -" Élément de configuration : Dir::Etc::Parts.\n" +" Élément de configuration : Dir::Etc::Parts.<" +"/listitem>\n" " \n" "\">\n" @@ -265,28 +286,34 @@ msgid "" "&cachedir;/archives/\n" " Storage area for retrieved package files.\n" -" Configuration Item: Dir::Cache::Archives.\n" +" Configuration Item: Dir::Cache::Archives.<" +"/listitem>\n" " \n" msgstr "" "&cachedir;/archives/\n" " Zone de stockage des fichiers récupérés.\n" -" Élément de configuration : Dir::Cache::Archives.\n" +" Élément de configuration : Dir::Cache::Archives.<" +"/para>\n" " \n" #. type: Plain text #: apt.ent:109 #, no-wrap msgid "" -" &cachedir;/archives/partial/\n" +" &cachedir;/archives/partial/<" +"/term>\n" " Storage area for package files in transit.\n" -" Configuration Item: Dir::Cache::Archives (partial will be implicitly appended)\n" +" Configuration Item: Dir::Cache::Archives (" +"partial will be implicitly appended)\n" " \n" "\">\n" msgstr "" -" &cachedir;/archives/partial/\n" +" &cachedir;/archives/partial/<" +"/term>\n" " Zone de stockage pour les paquets en transit.\n" -" Élément de configuration : Dir::Cache::Archives (partial sera implicitement ajouté). \n" +" Élément de configuration : Dir::Cache::Archives (<" +"filename>partial sera implicitement ajouté). \n" " \n" "\">\n" @@ -301,14 +328,18 @@ msgid "" " i.e. a preference to get certain packages\n" " from a separate source\n" " or from a different version of a distribution.\n" -" Configuration Item: Dir::Etc::Preferences.\n" +" Configuration Item: Dir::Etc::Preferences.<" +"/listitem>\n" " \n" msgstr "" "/etc/apt/preferences\n" " Fichier des préférences.\n" -" C'est dans ce fichier qu'on peut faire de l'épinglage (pinning) c'est-à-dire, choisir d'obtenir des paquets d'une source distincte ou d'une distribution différente.\n" -" Élément de configuration : Dir::Etc::Preferences.\n" +" C'est dans ce fichier qu'on peut faire de l'épinglage (pinning) " +"c'est-à-dire, choisir d'obtenir des paquets d'une source distincte ou d'une " +"distribution différente.\n" +" Élément de configuration : Dir::Etc::Preferences.<" +"/para>\n" " \n" #. type: Plain text @@ -317,13 +348,15 @@ msgstr "" msgid "" " /etc/apt/preferences.d/\n" " File fragments for the version preferences.\n" -" Configuration Item: Dir::Etc::PreferencesParts.\n" +" Configuration Item: Dir::Etc::PreferencesParts." +"\n" " \n" "\">\n" msgstr "" " /etc/apt/preferences.d/\n" " Fragments de fichiers pour la préférence des versions.\n" -" Élément de configuration : Dir::Etc::PreferencesParts.\n" +" Élément de configuration : Dir::Etc::PreferencesParts" +".\n" " \n" "\">\n" @@ -334,28 +367,35 @@ msgid "" "/etc/apt/sources.list\n" " Locations to fetch packages from.\n" -" Configuration Item: Dir::Etc::SourceList.\n" +" Configuration Item: Dir::Etc::SourceList.<" +"/listitem>\n" " \n" msgstr "" "/etc/apt/sources.list\n" " Emplacement pour la récupération des paquets.\n" -" Élément de configuration : Dir::Etc::SourceList.\n" +" Élément de configuration : Dir::Etc::SourceList.<" +"/para>\n" " \n" #. type: Plain text #: apt.ent:137 #, no-wrap msgid "" -" /etc/apt/sources.list.d/\n" +" /etc/apt/sources.list.d/" +"\n" " File fragments for locations to fetch packages from.\n" -" Configuration Item: Dir::Etc::SourceParts.\n" +" Configuration Item: Dir::Etc::SourceParts.<" +"/listitem>\n" " \n" "\">\n" msgstr "" -" /etc/apt/sources.list.d/\n" -" Fragments de fichiers définissant les emplacements de récupération de paquets.\n" -" Élément de configuration : Dir::Etc::SourceParts.\n" +" /etc/apt/sources.list.d/" +"\n" +" Fragments de fichiers définissant les emplacements de " +"récupération de paquets.\n" +" Élément de configuration : Dir::Etc::SourceParts.<" +"/para>\n" " \n" "\">\n" @@ -365,30 +405,38 @@ msgstr "" msgid "" "&statedir;/lists/\n" -" Storage area for state information for each package resource specified in\n" +" Storage area for state information for each package " +"resource specified in\n" " &sources-list;\n" -" Configuration Item: Dir::State::Lists.\n" +" Configuration Item: Dir::State::Lists.<" +"/listitem>\n" " \n" msgstr "" "&statedir;/lists/\n" -" Zone de stockage pour les informations qui concernent chaque ressource de paquet spécifiée dans &sources-list;\n" -" Élément de configuration : Dir::State::Lists.\n" +" Zone de stockage pour les informations qui concernent " +"chaque ressource de paquet spécifiée dans &sources-list;\n" +" Élément de configuration : Dir::State::Lists.<" +"/listitem>\n" " \n" #. type: Plain text #: apt.ent:150 #, no-wrap msgid "" -" &statedir;/lists/partial/\n" +" &statedir;/lists/partial/" +"\n" " Storage area for state information in transit.\n" -" Configuration Item: Dir::State::Lists (partial will be implicitly appended)\n" +" Configuration Item: Dir::State::Lists (" +"partial will be implicitly appended)\n" " \n" "\">\n" msgstr "" -" &statedir;/lists/partial/\n" +" &statedir;/lists/partial/" +"\n" " Zone de stockage pour les informations en transit.\n" -" Élément de configuration : Dir::State::Lists (partial sera implicitement ajouté).\n" +" Élément de configuration : Dir::State::Lists (<" +"filename>partial sera implicitement ajouté).\n" " \n" "\">\n" @@ -398,14 +446,18 @@ msgstr "" msgid "" "/etc/apt/trusted.gpg\n" -" Keyring of local trusted keys, new keys will be added here.\n" -" Configuration Item: Dir::Etc::Trusted.\n" +" Keyring of local trusted keys, new keys will be added " +"here.\n" +" Configuration Item: Dir::Etc::Trusted.<" +"/listitem>\n" " \n" msgstr "" "/etc/apt/trusted.gpg\n" -" Porte-clés des clés de confiance locales. Les nouvelles clés y seront ajoutées.\n" -" Élément de configuration: Dir::Etc::Trusted.\n" +" Porte-clés des clés de confiance locales. Les nouvelles " +"clés y seront ajoutées.\n" +" Élément de configuration: Dir::Etc::Trusted.<" +"/listitem>\n" " \n" #. type: Plain text @@ -413,16 +465,21 @@ msgstr "" #, no-wrap msgid "" " /etc/apt/trusted.gpg.d/\n" -" File fragments for the trusted keys, additional keyrings can\n" +" File fragments for the trusted keys, additional keyrings " +"can\n" " be stored here (by other packages or the administrator).\n" -" Configuration Item Dir::Etc::TrustedParts.\n" +" Configuration Item Dir::Etc::TrustedParts.<" +"/listitem>\n" " \n" "\">\n" msgstr "" " /etc/apt/trusted.gpg.d/\n" -" Fragments de fichiers pour les clés de signatures sûres. Des fichiers\n" -" supplémentaires peuvent être placés à cet endroit (par des paquets ou par l'administrateur).\n" -" Élément de configuration : Dir::Etc::TrustedParts.\n" +" Fragments de fichiers pour les clés de signatures sûres. " +"Des fichiers\n" +" supplémentaires peuvent être placés à cet endroit (par des paquets ou " +"par l'administrateur).\n" +" Élément de configuration : Dir::Etc::TrustedParts.<" +"/para>\n" " \n" "\">\n" @@ -431,7 +488,8 @@ msgstr "" #, no-wrap msgid "" "/var/lib/apt/extended_states\n" +" /var/lib/apt/extended_states<" +"/term>\n" " Status list of auto-installed packages.\n" " Configuration Item: Dir::State::extended_states.\n" " \n" @@ -439,9 +497,11 @@ msgid "" "\">\n" msgstr "" "/var/lib/apt/extended_states\n" +" /var/lib/apt/extended_states<" +"/term>\n" " Liste d'état des paquets installés automatiquement.\n" -" Élément de configuration : Dir::State::extended_states.\n" +" Élément de configuration : Dir::State::extended_states" +".\n" " \n" "\">\n" @@ -449,8 +509,10 @@ msgstr "" #: apt.ent:175 #, no-wrap msgid "" -"\n" +"\n" "\n" msgstr "\n" @@ -458,28 +520,39 @@ msgstr "\n" #: apt.ent:184 #, no-wrap msgid "" -"\n" "john@doe.org in 2009,\n" -" 2010 and Daniela Acme daniela@acme.us in 2010 together with the\n" -" Debian Dummy l10n Team debian-l10n-dummy@lists.debian.org.\n" +" The english translation was done by John Doe john@doe.org " +"in 2009,\n" +" 2010 and Daniela Acme daniela@acme.us in 2010 together " +"with the\n" +" Debian Dummy l10n Team debian-l10n-dummy@lists.debian.org" +".\n" "\">\n" msgstr "" "bubulle@debian.org (2000, 2005, 2009, 2010),\n" -" Équipe de traduction francophone de Debian debian-l10n-french@lists.debian.org\n" +" Jérôme Marant, Philippe Batailler, Christian Perrier " +"bubulle@debian.org (2000, 2005, 2009, 2010),\n" +" Équipe de traduction francophone de Debian " +"debian-l10n-french@lists.debian.org\n" "\">\n" #. type: Plain text #: apt.ent:195 #, no-wrap msgid "" -"\n" "\n" msgstr "" "\n" @@ -4050,8 +4124,12 @@ msgstr "" #. type: Content of: #: apt.conf.5.xml:497 #, no-wrap -msgid "Acquire::CompressionTypes::FileExtension \"Methodname\";" -msgstr "Acquire::CompressionTypes::ExtensionFichier \"NomMethode\";" +msgid "" +"Acquire::CompressionTypes::FileExtension \"<" +"replaceable>Methodname\";" +msgstr "" +"Acquire::CompressionTypes::ExtensionFichier \"<" +"replaceable>NomMethode\";" #. type: Content of: #: apt.conf.5.xml:492 @@ -4200,8 +4278,10 @@ msgstr "" #. type: Content of: #: apt.conf.5.xml:549 #, no-wrap -msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" -msgstr "Acquire::Languages { \"environment\"; \"fr\"; \"en\"; \"none\"; \"de\"; };" +msgid "" +"Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" +msgstr "" +"Acquire::Languages { \"environment\"; \"fr\"; \"en\"; \"none\"; \"de\"; };" #. type: Content of: #: apt.conf.5.xml:537 @@ -4260,12 +4340,12 @@ msgstr "" #. type: Content of: #: apt.conf.5.xml:559 msgid "When downloading, force to use only the IPv4 protocol." -msgstr "" +msgstr "Utilisation imposée du protocole IPv4 lors des téléchargements." #. type: Content of: #: apt.conf.5.xml:565 msgid "When downloading, force to use only the IPv6 protocol." -msgstr "" +msgstr "Utilisation imposée du protocole IPv6 lors des téléchargements." #. type: Content of: #: apt.conf.5.xml:572 @@ -4835,7 +4915,7 @@ msgstr "" #. TODO: provide a #. motivating example, except I haven't a clue why you'd want -#. to do this. +#. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: apt.conf.5.xml:836 msgid "" @@ -5118,7 +5198,7 @@ msgstr "" "Le fichier &configureindex; contient un modèle de fichier montrant des " "exemples pour toutes les options existantes." -#. ? reading apt.conf +#. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:1175 msgid "&apt-cache;, &apt-config;, &apt-preferences;." @@ -5231,8 +5311,12 @@ msgstr "Priorités affectées par défaut" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt_preferences.5.xml:94 #, no-wrap -msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n" -msgstr "<command>apt-get install -t testing <replaceable>paquet</replaceable></command>\n" +msgid "" +"<command>apt-get install -t testing <replaceable>some-package</replaceable><" +"/command>\n" +msgstr "" +"<command>apt-get install -t testing <replaceable>paquet</replaceable><" +"/command>\n" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt_preferences.5.xml:97 @@ -6379,8 +6463,10 @@ msgstr "Suivre l'évolution d'une version par son nom de code" #: apt_preferences.5.xml:654 #, no-wrap msgid "" -"Explanation: Uninstall or do not install any Debian-originated package versions\n" -"Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n" +"Explanation: Uninstall or do not install any Debian-originated package " +"versions\n" +"Explanation: other than those in the distribution codenamed with " +"&testing-codename; or sid\n" "Package: *\n" "Pin: release n=&testing-codename;\n" "Pin-Priority: 900\n" @@ -6728,11 +6814,13 @@ msgstr "Exemples :" #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" -"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n" +"deb http://security.debian.org/ &stable-codename;/updates main contrib " +"non-free\n" " " msgstr "" "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" -"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n" +"deb http://security.debian.org/ &stable-codename;/updates main contrib " +"non-free\n" " " #. type: Content of: <refentry><refsect1><title> @@ -8052,8 +8140,12 @@ msgstr "" #. type: Content of: <refentry><refsect1><para><programlisting> #: apt-ftparchive.1.xml:602 #, no-wrap -msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" -msgstr "<command>apt-ftparchive</command> packages <replaceable>répertoire</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" +msgid "" +"<command>apt-ftparchive</command> packages <replaceable>directory<" +"/replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" +msgstr "" +"<command>apt-ftparchive</command> packages <replaceable>répertoire<" +"/replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" #. type: Content of: <refentry><refsect1><para> #: apt-ftparchive.1.xml:598 @@ -8432,7 +8524,8 @@ msgid "" "Building Dependency Tree... Done" msgstr "" "# apt-get update\n" -"Réception de http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n" +"Réception de http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ " +"Packages\n" "Réception de http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n" "Lecture des listes de paquets... Fait\n" "Construction de l'arbre des dépendances... Fait" @@ -9152,9 +9245,11 @@ msgid "" "12 packages not fully installed or removed.\n" "Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used." msgstr "" -"206 paquets mis à jour, 8 nouvellement installés, 23 à enlever et 51 non mis à jour.\n" +"206 paquets mis à jour, 8 nouvellement installés, 23 à enlever et 51 non mis " +"à jour.\n" "12 paquets partiellement installés ou enlevés.\n" -"Il est nécessaire de prendre 65,7Mo/66,7Mo dans les archives. Après cette opération, 26,5Mo d'espace disque supplémentaires seront utilisés." +"Il est nécessaire de prendre 65,7Mo/66,7Mo dans les archives. Après cette " +"opération, 26,5Mo d'espace disque supplémentaires seront utilisés." #. type: <p></p> #: guide.sgml:470 @@ -9224,10 +9319,12 @@ msgid "" "11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s" msgstr "" "# apt-get update\n" -"Réception de :1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n" +"Réception de :1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ " +"Packages\n" "Réception de :2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n" "Atteint http://llug.sep.bnl.gov/debian/ testing/main Packages\n" -"Réception de :4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n" +"Réception de :4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ " +"Packages\n" "Réception de :5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n" "11% [5 testing/non-free `Attente du fichier' 0/32.1k 0%] 2203b/s 1m52s" @@ -9593,7 +9690,8 @@ msgstr "" " # apt-get update\n" " [ APT récupère les fichiers des paquets ]\n" " # apt-get dist-upgrade\n" -" [ APT récupère tous les fichiers nécessaires à la mise à jour de la machine distante ]" +" [ APT récupère tous les fichiers nécessaires à la mise à jour de la machine " +"distante ]" #. type: </example></p> #: offline.sgml:149 @@ -9714,7 +9812,8 @@ msgid "" " # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script" msgstr "" " # apt-get dist-upgrade \n" -" [ Répondre négativement à la question, pour être sûr(e) que les actions vous conviennent ]\n" +" [ Répondre négativement à la question, pour être sûr(e) que les actions vous " +"conviennent ]\n" " # apt-get -qq --print-uris dist-upgrade > uris\n" " # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script" -- cgit v1.2.3 From 3991e191e86c902e6764c7524e8f00791d8018b4 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Tue, 9 Apr 2013 07:58:34 +0200 Subject: Complete French translation --- po/fr.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/fr.po b/po/fr.po index e7de53c30..0562482ff 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" "POT-Creation-Date: 2013-04-08 15:40+0200\n" -"PO-Revision-Date: 2013-03-24 08:57+0100\n" +"PO-Revision-Date: 2013-04-09 07:58+0200\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" "Language: fr\n" @@ -1540,9 +1540,9 @@ msgid "Temporary failure resolving '%s'" msgstr "Erreur temporaire de résolution de « %s »" #: methods/connect.cc:209 -#, fuzzy, c-format +#, c-format msgid "System error resolving '%s:%s'" -msgstr "Erreur système lors de la résolution de « %s:%s » (%s)" +msgstr "Erreur système lors de la résolution de « %s:%s »" #: methods/connect.cc:211 #, c-format -- cgit v1.2.3 From a2457f0ec8f0af82305cd6cf09837b73009d96ae Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Tue, 9 Apr 2013 07:59:33 +0200 Subject: Changelog entry for translation fixes --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 242cd9303..bf32cf624 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,12 @@ apt (0.9.7.9~exp3) experimental; urgency=low [ Marc Deslauriers ] * make apt-ftparchive generate missing deb-src hashes (LP: #1078697) + [ Programs translations ] + * French translation completed (Christian Perrier) + + [ Manpages translations ] + * French translation completed (Christian Perrier) + -- Michael Vogt <mvo@debian.org> Mon, 08 Apr 2013 17:09:00 +0200 apt (0.9.7.9~exp2) experimental; urgency=low -- cgit v1.2.3 From b5595da902e62af7c295f1603ae5b43ba4cef281 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Wed, 10 Apr 2013 11:28:11 +0200 Subject: Fix English spelling error in a message ('A error'). Unfuzzy translations. Closes: #705087 --- apt-pkg/acquire-item.cc | 2 +- debian/changelog | 4 ++++ methods/http.h | 2 +- po/apt-all.pot | 2 +- po/ar.po | 2 +- po/ast.po | 2 +- po/bg.po | 2 +- po/bs.po | 2 +- po/ca.po | 2 +- po/cs.po | 2 +- po/cy.po | 2 +- po/da.po | 2 +- po/de.po | 2 +- po/dz.po | 2 +- po/el.po | 2 +- po/es.po | 2 +- po/eu.po | 2 +- po/fi.po | 2 +- po/fr.po | 2 +- po/gl.po | 2 +- po/hu.po | 2 +- po/it.po | 2 +- po/ja.po | 2 +- po/km.po | 2 +- po/ko.po | 2 +- po/ku.po | 2 +- po/lt.po | 2 +- po/mr.po | 2 +- po/nb.po | 2 +- po/ne.po | 2 +- po/nl.po | 2 +- po/nn.po | 2 +- po/pl.po | 2 +- po/pt.po | 2 +- po/pt_BR.po | 2 +- po/ro.po | 2 +- po/ru.po | 2 +- po/sk.po | 2 +- po/sl.po | 2 +- po/sv.po | 2 +- po/th.po | 2 +- po/tl.po | 2 +- po/tr.po | 2 +- po/uk.po | 2 +- po/vi.po | 2 +- po/zh_CN.po | 2 +- po/zh_TW.po | 2 +- 47 files changed, 50 insertions(+), 46 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index d12733747..7b800e42f 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -1515,7 +1515,7 @@ void pkgAcqMetaIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf) VerifiedSigFile.append(".gpg"); Rename(LastGoodSigFile, VerifiedSigFile); Status = StatTransientNetworkError; - _error->Warning(_("A error occurred during the signature " + _error->Warning(_("An error occurred during the signature " "verification. The repository is not updated " "and the previous index files will be used. " "GPG error: %s: %s\n"), diff --git a/debian/changelog b/debian/changelog index bf32cf624..7944d76ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,10 @@ apt (0.9.7.9~exp3) experimental; urgency=low [ Marc Deslauriers ] * make apt-ftparchive generate missing deb-src hashes (LP: #1078697) + + [ Yaroslav Halchenko ] + * Fix English spelling error in a message ('A error'). Unfuzzy + translations. Closes: #705087 [ Programs translations ] * French translation completed (Christian Perrier) diff --git a/methods/http.h b/methods/http.h index 7a3ccda54..7446119cd 100644 --- a/methods/http.h +++ b/methods/http.h @@ -158,7 +158,7 @@ class HttpMethod : public pkgAcqMethod ERROR_UNRECOVERABLE, /** \brief The server reported a error with a error content page */ ERROR_WITH_CONTENT_PAGE, - /** \brief A error on the client side */ + /** \brief An error on the client side */ ERROR_NOT_FROM_SERVER, /** \brief A redirect or retry request */ TRY_AGAIN_OR_REDIRECT diff --git a/po/apt-all.pot b/po/apt-all.pot index a69dc9295..763d8a034 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -2773,7 +2773,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" diff --git a/po/ar.po b/po/ar.po index d42708726..ffb394131 100644 --- a/po/ar.po +++ b/po/ar.po @@ -2805,7 +2805,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" diff --git a/po/ast.po b/po/ast.po index cfa13d9ca..b3c87bd06 100644 --- a/po/ast.po +++ b/po/ast.po @@ -3038,7 +3038,7 @@ msgstr "Conflictu de distribución: %s (esperábase %s pero obtúvose %s)" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "Hebo un fallu durante la verificación de la robla. El repositoriu nun ta " diff --git a/po/bg.po b/po/bg.po index dd59498e1..0768e88e7 100644 --- a/po/bg.po +++ b/po/bg.po @@ -3096,7 +3096,7 @@ msgstr "Конфликт в дистрибуцията: %s (очаквана: %s #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "Грешка при проверка на цифровия подпис. Хранилището не е обновено и ще се " diff --git a/po/bs.po b/po/bs.po index 126df2b43..7dbe5c0be 100644 --- a/po/bs.po +++ b/po/bs.po @@ -2802,7 +2802,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" diff --git a/po/ca.po b/po/ca.po index df78aa61f..2bfee4717 100644 --- a/po/ca.po +++ b/po/ca.po @@ -3079,7 +3079,7 @@ msgstr "Distribució en conflicte: %s (s'esperava %s però s'ha obtingut %s)" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "S'ha produït un error durant la verificació de la signatura. El dipòsit no " diff --git a/po/cs.po b/po/cs.po index 84753c438..4064c164b 100644 --- a/po/cs.po +++ b/po/cs.po @@ -3037,7 +3037,7 @@ msgstr "Konfliktní distribuce: %s (očekáváno %s, obdrženo %s)" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "Při ověřování podpisů se objevila chyba. Repositář není aktualizovaný, tudíž " diff --git a/po/cy.po b/po/cy.po index c689bbc91..c1867d70a 100644 --- a/po/cy.po +++ b/po/cy.po @@ -3096,7 +3096,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" diff --git a/po/da.po b/po/da.po index f40831ac1..e2982b563 100644 --- a/po/da.po +++ b/po/da.po @@ -3062,7 +3062,7 @@ msgstr "Konfliktdistribution: %s (forventede %s men fik %s)" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "Der opstod en fejl under underskriftsbekræftelse. Arkivet er ikke opdateret " diff --git a/po/de.po b/po/de.po index 2b5ed7599..00f40344e 100644 --- a/po/de.po +++ b/po/de.po @@ -3153,7 +3153,7 @@ msgstr "Konflikt bei Distribution: %s (%s erwartet, aber %s bekommen)" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "Während der Überprüfung der Signatur trat ein Fehler auf. Das Repository " diff --git a/po/dz.po b/po/dz.po index be5733cd0..01854d2d6 100644 --- a/po/dz.po +++ b/po/dz.po @@ -3022,7 +3022,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" diff --git a/po/el.po b/po/el.po index 1ebee0ecb..75625de47 100644 --- a/po/el.po +++ b/po/el.po @@ -3055,7 +3055,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" diff --git a/po/es.po b/po/es.po index 7b4bbb931..286e5455b 100644 --- a/po/es.po +++ b/po/es.po @@ -3137,7 +3137,7 @@ msgstr "Distribución conflictiva: %s (se esperaba %s, pero se obtuvo %s)" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "Se produjo un error durante la verificación de las firmas. El repositorio no " diff --git a/po/eu.po b/po/eu.po index c11691f86..f327b113c 100644 --- a/po/eu.po +++ b/po/eu.po @@ -3019,7 +3019,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" diff --git a/po/fi.po b/po/fi.po index 183d7c395..1637a9d97 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3011,7 +3011,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" diff --git a/po/fr.po b/po/fr.po index 0562482ff..835c0b206 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3162,7 +3162,7 @@ msgstr "Distribution en conflit : %s (%s attendu, mais %s obtenu)" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "Une erreur s'est produite lors du contrôle de la signature. Le dépôt n'est " diff --git a/po/gl.po b/po/gl.po index 4cc56f784..12125eb54 100644 --- a/po/gl.po +++ b/po/gl.po @@ -3078,7 +3078,7 @@ msgstr "Conflito na distribución: %s (agardábase %s mais obtívose %s)" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "Produciuse un erro durante a verificación da sinatura. O repositorio non foi " diff --git a/po/hu.po b/po/hu.po index 5fb2a35b0..9cf645472 100644 --- a/po/hu.po +++ b/po/hu.po @@ -3086,7 +3086,7 @@ msgstr "Ütköző disztribúció: %s (a várt %s helyett %s érkezett)" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "Hiba történt az aláírás ellenőrzése közben. A tároló nem frissült, és az " diff --git a/po/it.po b/po/it.po index e67e03e0c..e0baac726 100644 --- a/po/it.po +++ b/po/it.po @@ -3132,7 +3132,7 @@ msgstr "Distribuzione in conflitto: %s (atteso %s ma ottenuto %s)" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "Si è verificato un errore nel verificare la firma. Il repository non è " diff --git a/po/ja.po b/po/ja.po index 44b51b4d9..399219f2f 100644 --- a/po/ja.po +++ b/po/ja.po @@ -3073,7 +3073,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "署名照合中にエラーが発生しました。リポジトリは更新されず、過去のインデックス" diff --git a/po/km.po b/po/km.po index 17d6bf77b..bb7bd6ee1 100644 --- a/po/km.po +++ b/po/km.po @@ -2985,7 +2985,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" diff --git a/po/ko.po b/po/ko.po index 08a7dc594..a4d0af447 100644 --- a/po/ko.po +++ b/po/ko.po @@ -3011,7 +3011,7 @@ msgstr "배포판 충돌: %s (예상값 %s, 실제값 %s)" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "디지털 서명 확인에 오류가 발생했습니다. 저장고를 업데이트하지 않고\n" diff --git a/po/ku.po b/po/ku.po index d94563913..f7f2d0996 100644 --- a/po/ku.po +++ b/po/ku.po @@ -2818,7 +2818,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" diff --git a/po/lt.po b/po/lt.po index f23aee529..22e5fc152 100644 --- a/po/lt.po +++ b/po/lt.po @@ -2917,7 +2917,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" diff --git a/po/mr.po b/po/mr.po index ceeeaf33e..84ff30882 100644 --- a/po/mr.po +++ b/po/mr.po @@ -2994,7 +2994,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" diff --git a/po/nb.po b/po/nb.po index 1cab4eab2..d97d38d76 100644 --- a/po/nb.po +++ b/po/nb.po @@ -3034,7 +3034,7 @@ msgstr "Konflikt mellom distribusjoner: %s (forventet %s men fant %s)" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "En feil oppstod under signaturverifisering. Depotet er ikke oppdatert og den " diff --git a/po/ne.po b/po/ne.po index 48623413d..4d089bf20 100644 --- a/po/ne.po +++ b/po/ne.po @@ -2988,7 +2988,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" diff --git a/po/nl.po b/po/nl.po index 4d770805b..c3bec13e5 100644 --- a/po/nl.po +++ b/po/nl.po @@ -3082,7 +3082,7 @@ msgstr "Conflicterende distributie: %s (verwachtte %s, maar kreeg %s)" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "Er is een fout opgetreden bij de handtekeningcontrole. De pakketbron is niet " diff --git a/po/nn.po b/po/nn.po index 61a662795..89489066a 100644 --- a/po/nn.po +++ b/po/nn.po @@ -3007,7 +3007,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" diff --git a/po/pl.po b/po/pl.po index 3d7636dab..b8643a951 100644 --- a/po/pl.po +++ b/po/pl.po @@ -3108,7 +3108,7 @@ msgstr "Nieprawidłowa dystrybucja: %s (oczekiwano %s, a otrzymano %s)" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "Podczas weryfikacji podpisu wystąpił błąd. Nie zaktualizowano repozytorium i " diff --git a/po/pt.po b/po/pt.po index e958ead56..febe90d83 100644 --- a/po/pt.po +++ b/po/pt.po @@ -3098,7 +3098,7 @@ msgstr "Distribuição em conflito: %s (esperado %s mas obtido %s)" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "Ocorreu um erro durante a verificação da assinatura. O repositório não está " diff --git a/po/pt_BR.po b/po/pt_BR.po index 922279f9e..0a5317c70 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -3050,7 +3050,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" diff --git a/po/ro.po b/po/ro.po index 40236f373..1b6c6c06c 100644 --- a/po/ro.po +++ b/po/ro.po @@ -3057,7 +3057,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" diff --git a/po/ru.po b/po/ru.po index 01dd870f7..7ebebbd7f 100644 --- a/po/ru.po +++ b/po/ru.po @@ -3115,7 +3115,7 @@ msgstr "Конфликт распространения: %s (ожидался %s #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "Произошла ошибка при проверке подписи. Репозиторий не обновлён и будут " diff --git a/po/sk.po b/po/sk.po index 033dd8f40..90392e27c 100644 --- a/po/sk.po +++ b/po/sk.po @@ -3058,7 +3058,7 @@ msgstr "V konflikte s distribúciou: %s (očakávalo sa %s ale dostali sme %s)" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "Počas overovania podpisu sa vyskytla chyba. Repozitár nie je aktualizovaný a " diff --git a/po/sl.po b/po/sl.po index ce627366c..2d92369d7 100644 --- a/po/sl.po +++ b/po/sl.po @@ -3061,7 +3061,7 @@ msgstr "Distribucija v sporu: %s (pričakovana %s, toda dobljena %s)" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "Med preverjanjem podpisa je prišlo do napake. Skladišče ni bilo posodobljeno " diff --git a/po/sv.po b/po/sv.po index ad79067a1..5f22dc4f6 100644 --- a/po/sv.po +++ b/po/sv.po @@ -3060,7 +3060,7 @@ msgstr "Konflikt i distribution: %s (förväntade %s men fick %s)" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "Ett fel inträffade vid verifiering av signaturen. Förrådet har inte " diff --git a/po/th.po b/po/th.po index 4d8229465..e093cd702 100644 --- a/po/th.po +++ b/po/th.po @@ -2990,7 +2990,7 @@ msgstr "ชุดจัดแจกขัดแย้งกัน: %s (ต้อ #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "เกิดข้อผิดพลาดขณะตรวจสอบลายเซ็น จะไม่ปรับข้อมูลคลังแพกเกจนี้ และจะใช้แฟ้มดัชนีเก่า " diff --git a/po/tl.po b/po/tl.po index 6672d42c3..964710f42 100644 --- a/po/tl.po +++ b/po/tl.po @@ -3040,7 +3040,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" diff --git a/po/tr.po b/po/tr.po index a502f9e54..6a804edc0 100644 --- a/po/tr.po +++ b/po/tr.po @@ -3062,7 +3062,7 @@ msgstr "Dağıtım çakışması: %s (beklenen %s ama eldeki %s)" #: apt-pkg/acquire-item.cc:1521 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "İmza doğrulama sırasında bir hata meydana geldi. Depo güncel değil ve önceki " diff --git a/po/uk.po b/po/uk.po index 2af2bd7ee..046caead1 100644 --- a/po/uk.po +++ b/po/uk.po @@ -3109,7 +3109,7 @@ msgstr "Конфліктуючий дистрибутив: %s (очікував #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "Виникла помилка під час перевірки підпису. Репозиторій не оновлено, " diff --git a/po/vi.po b/po/vi.po index 9e8c1a78a..4ba5c19d9 100644 --- a/po/vi.po +++ b/po/vi.po @@ -3096,7 +3096,7 @@ msgstr "Bản phát hành xung đột: %s (mong đợi %s còn nhận %s)" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "Gặp lỗi trong khi thẩm tra chữ ký.\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 6ac4536b9..8f25691e9 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -2979,7 +2979,7 @@ msgstr "冲突的发行版：%s (期望 %s 但得到 %s)" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "校验签名出错。此仓库未被更新，仍然使用以前的索引文件。GPG 错误：%s: %s\n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 11d299a3b..0cb4f8b8c 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -2971,7 +2971,7 @@ msgstr "發行版本衝突：%s（應當是 %s 但卻得到 %s）" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" -- cgit v1.2.3 From 1dea08eb2e1115b8da14cc3da02d53f8e069ba14 Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Wed, 8 May 2013 17:45:17 +0200 Subject: properly handle if-modfied-since with libcurl/https (closes: #705648) --- apt-pkg/acquire-worker.cc | 13 ++++++++++--- debian/changelog | 8 ++++++++ debian/control | 2 +- methods/https.cc | 7 ++++++- 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc index 9d90b08bc..44a84216a 100644 --- a/apt-pkg/acquire-worker.cc +++ b/apt-pkg/acquire-worker.cc @@ -305,7 +305,15 @@ bool pkgAcquire::Worker::RunMessages() OwnerQ->ItemDone(Itm); unsigned long long const ServerSize = strtoull(LookupTag(Message,"Size","0").c_str(), NULL, 10); - if (TotalSize != 0 && ServerSize != TotalSize) + bool isHit = StringToBool(LookupTag(Message,"IMS-Hit"),false) || + StringToBool(LookupTag(Message,"Alt-IMS-Hit"),false); + // Using the https method the server might return 200, but the + // If-Modified-Since condition is not satsified, libcurl will + // discard the download. In this case, however, TotalSize will be + // set to the actual size of the file, while ServerSize will be set + // to 0. Therefore, if the item is marked as a hit and the + // downloaded size (ServerSize) is 0, we ignore TotalSize. + if (TotalSize != 0 && (!isHit || ServerSize != 0) && ServerSize != TotalSize) _error->Warning("Size of file %s is not what the server reported %s %llu", Owner->DestFile.c_str(), LookupTag(Message,"Size","0").c_str(),TotalSize); @@ -332,8 +340,7 @@ bool pkgAcquire::Worker::RunMessages() // Log that we are done if (Log != 0) { - if (StringToBool(LookupTag(Message,"IMS-Hit"),false) == true || - StringToBool(LookupTag(Message,"Alt-IMS-Hit"),false) == true) + if (isHit) { /* Hide 'hits' for local only sources - we also manage to hide gets */ diff --git a/debian/changelog b/debian/changelog index 9ed9b4d61..db7a8ffda 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.9.7.9) UNRELEASED; urgency=low + + [ Ludovico Cavedon ] + * properly handle if-modfied-since with libcurl/https + (closes: #705648) + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 08 May 2013 16:20:13 +0200 + apt (0.9.7.8) unstable; urgency=criticial * SECURITY UPDATE: InRelease verification bypass diff --git a/debian/control b/debian/control index 50b3599fc..4a73239f7 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Uploaders: Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>, Julian Andres Klode <jak@debian.org> Standards-Version: 3.9.3 Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev, - gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0), + gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.4~), zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, po4a (>= 0.34-2), autotools-dev, autoconf, automake Build-Depends-Indep: doxygen, debiandoc-sgml diff --git a/methods/https.cc b/methods/https.cc index c1a49ba60..d85415b2f 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -285,6 +285,11 @@ bool HttpsMethod::Fetch(FetchItem *Itm) long curl_servdate; curl_easy_getinfo(curl, CURLINFO_FILETIME, &curl_servdate); + // If the server returns 200 OK but the If-Modified-Since condition is not + // met, CURLINFO_CONDITION_UNMET will be set to 1 + long curl_condition_unmet = 0; + curl_easy_getinfo(curl, CURLINFO_CONDITION_UNMET, &curl_condition_unmet); + File->Close(); // cleanup @@ -312,7 +317,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm) Res.Filename = File->Name(); Res.LastModified = Buf.st_mtime; Res.IMSHit = false; - if (curl_responsecode == 304) + if (curl_responsecode == 304 || curl_condition_unmet) { unlink(File->Name().c_str()); Res.IMSHit = true; -- cgit v1.2.3 From dec5b117052b77e4366efd8234e0cec09989b700 Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Wed, 8 May 2013 17:46:31 +0200 Subject: * apt-pkg/algorithms.cc: - Do not propagate negative scores from rdepends. Propagating the absolute value of a negative score may boost obsolete packages and keep them installed instead of installing their successors. (Closes: #699759) --- apt-pkg/algorithms.cc | 5 ++++- debian/changelog | 8 +++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 8cd9d4c6e..991d425e3 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -645,7 +645,10 @@ void pkgProblemResolver::MakeScores() D->Type != pkgCache::Dep::Recommends)) continue; - Scores[I->ID] += abs(OldScores[D.ParentPkg()->ID]); + // Do not propagate negative scores otherwise + // an extra (-2) package might score better than an optional (-1) + if (OldScores[D.ParentPkg()->ID] > 0) + Scores[I->ID] += OldScores[D.ParentPkg()->ID]; } } diff --git a/debian/changelog b/debian/changelog index db7a8ffda..7775c1b79 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,13 @@ apt (0.9.7.9) UNRELEASED; urgency=low * properly handle if-modfied-since with libcurl/https (closes: #705648) - -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 08 May 2013 16:20:13 +0200 + [ Andreas Beckman ] + * apt-pkg/algorithms.cc: + - Do not propagate negative scores from rdepends. Propagating the absolute + value of a negative score may boost obsolete packages and keep them + installed instead of installing their successors. (Closes: #699759) + + -- Michael Vogt <mvo@debian.org> Wed, 08 May 2013 17:46:10 +0200 apt (0.9.7.8) unstable; urgency=criticial -- cgit v1.2.3 From 5b63d2a9a2e088bb7df7c703e9452af7efc88210 Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Wed, 8 May 2013 17:50:15 +0200 Subject: merged patch from Daniel Hartwig to fix URI and proxy releated issues --- apt-pkg/contrib/strutl.cc | 9 +++++---- debian/changelog | 17 +++++++++++++++++ methods/http.cc | 14 +++++++------- methods/https.cc | 20 +++++++++++++++++++- .../test-bug-595691-empty-and-broken-archive-files | 14 +++++++------- test/integration/test-releasefile-verification | 4 ++-- test/libapt/uri_test.cc | 8 ++++++++ 7 files changed, 65 insertions(+), 21 deletions(-) diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index 03b98e93e..f4dd3407d 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -1483,9 +1483,12 @@ URI::operator string() if (User.empty() == false) { - Res += User; + // FIXME: Technically userinfo is permitted even less + // characters than these, but this is not conveniently + // expressed with a blacklist. + Res += QuoteString(User, ":/?#[]@"); if (Password.empty() == false) - Res += ":" + Password; + Res += ":" + QuoteString(Password, ":/?#[]@"); Res += "@"; } @@ -1524,7 +1527,6 @@ string URI::SiteOnly(const string &URI) U.User.clear(); U.Password.clear(); U.Path.clear(); - U.Port = 0; return U; } /*}}}*/ @@ -1536,7 +1538,6 @@ string URI::NoUserPassword(const string &URI) ::URI U(URI); U.User.clear(); U.Password.clear(); - U.Port = 0; return U; } /*}}}*/ diff --git a/debian/changelog b/debian/changelog index 182596b62..d5ae8448b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -50,6 +50,23 @@ apt (0.9.8) UNRELEASED; urgency=low [ Manpages translations ] * French translation completed (Christian Perrier) + [ Daniel Hartwig ] + * apt-pkg/contrib/strutl.cc: + - include port in shortened URIs (e.g. with apt-cache policy, progress + display) thanks to James McCoy (Closes: #154868, #322074) + - percent-encode username and password when writing URIs + * methods/http.cc: + - properly escape IP-literals (e.g. IPv6 address) when building + Host headers and URIs (Closes: #620344) + * methods/https.cc: + - use https_proxy environment variable if present, falling back to + http_proxy otherwise + - use authentication credentials from proxy URI + (Closes: #651640, LP: #1087512) + - environment variables do not override an explicit no proxy + directive ("DIRECT") in apt.conf + - disregard all_proxy environment variable, like other methods + -- Michael Vogt <mvo@debian.org> Mon, 08 Apr 2013 08:43:21 +0200 apt (0.9.7.9~exp2) experimental; urgency=low diff --git a/methods/http.cc b/methods/http.cc index fddf8a78e..db1085a2d 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -667,7 +667,12 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out) // The HTTP server expects a hostname with a trailing :port char Buf[1000]; - string ProperHost = Uri.Host; + string ProperHost; + + if (Uri.Host.find(':') != string::npos) + ProperHost = '[' + Uri.Host + ']'; + else + ProperHost = Uri.Host; if (Uri.Port != 0) { sprintf(Buf,":%u",Uri.Port); @@ -975,12 +980,7 @@ HttpMethod::DealWithHeaders(FetchResult &Res,ServerState *Srv) { URI Uri = Queue->Uri; if (Uri.Host.empty() == false) - { - if (Uri.Port != 0) - strprintf(NextURI, "http://%s:%u", Uri.Host.c_str(), Uri.Port); - else - NextURI = "http://" + Uri.Host; - } + NextURI = URI::SiteOnly(Uri); else NextURI.clear(); NextURI.append(DeQuoteString(Srv->Location)); diff --git a/methods/https.cc b/methods/https.cc index b44642ab2..84ce2d68f 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -63,6 +63,12 @@ void HttpsMethod::SetupProxy() /*{{{*/ { URI ServerName = Queue->Uri; + // Curl should never read proxy settings from the environment, as + // we determine which proxy to use. Do this for consistency among + // methods and prevent an environment variable overriding a + // no-proxy ("DIRECT") setting in apt.conf. + curl_easy_setopt(curl, CURLOPT_PROXY, ""); + // Determine the proxy setting - try https first, fallback to http and use env at last string UseProxy = _config->Find("Acquire::https::Proxy::" + ServerName.Host, _config->Find("Acquire::http::Proxy::" + ServerName.Host).c_str()); @@ -81,7 +87,14 @@ void HttpsMethod::SetupProxy() /*{{{*/ if (getenv("no_proxy") != 0 && CheckDomainList(ServerName.Host,getenv("no_proxy")) == true) return; } else { - const char* result = getenv("http_proxy"); + const char* result = getenv("https_proxy"); + // FIXME: Fall back to http_proxy is to remain compatible with + // existing setups and behaviour of apt.conf. This should be + // deprecated in the future (including apt.conf). Most other + // programs do not fall back to http proxy settings and neither + // should Apt. + if (result == NULL) + result = getenv("http_proxy"); UseProxy = result == NULL ? "" : result; } @@ -92,6 +105,11 @@ void HttpsMethod::SetupProxy() /*{{{*/ if (Proxy.Port != 1) curl_easy_setopt(curl, CURLOPT_PROXYPORT, Proxy.Port); curl_easy_setopt(curl, CURLOPT_PROXY, Proxy.Host.c_str()); + if (Proxy.User.empty() == false || Proxy.Password.empty() == false) + { + curl_easy_setopt(curl, CURLOPT_PROXYUSERNAME, Proxy.User.c_str()); + curl_easy_setopt(curl, CURLOPT_PROXYPASSWORD, Proxy.Password.c_str()); + } } } /*}}}*/ // HttpsMethod::Fetch - Fetch an item /*{{{*/ diff --git a/test/integration/test-bug-595691-empty-and-broken-archive-files b/test/integration/test-bug-595691-empty-and-broken-archive-files index 4611b8b8e..a05ed5fa6 100755 --- a/test/integration/test-bug-595691-empty-and-broken-archive-files +++ b/test/integration/test-bug-595691-empty-and-broken-archive-files @@ -103,23 +103,23 @@ testoverhttp() { setupcompressor "$1" createemptyfile 'en' - testaptgetupdate "Get: http://localhost Packages [] -Get: http://localhost Translation-en + testaptgetupdate "Get: http://localhost:8080 Packages [] +Get: http://localhost:8080 Translation-en Reading package lists..." "empty file en.$COMPRESS over http" createemptyarchive 'en' - testaptgetupdate "Get: http://localhost Packages [] -Get: http://localhost Translation-en [] + testaptgetupdate "Get: http://localhost:8080 Packages [] +Get: http://localhost:8080 Translation-en [] Reading package lists..." "empty archive en.$COMPRESS over http" createemptyarchive 'Packages' - testaptgetupdate "Get: http://localhost Packages [] + testaptgetupdate "Get: http://localhost:8080 Packages [] Reading package lists..." "empty archive Packages.$COMPRESS over http" createemptyfile 'Packages' #FIXME: we should response with a good error message instead - testaptgetupdate "Get: http://localhost Packages -Err http://localhost Packages + testaptgetupdate "Get: http://localhost:8080 Packages +Err http://localhost:8080 Packages Empty files can't be valid archives W: Failed to fetch ${COMPRESSOR}:$(readlink -f rootdir/var/lib/apt/lists/partial/localhost:8080_Packages) Empty files can't be valid archives diff --git a/test/integration/test-releasefile-verification b/test/integration/test-releasefile-verification index 01fb2e529..fba7ab290 100755 --- a/test/integration/test-releasefile-verification +++ b/test/integration/test-releasefile-verification @@ -37,7 +37,7 @@ The following NEW packages will be installed: apt 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. After this operation, 5370 kB of additional disk space will be used. -Get:1 http://localhost/ apt 0.7.25.3 +Get:1 http://localhost:8080/ apt 0.7.25.3 Download complete and in download only mode' aptget install apt -dy } @@ -50,7 +50,7 @@ The following NEW packages will be installed: apt 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. After this operation, 5808 kB of additional disk space will be used. -Get:1 http://localhost/ apt 0.8.0~pre1 +Get:1 http://localhost:8080/ apt 0.8.0~pre1 Download complete and in download only mode' aptget install apt -dy } diff --git a/test/libapt/uri_test.cc b/test/libapt/uri_test.cc index 99bb3067e..16fde503f 100644 --- a/test/libapt/uri_test.cc +++ b/test/libapt/uri_test.cc @@ -108,5 +108,13 @@ int main() { equals("/debian/", U.Path); } + // Percent-encoding. + { + URI U("ftp://foo:b%40r@example.org"); + equals("foo", U.User); + equals("b@r", U.Password); + equals("ftp://foo:b%40r@example.org", (std::string) U); + } + return 0; } -- cgit v1.2.3 From a63077b8ab63268629767d1848a40272518c90fe Mon Sep 17 00:00:00 2001 From: Michael Vogt <egon@debian-devbox> Date: Wed, 8 May 2013 18:57:09 +0200 Subject: refresh translations --- doc/apt-verbatim.ent | 2 +- doc/po/apt-doc.pot | 4 +- doc/po/fr.po | 287 +++++++++++++++++---------------------------------- po/apt-all.pot | 28 ++--- po/ar.po | 26 ++--- po/ast.po | 26 ++--- po/bg.po | 26 ++--- po/bs.po | 26 ++--- po/ca.po | 26 ++--- po/cs.po | 26 ++--- po/cy.po | 26 ++--- po/da.po | 26 ++--- po/de.po | 26 ++--- po/dz.po | 26 ++--- po/el.po | 26 ++--- po/es.po | 26 ++--- po/eu.po | 26 ++--- po/fi.po | 26 ++--- po/fr.po | 26 ++--- po/gl.po | 26 ++--- po/hu.po | 26 ++--- po/it.po | 26 ++--- po/ja.po | 26 ++--- po/km.po | 26 ++--- po/ko.po | 26 ++--- po/ku.po | 26 ++--- po/lt.po | 26 ++--- po/mr.po | 26 ++--- po/nb.po | 26 ++--- po/ne.po | 26 ++--- po/nl.po | 26 ++--- po/nn.po | 26 ++--- po/pl.po | 26 ++--- po/pt.po | 26 ++--- po/pt_BR.po | 26 ++--- po/ro.po | 26 ++--- po/ru.po | 26 ++--- po/sk.po | 26 ++--- po/sl.po | 26 ++--- po/sv.po | 26 ++--- po/th.po | 26 ++--- po/tl.po | 26 ++--- po/uk.po | 26 ++--- po/vi.po | 26 ++--- po/zh_CN.po | 26 ++--- po/zh_TW.po | 26 ++--- 46 files changed, 657 insertions(+), 756 deletions(-) diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 2d6e96091..1ab7b6056 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -213,7 +213,7 @@ "> <!-- this will be updated by 'prepare-release' --> -<!ENTITY apt-product-version "0.9.7.9~exp3"> +<!ENTITY apt-product-version "0.9.8"> <!-- Codenames for debian releases --> <!ENTITY oldstable-codename "squeeze"> diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 9ecd1ac03..d329a1be1 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt-doc 0.9.7.9~exp2\n" +"Project-Id-Version: apt-doc 0.9.8~20130508\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0300\n" +"POT-Creation-Date: 2013-05-08 18:12+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/doc/po/fr.po b/doc/po/fr.po index 8663c0758..54f666372 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-02 15:13+0300\n" +"POT-Creation-Date: 2013-05-08 18:12+0300\n" "PO-Revision-Date: 2013-04-09 07:56+0200\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -51,8 +51,7 @@ msgid "" msgstr "" "<!ENTITY apt-qapage \"\n" "\t<para>\n" -"\t\t<ulink url='http://packages.qa.debian.org/a/apt.html'>Page qualité</ulink>" -"\n" +"\t\t<ulink url='http://packages.qa.debian.org/a/apt.html'>Page qualité</ulink>\n" "\t</para>\n" "\">\n" @@ -74,8 +73,7 @@ msgstr "" "<!-- Boiler plate Bug reporting section -->\n" "<!ENTITY manbugs \"\n" " <refsect1><title>Bogues\n" -" Page des bogues d'APT<" -"/ulink>. \n" +" Page des bogues d'APT. \n" " Si vous souhaitez signaler un bogue à propos d'APT, veuillez lire\n" " /usr/share/doc/debian/bug-reporting.txt ou utiliser\n" " la commande &reportbug;.\n" @@ -90,8 +88,7 @@ msgid "" "\n" "Author\n" -" APT was written by the APT team apt@packages.debian.org<" -"/email>.\n" +" APT was written by the APT team apt@packages.debian.org.\n" " \n" " \n" "\">\n" @@ -99,8 +96,7 @@ msgstr "" "\n" "Author\n" -" APT a été écrit par l'équipe de développement APT " -"apt@packages.debian.org.\n" +" APT a été écrit par l'équipe de développement APT apt@packages.debian.org.\n" " \n" " \n" "\">\n" @@ -156,12 +152,10 @@ msgid "" " \n" " \n" " \n" -" Configuration File; Specify a configuration file to use. " -"\n" +" Configuration File; Specify a configuration file to use. \n" " The program will read the default configuration file and then this \n" " configuration file. If configuration settings need to be set before the\n" -" default configuration files are parsed specify a file with the " -"APT_CONFIG\n" +" default configuration files are parsed specify a file with the APT_CONFIG\n" " environment variable. See &apt-conf; for syntax information.\n" " \n" " \n" @@ -170,15 +164,10 @@ msgstr "" " \n" " \n" " \n" -" Fichier de configuration ; indique le fichier de " -"configuration à utiliser. \n" -" Le programme lira le fichier de configuration par défaut puis le fichier " -"indiqué ici. \n" -" Si les réglages de configuration doivent être établis avant l'analyse " -"des fichiers\n" -" de configuration par défaut, un fichier peut être indiqué avec la " -"variable d'environnement APT_CONFIG. Veuillez consulter " -"&apt-conf; pour des informations sur la syntaxe d'utilisation. \n" +" Fichier de configuration ; indique le fichier de configuration à utiliser. \n" +" Le programme lira le fichier de configuration par défaut puis le fichier indiqué ici. \n" +" Si les réglages de configuration doivent être établis avant l'analyse des fichiers\n" +" de configuration par défaut, un fichier peut être indiqué avec la variable d'environnement APT_CONFIG. Veuillez consulter &apt-conf; pour des informations sur la syntaxe d'utilisation. \n" " \n" " \n" " \n" @@ -203,10 +192,8 @@ msgstr "" " \n" " \n" " Définir une option de configuration ; permet de régler\n" -" une option de configuration donnée. La syntaxe est .\n" -" et peuvent être utilisées " -"plusieurs fois\n" +" une option de configuration donnée. La syntaxe est .\n" +" et peuvent être utilisées plusieurs fois\n" " pour définir des options différentes.\n" " \n" " \n" @@ -220,8 +207,7 @@ msgid "" "\n" "All command line options may be set using the configuration file, " -"the\n" +" All command line options may be set using the configuration file, the\n" " descriptions indicate the configuration option to set. For boolean\n" " options you can override the config file by using something like \n" " ,, \n" @@ -232,12 +218,9 @@ msgstr "" "\n" "Toutes les options de la ligne de commande peuvent être définies " -"dans le fichier de configuration, \n" -" les descriptions indiquant l'option de configuration concernée. Pour les " -"options\n" -" booléennes, vous pouvez inverser les réglages du fichiers de configuration " -"avec \n" +" Toutes les options de la ligne de commande peuvent être définies dans le fichier de configuration, \n" +" les descriptions indiquant l'option de configuration concernée. Pour les options\n" +" booléennes, vous pouvez inverser les réglages du fichiers de configuration avec \n" " ,, \n" " et d'autres variantes analogues.\n" " \n" @@ -250,15 +233,13 @@ msgid "" "/etc/apt/apt.conf\n" " APT configuration file.\n" -" Configuration Item: Dir::Etc::Main." -"\n" +" Configuration Item: Dir::Etc::Main.\n" " \n" msgstr "" "/etc/apt/apt.conf\n" " Fichier de configuration d'APT.\n" -" Élément de configuration : Dir::Etc::Main.<" -"/listitem>\n" +" Élément de configuration : Dir::Etc::Main.\n" " \n" #. type: Plain text @@ -267,15 +248,13 @@ msgstr "" msgid "" " /etc/apt/apt.conf.d/\n" " APT configuration file fragments.\n" -" Configuration Item: Dir::Etc::Parts." -"\n" +" Configuration Item: Dir::Etc::Parts.\n" " \n" "\">\n" msgstr "" " /etc/apt/apt.conf.d/\n" " Fragments du fichier de configuration d'APT.\n" -" Élément de configuration : Dir::Etc::Parts.<" -"/listitem>\n" +" Élément de configuration : Dir::Etc::Parts.\n" " \n" "\">\n" @@ -286,34 +265,28 @@ msgid "" "&cachedir;/archives/\n" " Storage area for retrieved package files.\n" -" Configuration Item: Dir::Cache::Archives.<" -"/listitem>\n" +" Configuration Item: Dir::Cache::Archives.\n" " \n" msgstr "" "&cachedir;/archives/\n" " Zone de stockage des fichiers récupérés.\n" -" Élément de configuration : Dir::Cache::Archives.<" -"/para>\n" +" Élément de configuration : Dir::Cache::Archives.\n" " \n" #. type: Plain text #: apt.ent:109 #, no-wrap msgid "" -" &cachedir;/archives/partial/<" -"/term>\n" +" &cachedir;/archives/partial/\n" " Storage area for package files in transit.\n" -" Configuration Item: Dir::Cache::Archives (" -"partial will be implicitly appended)\n" +" Configuration Item: Dir::Cache::Archives (partial will be implicitly appended)\n" " \n" "\">\n" msgstr "" -" &cachedir;/archives/partial/<" -"/term>\n" +" &cachedir;/archives/partial/\n" " Zone de stockage pour les paquets en transit.\n" -" Élément de configuration : Dir::Cache::Archives (<" -"filename>partial sera implicitement ajouté). \n" +" Élément de configuration : Dir::Cache::Archives (partial sera implicitement ajouté). \n" " \n" "\">\n" @@ -328,18 +301,14 @@ msgid "" " i.e. a preference to get certain packages\n" " from a separate source\n" " or from a different version of a distribution.\n" -" Configuration Item: Dir::Etc::Preferences.<" -"/listitem>\n" +" Configuration Item: Dir::Etc::Preferences.\n" " \n" msgstr "" "/etc/apt/preferences\n" " Fichier des préférences.\n" -" C'est dans ce fichier qu'on peut faire de l'épinglage (pinning) " -"c'est-à-dire, choisir d'obtenir des paquets d'une source distincte ou d'une " -"distribution différente.\n" -" Élément de configuration : Dir::Etc::Preferences.<" -"/para>\n" +" C'est dans ce fichier qu'on peut faire de l'épinglage (pinning) c'est-à-dire, choisir d'obtenir des paquets d'une source distincte ou d'une distribution différente.\n" +" Élément de configuration : Dir::Etc::Preferences.\n" " \n" #. type: Plain text @@ -348,15 +317,13 @@ msgstr "" msgid "" " /etc/apt/preferences.d/\n" " File fragments for the version preferences.\n" -" Configuration Item: Dir::Etc::PreferencesParts." -"\n" +" Configuration Item: Dir::Etc::PreferencesParts.\n" " \n" "\">\n" msgstr "" " /etc/apt/preferences.d/\n" " Fragments de fichiers pour la préférence des versions.\n" -" Élément de configuration : Dir::Etc::PreferencesParts" -".\n" +" Élément de configuration : Dir::Etc::PreferencesParts.\n" " \n" "\">\n" @@ -367,35 +334,28 @@ msgid "" "/etc/apt/sources.list\n" " Locations to fetch packages from.\n" -" Configuration Item: Dir::Etc::SourceList.<" -"/listitem>\n" +" Configuration Item: Dir::Etc::SourceList.\n" " \n" msgstr "" "/etc/apt/sources.list\n" " Emplacement pour la récupération des paquets.\n" -" Élément de configuration : Dir::Etc::SourceList.<" -"/para>\n" +" Élément de configuration : Dir::Etc::SourceList.\n" " \n" #. type: Plain text #: apt.ent:137 #, no-wrap msgid "" -" /etc/apt/sources.list.d/" -"\n" +" /etc/apt/sources.list.d/\n" " File fragments for locations to fetch packages from.\n" -" Configuration Item: Dir::Etc::SourceParts.<" -"/listitem>\n" +" Configuration Item: Dir::Etc::SourceParts.\n" " \n" "\">\n" msgstr "" -" /etc/apt/sources.list.d/" -"\n" -" Fragments de fichiers définissant les emplacements de " -"récupération de paquets.\n" -" Élément de configuration : Dir::Etc::SourceParts.<" -"/para>\n" +" /etc/apt/sources.list.d/\n" +" Fragments de fichiers définissant les emplacements de récupération de paquets.\n" +" Élément de configuration : Dir::Etc::SourceParts.\n" " \n" "\">\n" @@ -405,38 +365,30 @@ msgstr "" msgid "" "&statedir;/lists/\n" -" Storage area for state information for each package " -"resource specified in\n" +" Storage area for state information for each package resource specified in\n" " &sources-list;\n" -" Configuration Item: Dir::State::Lists.<" -"/listitem>\n" +" Configuration Item: Dir::State::Lists.\n" " \n" msgstr "" "&statedir;/lists/\n" -" Zone de stockage pour les informations qui concernent " -"chaque ressource de paquet spécifiée dans &sources-list;\n" -" Élément de configuration : Dir::State::Lists.<" -"/listitem>\n" +" Zone de stockage pour les informations qui concernent chaque ressource de paquet spécifiée dans &sources-list;\n" +" Élément de configuration : Dir::State::Lists.\n" " \n" #. type: Plain text #: apt.ent:150 #, no-wrap msgid "" -" &statedir;/lists/partial/" -"\n" +" &statedir;/lists/partial/\n" " Storage area for state information in transit.\n" -" Configuration Item: Dir::State::Lists (" -"partial will be implicitly appended)\n" +" Configuration Item: Dir::State::Lists (partial will be implicitly appended)\n" " \n" "\">\n" msgstr "" -" &statedir;/lists/partial/" -"\n" +" &statedir;/lists/partial/\n" " Zone de stockage pour les informations en transit.\n" -" Élément de configuration : Dir::State::Lists (<" -"filename>partial sera implicitement ajouté).\n" +" Élément de configuration : Dir::State::Lists (partial sera implicitement ajouté).\n" " \n" "\">\n" @@ -446,18 +398,14 @@ msgstr "" msgid "" "/etc/apt/trusted.gpg\n" -" Keyring of local trusted keys, new keys will be added " -"here.\n" -" Configuration Item: Dir::Etc::Trusted.<" -"/listitem>\n" +" Keyring of local trusted keys, new keys will be added here.\n" +" Configuration Item: Dir::Etc::Trusted.\n" " \n" msgstr "" "/etc/apt/trusted.gpg\n" -" Porte-clés des clés de confiance locales. Les nouvelles " -"clés y seront ajoutées.\n" -" Élément de configuration: Dir::Etc::Trusted.<" -"/listitem>\n" +" Porte-clés des clés de confiance locales. Les nouvelles clés y seront ajoutées.\n" +" Élément de configuration: Dir::Etc::Trusted.\n" " \n" #. type: Plain text @@ -465,21 +413,16 @@ msgstr "" #, no-wrap msgid "" " /etc/apt/trusted.gpg.d/\n" -" File fragments for the trusted keys, additional keyrings " -"can\n" +" File fragments for the trusted keys, additional keyrings can\n" " be stored here (by other packages or the administrator).\n" -" Configuration Item Dir::Etc::TrustedParts.<" -"/listitem>\n" +" Configuration Item Dir::Etc::TrustedParts.\n" " \n" "\">\n" msgstr "" " /etc/apt/trusted.gpg.d/\n" -" Fragments de fichiers pour les clés de signatures sûres. " -"Des fichiers\n" -" supplémentaires peuvent être placés à cet endroit (par des paquets ou " -"par l'administrateur).\n" -" Élément de configuration : Dir::Etc::TrustedParts.<" -"/para>\n" +" Fragments de fichiers pour les clés de signatures sûres. Des fichiers\n" +" supplémentaires peuvent être placés à cet endroit (par des paquets ou par l'administrateur).\n" +" Élément de configuration : Dir::Etc::TrustedParts.\n" " \n" "\">\n" @@ -488,8 +431,7 @@ msgstr "" #, no-wrap msgid "" "/var/lib/apt/extended_states<" -"/term>\n" +" /var/lib/apt/extended_states\n" " Status list of auto-installed packages.\n" " Configuration Item: Dir::State::extended_states.\n" " \n" @@ -497,11 +439,9 @@ msgid "" "\">\n" msgstr "" "/var/lib/apt/extended_states<" -"/term>\n" +" /var/lib/apt/extended_states\n" " Liste d'état des paquets installés automatiquement.\n" -" Élément de configuration : Dir::State::extended_states" -".\n" +" Élément de configuration : Dir::State::extended_states.\n" " \n" "\">\n" @@ -509,10 +449,8 @@ msgstr "" #: apt.ent:175 #, no-wrap msgid "" -"\n" +"\n" "\n" msgstr "\n" @@ -520,39 +458,28 @@ msgstr "\n" #: apt.ent:184 #, no-wrap msgid "" -"\n" "john@doe.org " -"in 2009,\n" -" 2010 and Daniela Acme daniela@acme.us in 2010 together " -"with the\n" -" Debian Dummy l10n Team debian-l10n-dummy@lists.debian.org" -".\n" +" The english translation was done by John Doe john@doe.org in 2009,\n" +" 2010 and Daniela Acme daniela@acme.us in 2010 together with the\n" +" Debian Dummy l10n Team debian-l10n-dummy@lists.debian.org.\n" "\">\n" msgstr "" "" -"bubulle@debian.org (2000, 2005, 2009, 2010),\n" -" Équipe de traduction francophone de Debian " -"debian-l10n-french@lists.debian.org\n" +" Jérôme Marant, Philippe Batailler, Christian Perrier bubulle@debian.org (2000, 2005, 2009, 2010),\n" +" Équipe de traduction francophone de Debian debian-l10n-french@lists.debian.org\n" "\">\n" #. type: Plain text #: apt.ent:195 #, no-wrap msgid "" -"\n" "\n" msgstr "" "\n" @@ -4124,12 +4050,8 @@ msgstr "" #. type: Content of: #: apt.conf.5.xml:497 #, no-wrap -msgid "" -"Acquire::CompressionTypes::FileExtension \"<" -"replaceable>Methodname\";" -msgstr "" -"Acquire::CompressionTypes::ExtensionFichier \"<" -"replaceable>NomMethode\";" +msgid "Acquire::CompressionTypes::FileExtension \"Methodname\";" +msgstr "Acquire::CompressionTypes::ExtensionFichier \"NomMethode\";" #. type: Content of: #: apt.conf.5.xml:492 @@ -4278,10 +4200,8 @@ msgstr "" #. type: Content of: #: apt.conf.5.xml:549 #, no-wrap -msgid "" -"Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" -msgstr "" -"Acquire::Languages { \"environment\"; \"fr\"; \"en\"; \"none\"; \"de\"; };" +msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" +msgstr "Acquire::Languages { \"environment\"; \"fr\"; \"en\"; \"none\"; \"de\"; };" #. type: Content of: #: apt.conf.5.xml:537 @@ -4915,7 +4835,7 @@ msgstr "" #. TODO: provide a #. motivating example, except I haven't a clue why you'd want -#. to do this. +#. to do this. #. type: Content of: #: apt.conf.5.xml:836 msgid "" @@ -5198,7 +5118,7 @@ msgstr "" "Le fichier &configureindex; contient un modèle de fichier montrant des " "exemples pour toutes les options existantes." -#. ? reading apt.conf +#. ? reading apt.conf #. type: Content of: #: apt.conf.5.xml:1175 msgid "&apt-cache;, &apt-config;, &apt-preferences;." @@ -5311,12 +5231,8 @@ msgstr "Priorités affectées par défaut" #. type: Content of: #: apt_preferences.5.xml:94 #, no-wrap -msgid "" -"apt-get install -t testing some-package<" -"/command>\n" -msgstr "" -"apt-get install -t testing paquet<" -"/command>\n" +msgid "apt-get install -t testing some-package\n" +msgstr "apt-get install -t testing paquet\n" #. type: Content of: #: apt_preferences.5.xml:97 @@ -6463,10 +6379,8 @@ msgstr "Suivre l'évolution d'une version par son nom de code" #: apt_preferences.5.xml:654 #, no-wrap msgid "" -"Explanation: Uninstall or do not install any Debian-originated package " -"versions\n" -"Explanation: other than those in the distribution codenamed with " -"&testing-codename; or sid\n" +"Explanation: Uninstall or do not install any Debian-originated package versions\n" +"Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n" "Package: *\n" "Pin: release n=&testing-codename;\n" "Pin-Priority: 900\n" @@ -6814,13 +6728,11 @@ msgstr "Exemples :" #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" -"deb http://security.debian.org/ &stable-codename;/updates main contrib " -"non-free\n" +"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n" " " msgstr "" "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" -"deb http://security.debian.org/ &stable-codename;/updates main contrib " -"non-free\n" +"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n" " " #. type: Content of: @@ -8140,12 +8052,8 @@ msgstr "" #. type: Content of: <refentry><refsect1><para><programlisting> #: apt-ftparchive.1.xml:602 #, no-wrap -msgid "" -"<command>apt-ftparchive</command> packages <replaceable>directory<" -"/replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" -msgstr "" -"<command>apt-ftparchive</command> packages <replaceable>répertoire<" -"/replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" +msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" +msgstr "<command>apt-ftparchive</command> packages <replaceable>répertoire</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" #. type: Content of: <refentry><refsect1><para> #: apt-ftparchive.1.xml:598 @@ -8524,8 +8432,7 @@ msgid "" "Building Dependency Tree... Done" msgstr "" "# apt-get update\n" -"Réception de http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ " -"Packages\n" +"Réception de http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n" "Réception de http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n" "Lecture des listes de paquets... Fait\n" "Construction de l'arbre des dépendances... Fait" @@ -9245,11 +9152,9 @@ msgid "" "12 packages not fully installed or removed.\n" "Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used." msgstr "" -"206 paquets mis à jour, 8 nouvellement installés, 23 à enlever et 51 non mis " -"à jour.\n" +"206 paquets mis à jour, 8 nouvellement installés, 23 à enlever et 51 non mis à jour.\n" "12 paquets partiellement installés ou enlevés.\n" -"Il est nécessaire de prendre 65,7Mo/66,7Mo dans les archives. Après cette " -"opération, 26,5Mo d'espace disque supplémentaires seront utilisés." +"Il est nécessaire de prendre 65,7Mo/66,7Mo dans les archives. Après cette opération, 26,5Mo d'espace disque supplémentaires seront utilisés." #. type: <p></p> #: guide.sgml:470 @@ -9319,12 +9224,10 @@ msgid "" "11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s" msgstr "" "# apt-get update\n" -"Réception de :1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ " -"Packages\n" +"Réception de :1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n" "Réception de :2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n" "Atteint http://llug.sep.bnl.gov/debian/ testing/main Packages\n" -"Réception de :4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ " -"Packages\n" +"Réception de :4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n" "Réception de :5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n" "11% [5 testing/non-free `Attente du fichier' 0/32.1k 0%] 2203b/s 1m52s" @@ -9690,8 +9593,7 @@ msgstr "" " # apt-get update\n" " [ APT récupère les fichiers des paquets ]\n" " # apt-get dist-upgrade\n" -" [ APT récupère tous les fichiers nécessaires à la mise à jour de la machine " -"distante ]" +" [ APT récupère tous les fichiers nécessaires à la mise à jour de la machine distante ]" #. type: </example></p> #: offline.sgml:149 @@ -9812,8 +9714,7 @@ msgid "" " # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script" msgstr "" " # apt-get dist-upgrade \n" -" [ Répondre négativement à la question, pour être sûr(e) que les actions vous " -"conviennent ]\n" +" [ Répondre négativement à la question, pour être sûr(e) que les actions vous conviennent ]\n" " # apt-get -qq --print-uris dist-upgrade > uris\n" " # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script" diff --git a/po/apt-all.pot b/po/apt-all.pot index 763d8a034..a19328105 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt 0.9.7.9~exp2\n" +"Project-Id-Version: apt 0.9.8~20130508\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -569,7 +569,7 @@ msgstr "" msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -1393,31 +1393,31 @@ msgstr "" msgid "Unknown date format" msgstr "" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "" @@ -2561,17 +2561,17 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2614,7 +2614,7 @@ msgstr "" msgid "Method %s did not start correctly" msgstr "" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" diff --git a/po/ar.po b/po/ar.po index ffb394131..4badb4a54 100644 --- a/po/ar.po +++ b/po/ar.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+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" @@ -582,7 +582,7 @@ msgstr "إجهاض." msgid "Do you want to continue [Y/n]? " msgstr "هل تريد الاستمرار [Y/n]؟" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "فشل إحضار %s %s\n" @@ -1418,31 +1418,31 @@ msgstr "خادم http له دعم مدى معطوب" msgid "Unknown date format" msgstr "نسق تاريخ مجهول" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "فشل التحديد" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "انتهى وقت الاتصال" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "خطأ في الكتابة إلى ملف المُخرجات" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "خطأ في الكتابة إلى الملف" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "خطأ في الكتابة إلى الملف" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "خطأ في القراءة من الخادم. أقفل الطرف الآخر الاتصال" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "خطأ في القراءة من الخادم" @@ -2592,17 +2592,17 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2645,7 +2645,7 @@ msgstr "" msgid "Method %s did not start correctly" msgstr "" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "الرجاء إدخال القرص المُسمّى '%s' في السوّاقة '%s' وضغط مفتاح الإدخال." diff --git a/po/ast.po b/po/ast.po index b3c87bd06..81761131c 100644 --- a/po/ast.po +++ b/po/ast.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.18\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+0200\n" "PO-Revision-Date: 2010-10-02 23:35+0100\n" "Last-Translator: Iñigo Varela <ivarela@softastur.org>\n" "Language-Team: Asturian (ast)\n" @@ -628,7 +628,7 @@ msgstr "Encaboxar." msgid "Do you want to continue [Y/n]? " msgstr "¿Quies continuar [S/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falló algamar %s %s\n" @@ -1548,31 +1548,31 @@ msgstr "Esti sirvidor HTTP tien rotu'l soporte d'alcance" msgid "Unknown date format" msgstr "Formatu de data desconocíu" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Falló la escoyeta" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Gandió'l tiempu de conexón" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Fallu al escribir nel ficheru de salida" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Fallu al escribir nel ficheru" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Fallu al escribir nel ficheru" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Fallu al lleer nel sirvidor. El llau remotu zarró la conexón." -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Fallu al lleer nel sirvidor" @@ -2818,7 +2818,7 @@ msgid "" msgstr "" "El paquete %s necesita reinstalase, pero nun s'alcuentra un archivu pa el." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2826,11 +2826,11 @@ msgstr "" "Error, pkgProblemResolver::Resolve xeneró frañadures, esto puede ser pola " "mor de paquetes reteníos." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "Nun pueden iguase los problemes; tienes paquetes frañaos reteníos." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2876,7 +2876,7 @@ msgstr "Nun pudo alncontrase'l controlador de métodu %s." msgid "Method %s did not start correctly" msgstr "El métodu %s nun entamó correchamente" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Por favor, introduz el discu '%s' nel preséu '%s' y calca Intro." diff --git a/po/bg.po b/po/bg.po index 0768e88e7..66af09d7d 100644 --- a/po/bg.po +++ b/po/bg.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.21\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+0200\n" "PO-Revision-Date: 2012-06-25 17:23+0300\n" "Last-Translator: Damyan Ivanov <dmn@debian.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" @@ -638,7 +638,7 @@ msgstr "Прекъсване." msgid "Do you want to continue [Y/n]? " msgstr "Искате ли да продължите [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Неуспех при изтеглянето на %s %s\n" @@ -1585,31 +1585,31 @@ msgstr "HTTP сървърът няма поддръжка за прехвърл msgid "Unknown date format" msgstr "Неизвестен формат на дата" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Неуспех на избора" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Допустимото време за свързване изтече" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Грешка при записа на изходен файл" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Грешка при записа на файл" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Грешка при записа на файла" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Грешка при четене от сървъра. Отдалеченият сървър прекъсна връзката" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Грешка при четене от сървъра" @@ -2865,7 +2865,7 @@ msgstr "" "Пакетът %s трябва да бъде преинсталиран, но не може да се намери архив за " "него." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2873,12 +2873,12 @@ msgstr "" "Грешка, pkgProblemResolver::Resolve генерира повреди, това може да е " "причинено от задържани пакети." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Неуспех при коригирането на проблемите, имате задържани счупени пакети." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2923,7 +2923,7 @@ msgstr "Неуспех при намирането на драйвер за ме msgid "Method %s did not start correctly" msgstr "Методът %s не стартира правилно" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Сложете диска, озаглавен „%s“ в устройство „%s“ и натиснете „Enter“." diff --git a/po/bs.po b/po/bs.po index 7dbe5c0be..e2c35adc0 100644 --- a/po/bs.po +++ b/po/bs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+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" @@ -587,7 +587,7 @@ msgstr "Odustani." msgid "Do you want to continue [Y/n]? " msgstr "Da li želite nastaviti? [Y/n]" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -1416,31 +1416,31 @@ msgstr "" msgid "Unknown date format" msgstr "Nepoznat oblik datuma" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "" @@ -2590,17 +2590,17 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2643,7 +2643,7 @@ msgstr "" msgid "Method %s did not start correctly" msgstr "" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" diff --git a/po/ca.po b/po/ca.po index 2bfee4717..d25c00731 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.6\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+0200\n" "PO-Revision-Date: 2012-10-19 13:30+0200\n" "Last-Translator: Jordi Mallach <jordi@debian.org>\n" "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n" @@ -639,7 +639,7 @@ msgstr "Avortat." msgid "Do you want to continue [Y/n]? " msgstr "Voleu continuar [S/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "No s'ha pogut obtenir %s %s\n" @@ -1573,32 +1573,32 @@ msgstr "Aquest servidor HTTP té el suport d'abast trencat" msgid "Unknown date format" msgstr "Format de la data desconegut" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Ha fallat la selecció" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Connexió finalitzada" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "S'ha produït un error en escriure al fitxer de sortida" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "S'ha produït un error en escriure al fitxer" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "S'ha produït un error en escriure al fitxer" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "" "S'ha produït un error en llegir, el servidor remot ha tancat la connexió" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "S'ha produït un error en llegir des del servidor" @@ -2846,7 +2846,7 @@ msgid "" msgstr "" "El paquet %s necessita ser reinstaŀlat, però no se li pot trobar un arxiu." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2854,13 +2854,13 @@ msgstr "" "Error, pkgProblemResolver::Resolve ha generat pauses, això pot haver estat " "causat per paquets retinguts." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "" "No es poden corregir els problemes, teniu paquets retinguts que estan " "trencats." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2905,7 +2905,7 @@ msgstr "No s'ha pogut trobar el mètode de control %s." msgid "Method %s did not start correctly" msgstr "El mètode %s no s'ha iniciat correctament" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Inseriu el disc amb l'etiqueta: «%s» en la unitat «%s» i premeu Intro." diff --git a/po/cs.po b/po/cs.po index 4064c164b..e29f73fbf 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+0200\n" "PO-Revision-Date: 2012-07-08 13:46+0200\n" "Last-Translator: Miroslav Kure <kurem@debian.cz>\n" "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n" @@ -626,7 +626,7 @@ msgstr "Přerušeno." msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovat [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Selhalo stažení %s %s\n" @@ -1561,31 +1561,31 @@ msgstr "Tento HTTP server má porouchanou podporu rozsahů" msgid "Unknown date format" msgstr "Neznámý formát data" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Výběr selhal" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Čas spojení vypršel" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Chyba zápisu do výstupního souboru" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Chyba čtení ze serveru" @@ -2814,7 +2814,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Balík %s je potřeba přeinstalovat, ale nemohu pro něj nalézt archiv." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2822,11 +2822,11 @@ msgstr "" "Chyba, pkgProblemResolver::Resolve vytváří poruchy, to může být způsobeno " "podrženými balíky." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "Nelze opravit problémy, některé balíky držíte v porouchaném stavu." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2871,7 +2871,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:440 +#: apt-pkg/acquire-worker.cc:447 #, 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." diff --git a/po/cy.po b/po/cy.po index c1867d70a..6cfe2670e 100644 --- a/po/cy.po +++ b/po/cy.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+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" @@ -663,7 +663,7 @@ msgstr "Erthylu." msgid "Do you want to continue [Y/n]? " msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Methwyd cyrchu %s %s\n" @@ -1577,32 +1577,32 @@ msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri" msgid "Unknown date format" msgstr "Fformat dyddiad anhysbys" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Methwyd dewis" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Goramserodd y cysylltiad" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Gwall wrth ysgrifennu i ffeil allbwn" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Gwall wrth ysgrifennu at ffeil" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Gwall wrth ysgrifennu at y ffeil" -#: methods/http.cc:923 +#: methods/http.cc:928 #, fuzzy msgid "Error reading from server. Remote end closed connection" msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Gwall wrth ddarllen o'r gweinydd" @@ -2865,7 +2865,7 @@ msgstr "" "Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar " "ei gyfer." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2873,12 +2873,12 @@ msgstr "" "Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi " "ei achosi gan pecynnau wedi eu dal." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2924,7 +2924,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:440 +#: apt-pkg/acquire-worker.cc:447 #, fuzzy, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" diff --git a/po/da.po b/po/da.po index e2982b563..2db1394ef 100644 --- a/po/da.po +++ b/po/da.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+0200\n" "PO-Revision-Date: 2012-07-03 23:51+0200\n" "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n" "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n" @@ -635,7 +635,7 @@ msgstr "Afbryder." msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortsætte [J/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Kunne ikke hente %s %s\n" @@ -1572,31 +1572,31 @@ msgstr "" msgid "Unknown date format" msgstr "Ukendt datoformat" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Valg mislykkedes" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Tidsudløb på forbindelsen" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Fejl ved skrivning af uddatafil" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Fejl ved skrivning til fil" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Fejl ved skrivning til filen" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Fejl ved læsning fra serveren. Den fjerne ende lukkede forbindelsen" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Fejl ved læsning fra server" @@ -2836,7 +2836,7 @@ msgid "" msgstr "" "Pakken %s skal geninstalleres, men jeg kan ikke finde noget arkiv med den." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2844,12 +2844,12 @@ msgstr "" "Fejl, pkgProblemResolver::Resolve satte stopklodser op, det kan skyldes " "tilbageholdte pakker." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Kunne ikke korrigere problemerne, da du har tilbageholdt ødelagte pakker." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2894,7 +2894,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:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Indsæt disken med navnet: '%s' i drevet '%s' og tryk retur." diff --git a/po/de.po b/po/de.po index 00f40344e..ec2bab259 100644 --- a/po/de.po +++ b/po/de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.2\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+0200\n" "PO-Revision-Date: 2012-06-27 10:55+0200\n" "Last-Translator: Holger Wansing <linux@wansing-online.de>\n" "Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n" @@ -648,7 +648,7 @@ msgstr "Abbruch." msgid "Do you want to continue [Y/n]? " msgstr "Möchten Sie fortfahren [J/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Fehlschlag beim Holen von %s %s\n" @@ -1623,33 +1623,33 @@ msgstr "" msgid "Unknown date format" msgstr "Unbekanntes Datumsformat" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Auswahl fehlgeschlagen" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Zeitüberschreitung bei Verbindung" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Fehler beim Schreiben der Ausgabedatei" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Fehler beim Schreiben in Datei" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Fehler beim Schreiben der Datei" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "" "Fehler beim Lesen vom Server: Verbindung wurde durch den Server auf der " "anderen Seite geschlossen." -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Fehler beim Lesen vom Server" @@ -2912,7 +2912,7 @@ msgstr "" "Das Paket %s muss neu installiert werden, es kann jedoch kein Archiv dafür " "gefunden werden." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2920,13 +2920,13 @@ msgstr "" "Fehler: Unterbrechungen durch pkgProblemResolver::Resolve hervorgerufen; " "dies könnte durch zurückgehaltene Pakete verursacht worden sein." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Probleme können nicht korrigiert werden, Sie haben zurückgehaltene defekte " "Pakete." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2971,7 +2971,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:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" diff --git a/po/dz.po b/po/dz.po index 01854d2d6..f49ecc0c1 100644 --- a/po/dz.po +++ b/po/dz.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po.pot\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+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" @@ -645,7 +645,7 @@ msgstr "བར་བཤོལ་འབད།" msgid "Do you want to continue [Y/n]? " msgstr "ཁྱོན་ཀྱི་འཕྲོ་མཐུད་ནི་འབད་ནི་ཨིན་ན་[Y/n]?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n" @@ -1538,31 +1538,31 @@ msgstr "འ་ནི་ ཨེཆི་ཊི་ཊི་པི་ སར་བ msgid "Unknown date format" msgstr "མ་ཤེས་པའི་ཚེས་རྩ་སྒྲིག" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "སེལ་འཐུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "མཐུད་ལམ་ངལ་མཚམས་འབད་ཡོད།" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "ཨའུཊི་པུཊི་ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "ཡིག་སྣོད་འདི་ལུ་འབྲིཝ་ད་འཛོལ་བ།" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ། ཐག་རིང་མཇུག་གི་མཐུད་ལམ་དེ་ཁ་བསྡམས།" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ།" @@ -2802,7 +2802,7 @@ msgstr "" "ཐུམ་སྒྲིལ་%s་འདི་ལོག་འདི་རང་གཞི་བཙུགས་འབད་དགོཔ་འདུག་ འདི་འབདཝ་ད་འདི་གི་དོན་ལུ་ཡིག་མཛོད་ཅིག་འཚོལ་" "མ་ཐོབ།" -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2810,11 +2810,11 @@ msgstr "" "འཛོལ་བ་ pkgProblemResolver::གིས་བཟོ་བཏོན་འབད་ཡོད་པའི་མཚམས་དེ་ཚུ་མོས་མཐུན་བཟོཝ་ཨིན འ་ནི་ཐུམ་" "སྒྲིལ་ཚུ་འཛིན་པའི་རྒྱུ་རྐྱེན་ལས་བརྟེན་ཨིན་པས།" -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "དཀའ་ངལ་འདི་ནོར་བཅོས་འབད་མ་ཚུགས་ ཁྱོད་ཀྱི་ཐུམ་སྒྲིལ་ཆད་པ་ཚུ་འཆང་འདི་འདུག" -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2860,7 +2860,7 @@ msgstr "ཐབས་ལམ་འདྲེན་བྱེད་%s་འདི་ msgid "Method %s did not start correctly" msgstr "ཐབས་ལམ་ %s འདི་ངེས་བདེན་སྦེ་འགོ་མ་བཙུགས་འབད།" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "ཁ་ཡིག་བཀོད་ཡོད་པའི་ ཌིསི་འདི་བཙུགས་གནང་། '%s'འདྲེན་འཕྲུལ་ནང་'%s' དང་ལོག་ལྡེ་འདི་ཨེབ།་" diff --git a/po/el.po b/po/el.po index 75625de47..8dbce27ab 100644 --- a/po/el.po +++ b/po/el.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_el\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+0200\n" "PO-Revision-Date: 2008-08-26 18:25+0300\n" "Last-Translator: Θανάσης Νάτσης <natsisthanasis@gmail.com>\n" "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n" @@ -654,7 +654,7 @@ msgstr "Εγκατάλειψη." msgid "Do you want to continue [Y/n]? " msgstr "Θέλετε να συνεχίσετε [Ν/ο]; " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Αποτυχία ανάκτησης του %s %s\n" @@ -1560,32 +1560,32 @@ msgstr "Ο διακομιστής http δεν υποστηρίζει πλήρω msgid "Unknown date format" msgstr "Άγνωστη μορφή ημερομηνίας" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Η επιλογή απέτυχε" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Λήξη χρόνου σύνδεσης" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Σφάλμα στην εγγραφή στο αρχείο" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Σφάλμα στην εγγραφή στο αρχείο" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "" "Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Σφάλμα στην ανάγνωση από το διακομιστή" @@ -2829,7 +2829,7 @@ msgstr "" "Το πακέτο '%s' χρειάζεται να επανεγκατασταθεί, αλλά είναι αδύνατη η εύρεση " "κάποιας κατάλληλης αρχείοθήκης." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2837,11 +2837,11 @@ msgstr "" "Σφάλμα, το pkgProblemResolver::Resolve παρήγαγε διακοπές, αυτό ίσως " "προκλήθηκε από κρατούμενα πακέτα." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "Αδύνατη η διόρθωση προβλημάτων, έχετε κρατούμενα ελαττωματικά πακέτα." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2887,7 +2887,7 @@ msgstr "Ο οδηγός μεθόδου %s δεν μπορεί να εντοπι msgid "Method %s did not start correctly" msgstr "Η μέθοδος %s δεν εκκινήθηκε σωστά" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" diff --git a/po/es.po b/po/es.po index 286e5455b..b16d8cad2 100644 --- a/po/es.po +++ b/po/es.po @@ -33,7 +33,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.10\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+0200\n" "PO-Revision-Date: 2011-01-24 11:47+0100\n" "Last-Translator: Javier Fernández-Sanguino Peña <jfs@debian.org>\n" "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n" @@ -697,7 +697,7 @@ msgstr "Abortado." msgid "Do you want to continue [Y/n]? " msgstr "¿Desea continuar [S/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Imposible obtener %s %s\n" @@ -1623,31 +1623,31 @@ msgstr "Éste servidor de http tiene el soporte de alcance roto" msgid "Unknown date format" msgstr "Formato de fecha desconocido" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Falló la selección" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Expiró la conexión" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Error escribiendo al archivo de salida" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Error escribiendo a archivo" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Error escribiendo al archivo" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Error leyendo del servidor, el lado remoto cerró la conexión." -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Error leyendo del servidor" @@ -2909,7 +2909,7 @@ msgstr "" "El paquete %s necesita ser reinstalado, pero no se encuentra un archivo para " "éste." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2917,12 +2917,12 @@ msgstr "" "Error, pkgProblemResolver::Resolve generó cortes, esto puede haber sido " "causado por paquetes retenidos." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "" "No se pudieron corregir los problemas, usted ha retenido paquetes rotos." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2968,7 +2968,7 @@ msgstr "No se pudo encontrar el método %s." msgid "Method %s did not start correctly" msgstr "El método %s no se inició correctamente" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, 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 pulse Intro." diff --git a/po/eu.po b/po/eu.po index f327b113c..0a066f364 100644 --- a/po/eu.po +++ b/po/eu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_eu\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+0200\n" "PO-Revision-Date: 2009-05-17 00:41+0200\n" "Last-Translator: Piarres Beobide <pi@beobide.net>\n" "Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n" @@ -635,7 +635,7 @@ msgstr "Abortatu." msgid "Do you want to continue [Y/n]? " msgstr "Aurrera jarraitu nahi al duzu [B/e]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ezin da lortu %s %s\n" @@ -1544,31 +1544,31 @@ msgstr "http zerbitzariak barruti onarpena apurturik du" msgid "Unknown date format" msgstr "Datu formatu ezezaguna" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Hautapenak huts egin du" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Konexioaren denbora muga gainditu da" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Errorea irteerako fitxategian idaztean" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Errorea zerbitzaritik irakurtzean" @@ -2802,7 +2802,7 @@ msgid "" msgstr "" "%s paketea berriro instalatu behar da, baina ezin dut artxiborik aurkitu." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2810,11 +2810,11 @@ msgstr "" "Errorea: pkgProblemResolver::Resolve. Etenak sortu ditu, beharbada " "atxikitako paketeek eraginda." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "Ezin dira arazoak konpondu; hautsitako paketeak atxiki dituzu." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2860,7 +2860,7 @@ msgstr "Ezin izan da %s metodo kontrolatzailea aurkitu." msgid "Method %s did not start correctly" msgstr "%s metodoa ez da behar bezala abiarazi" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Mesedez sa ''%s' izeneko diska '%s' gailuan eta enter sakatu" diff --git a/po/fi.po b/po/fi.po index 1637a9d97..593af8928 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+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" @@ -632,7 +632,7 @@ msgstr "Keskeytä." msgid "Do you want to continue [Y/n]? " msgstr "Haluatko jatkaa [K/e]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Tiedoston %s nouto ei onnistunut %s\n" @@ -1536,31 +1536,31 @@ msgstr "HTTP-palvelimen arvoaluetuki on rikki" msgid "Unknown date format" msgstr "Tuntematon päiväysmuoto" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Select ei toiminut" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Yhteys aikakatkaistiin" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Tapahtui virhe luettaessa palvelimelta" @@ -2792,7 +2792,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Paketti %s olisi asennettava uudelleen, mutta sen arkistoa ei löydy." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2800,11 +2800,11 @@ msgstr "" "Virhe, pkgProblemResolver::Resolve tuotti katkoja, syynä voi olla pysytetyt " "paketit." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "Pulmia ei voi korjata, rikkinäisiä paketteja on pysytetty." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2850,7 +2850,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:440 +#: apt-pkg/acquire-worker.cc:447 #, 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." diff --git a/po/fr.po b/po/fr.po index 835c0b206..8cd29ac64 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+0200\n" "PO-Revision-Date: 2013-04-09 07:58+0200\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -648,7 +648,7 @@ msgstr "Annulation." msgid "Do you want to continue [Y/n]? " msgstr "Souhaitez-vous continuer [O/n] ? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossible de récupérer %s %s\n" @@ -1621,31 +1621,31 @@ msgstr "Ce serveur http possède un support des limites non-valide" msgid "Unknown date format" msgstr "Format de date inconnu" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Sélection défaillante" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Délai de connexion dépassé" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Erreur d'écriture du fichier de sortie" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Erreur d'écriture sur un fichier" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Erreur d'écriture sur le fichier" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Erreur de lecture depuis le serveur distant et clôture de la connexion" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Erreur de lecture du serveur" @@ -2918,7 +2918,7 @@ msgstr "" "Le paquet %s doit être réinstallé, mais il est impossible de trouver son " "archive." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2926,13 +2926,13 @@ msgstr "" "Erreur, pkgProblem::Resolve a généré des ruptures, ce qui a pu être causé " "par les paquets devant être gardés en l'état." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Impossible de corriger les problèmes, des paquets défectueux sont en mode " "« garder en l'état »." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2977,7 +2977,7 @@ msgstr "Le pilote pour la méthode %s n'a pu être trouvé." msgid "Method %s did not start correctly" msgstr "La méthode %s n'a pas démarré correctement" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" diff --git a/po/gl.po b/po/gl.po index 12125eb54..cdc0ced87 100644 --- a/po/gl.po +++ b/po/gl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_gl\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+0200\n" "PO-Revision-Date: 2011-05-12 15:28+0100\n" "Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n" "Language-Team: galician <proxecto@trasno.net>\n" @@ -639,7 +639,7 @@ msgstr "Interromper." msgid "Do you want to continue [Y/n]? " msgstr "Quere continuar [S/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Non foi posíbel obter %s %s\n" @@ -1571,32 +1571,32 @@ msgstr "Este servidor HTTP ten a compatibilidade de rangos estragada" msgid "Unknown date format" msgstr "Formato de datos descoñecido" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Fallou a chamada a select" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "A conexión esgotou o tempo" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Produciuse un erro ao escribir no ficheiro de saída" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Produciuse un erro ao escribir nun ficheiro" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Produciuse un erro ao escribir no ficheiro" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "" "Produciuse un erro ao ler do servidor. O extremo remoto pechou a conexión" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Produciuse un erro ao ler do servidor" @@ -2851,7 +2851,7 @@ msgstr "" "O paquete %s ten que ser reinstalado, mais non é posíbel atopar o seu " "arquivo." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2859,11 +2859,11 @@ msgstr "" "Erro, pkgProblemResolver::Resolve xerou interrupcións, isto pode estar " "causado por paquetes retidos." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "Non é posíbel solucionar os problemas, ten retidos paquetes rotos." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2909,7 +2909,7 @@ msgstr "Non foi posíbel 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:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Insira o disco etiquetado: «%s» na unidade «%s» e prema Intro." diff --git a/po/hu.po b/po/hu.po index 9cf645472..7eae63ba1 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt trunk\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+0200\n" "PO-Revision-Date: 2012-06-25 17:09+0200\n" "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n" "Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n" @@ -628,7 +628,7 @@ msgstr "Megszakítva." msgid "Do you want to continue [Y/n]? " msgstr "Folytatni akarja [I/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Sikertelen letöltés: %s %s\n" @@ -1578,31 +1578,31 @@ msgstr "A HTTP-kiszolgáló tartománytámogatása sérült" msgid "Unknown date format" msgstr "Ismeretlen dátumformátum" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "A kiválasztás sikertelen" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Időtúllépés a kapcsolatban" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Hiba a kimeneti fájl írásakor" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Hiba a fájl írásakor" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Hiba a fájl írásakor" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Hiba a kiszolgálóról olvasáskor, a túloldal lezárta a kapcsolatot" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Hiba a kiszolgálóról olvasáskor" @@ -2857,7 +2857,7 @@ msgid "" msgstr "" "A(z) %s csomagot újra kell telepíteni, de nem található hozzá archívum." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2865,11 +2865,11 @@ msgstr "" "Hiba, a pkgProblemResolver::Resolve töréseket generált, ezt visszafogott " "csomagok okozhatják." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "A problémák nem javíthatók, sérült csomagokat fogott vissza." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2914,7 +2914,7 @@ msgstr "A(z) %s metódusvezérlő nem található." msgid "Method %s did not start correctly" msgstr "A(z) %s metódus nem indult el megfelelően" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" diff --git a/po/it.po b/po/it.po index e0baac726..a697ca66e 100644 --- a/po/it.po +++ b/po/it.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+0200\n" "PO-Revision-Date: 2012-06-25 21:54+0200\n" "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n" "Language-Team: Italian <tp@lists.linux.it>\n" @@ -643,7 +643,7 @@ msgstr "Interrotto." msgid "Do you want to continue [Y/n]? " msgstr "Continuare [S/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossibile recuperare %s %s\n" @@ -1602,31 +1602,31 @@ msgstr "Questo server HTTP ha un supporto del range non corretto" msgid "Unknown date format" msgstr "Formato della data sconosciuto" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Select non riuscita" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Connessione terminata" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Errore nello scrivere sul file di output" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Errore nello scrivere su file" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Errore nello scrivere sul file" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Errore nel leggere dal server. Il lato remoto ha chiuso la connessione" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Errore nel leggere dal server" @@ -2897,7 +2897,7 @@ msgstr "" "Il pacchetto %s deve essere reinstallato, ma non è possibile trovarne un " "archivio." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2905,12 +2905,12 @@ msgstr "" "Errore, pkgProblemResolver::Resolve ha generato delle interruzioni. Questo " "potrebbe essere causato da pacchetti bloccati." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Impossibile correggere i problemi, ci sono pacchetti danneggiati bloccati." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2956,7 +2956,7 @@ msgstr "Impossibile trovare un driver per il metodo %s." msgid "Method %s did not start correctly" msgstr "Il metodo %s non si è avviato correttamente" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Inserire il disco chiamato \"%s\" nell'unità \"%s\" e premere Invio." diff --git a/po/ja.po b/po/ja.po index 399219f2f..2b81a4773 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+0200\n" "PO-Revision-Date: 2012-07-01 00:14+0900\n" "Last-Translator: Kenshi Muto <kmuto@debian.org>\n" "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n" @@ -635,7 +635,7 @@ msgstr "中断しました。" msgid "Do you want to continue [Y/n]? " msgstr "続行しますか [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s の取得に失敗しました %s\n" @@ -1575,31 +1575,31 @@ msgstr "HTTP サーバのレンジサポートが壊れています" msgid "Unknown date format" msgstr "不明な日付フォーマットです" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "select に失敗しました" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "接続タイムアウト" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "出力ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "リモート側で接続がクローズされてサーバからの読み込みに失敗しました" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "サーバからの読み込みに失敗しました" @@ -2841,7 +2841,7 @@ msgstr "" "パッケージ %s を再インストールする必要がありますが、そのためのアーカイブを見" "つけることができませんでした。" -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2849,11 +2849,11 @@ msgstr "" "エラー、pkgProblemResolver::Resolve は停止しました。おそらく変更禁止パッケー" "ジが原因です。" -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "問題を解決することができません。壊れた変更禁止パッケージがあります。" -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2898,7 +2898,7 @@ msgstr "メソッドドライバ %s が見つかりません。" msgid "Method %s did not start correctly" msgstr "メソッド %s が正常に開始しませんでした" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" diff --git a/po/km.po b/po/km.po index bb7bd6ee1..28c3d2cc9 100644 --- a/po/km.po +++ b/po/km.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_km\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+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" @@ -635,7 +635,7 @@ msgstr "បោះបង់ ។" msgid "Do you want to continue [Y/n]? " msgstr "តើ​អ្នក​ចង់​បន្តឬ​ [បាទ ចាស/ទេ​] ? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ %s %s\n" @@ -1516,31 +1516,31 @@ msgstr "ម៉ាស៊ីន​បម្រើ HTTP នេះបាន​ខូ msgid "Unknown date format" msgstr "មិនស្គាល់​ទ្រង់ទ្រាយ​កាលបរិច្ឆេទ" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "ជ្រើស​បាន​បរាជ័យ​" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "ការតភ្ជាប់​បាន​អស់ពេល​" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារលទ្ធផល" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារ" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "កំហុសក្នុងការ​សរសេរ​ទៅកាន់​ឯកសារ" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "កំហុស​ក្នុងការ​អាន​ពី​ម៉ាស៊ីនបម្រើ ។ ការបញ្ចប់​ពីចម្ងាយ​បានបិទការតភ្ជាប់" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "កំហុស​ក្នុងការអាន​ពី​ម៉ាស៊ីន​បម្រើ" @@ -2767,7 +2767,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "កញ្ចប់ %s ត្រូវការឲ្យដំឡើង ប៉ុន្តែ​ ខ្ញុំ​មិន​អាច​រក​ប័ណ្ណសារ​សម្រាប់​វា​បាន​ទេ​ ។" -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2775,11 +2775,11 @@ msgstr "" "កំហុស pkgProblemResolver::ដោះស្រាយ​សញ្ញាបញ្ឈប់​ដែលបានបង្កើត នេះ​ប្រហែលជា បង្កដោយកញ្ចប់​" "ដែលបាន​ទុក ។" -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "មិន​អាច​កែ​បញ្ហាបានទេេ អ្កបានទុក​កញ្ចប់​ដែល​ខូច ។។" -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2824,7 +2824,7 @@ msgstr "មិនអាច​រកឃើញ​កម្មវិធី​បញ msgid "Method %s did not start correctly" msgstr "វិធីសាស្ត្រ​ %s មិន​អាច​ចាប់​ផ្តើម​ត្រឹមត្រូវ​ទេ​" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "សូម​បញ្ចូល​ស្លាក​ឌីស​ ៖ '%s' ក្នុង​ដ្រាយ​ '%s' ហើយ​សង្កត់​ចូល ។" diff --git a/po/ko.po b/po/ko.po index a4d0af447..b81ef8786 100644 --- a/po/ko.po +++ b/po/ko.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+0200\n" "PO-Revision-Date: 2010-08-30 02:31+0900\n" "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n" "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n" @@ -632,7 +632,7 @@ msgstr "중단." msgid "Do you want to continue [Y/n]? " msgstr "계속 하시겠습니까 [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s 파일을 받는데 실패했습니다 %s\n" @@ -1534,31 +1534,31 @@ msgstr "HTTP 서버에 범위 지원 기능이 잘못되어 있습니다" msgid "Unknown date format" msgstr "데이터 형식을 알 수 없습니다" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "select가 실패했습니다" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "연결 시간이 초과했습니다" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "출력 파일에 쓰는데 오류가 발생했습니다" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "파일에 쓰는데 오류가 발생했습니다" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "해당 파일에 쓰는데 오류가 발생했습니다" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "서버에서 읽고 연결을 닫는데 오류가 발생했습니다" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "서버에서 읽는데 오류가 발생했습니다" @@ -2793,7 +2793,7 @@ msgid "" msgstr "" "%s 패키지를 다시 설치해야 하지만, 이 패키지의 아카이브를 찾을 수 없습니다." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2801,11 +2801,11 @@ msgstr "" "오류, pkgProblemResolver::Resolve가 망가졌습니다. 고정 패키지때문에 발생할 수" "도 있습니다." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "문제를 바로잡을 수 없습니다. 망가진 고정 패키지가 있습니다." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2851,7 +2851,7 @@ msgstr "설치 방법 드라이버 %s을(를) 찾을 수 없습니다." msgid "Method %s did not start correctly" msgstr "설치 방법 %s이(가) 올바르게 시작하지 않았습니다" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" diff --git a/po/ku.po b/po/ku.po index f7f2d0996..740967827 100644 --- a/po/ku.po +++ b/po/ku.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-ku\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+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" @@ -590,7 +590,7 @@ msgstr "Betal." msgid "Do you want to continue [Y/n]? " msgstr "Dixwazî bidomînî [E/n]?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Anîna %s %s biserneket\n" @@ -1418,32 +1418,32 @@ msgstr "" msgid "Unknown date format" msgstr "" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Hilbijartin neserketî" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "" -#: methods/http.cc:850 +#: methods/http.cc:855 #, fuzzy msgid "Error writing to output file" msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Dema li pelî dihate nivîsîn çewtî" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Dema li pelî dihate nivîsîn çewtî" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "" @@ -2606,17 +2606,17 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2659,7 +2659,7 @@ msgstr "" msgid "Method %s did not start correctly" msgstr "" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, 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" diff --git a/po/lt.po b/po/lt.po index 22e5fc152..f1cccf15c 100644 --- a/po/lt.po +++ b/po/lt.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+0200\n" "PO-Revision-Date: 2008-08-02 01:47-0400\n" "Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n" "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n" @@ -598,7 +598,7 @@ msgstr "Nutraukti." msgid "Do you want to continue [Y/n]? " msgstr "Ar norite tęsti [T/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Nepavyko parsiųsti %s %s\n" @@ -1442,31 +1442,31 @@ msgstr "" msgid "Unknown date format" msgstr "" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Prisijungimo laiko limitas baigėsi" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Klaida bandant rašyti į failą" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "" @@ -2700,17 +2700,17 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2756,7 +2756,7 @@ msgstr "" msgid "Method %s did not start correctly" msgstr "" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Įdėkite diską „%s“ į įrenginį „%s“ ir paspauskite Enter." diff --git a/po/mr.po b/po/mr.po index 84ff30882..72843d82a 100644 --- a/po/mr.po +++ b/po/mr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+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 " @@ -629,7 +629,7 @@ msgstr "व्यत्यय/बंद करा." msgid "Do you want to continue [Y/n]? " msgstr "तुम्हाला पुढे जायचे आहे [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s %s आणणे असफल\n" @@ -1520,31 +1520,31 @@ msgstr "HTTP सर्व्हरने विस्तार तांत् msgid "Unknown date format" msgstr "अपरिचित दिनांक प्रकार/स्वरूप " -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "चुकले/असमर्थ निवड करा" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "जोडणी वेळेअभावी तुटली" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "निर्गत फाईल मध्ये लिहिताना त्रुटी/चूक" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "सर्व्हर मधून वाचण्यात चूक. लांब शेवट आणि बंद झालेली जोडणी" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "सर्व्हर मधून वाचण्यात चूक" @@ -2772,7 +2772,7 @@ msgid "" msgstr "" "%s पॅकेज पुनः:अधिष्ठापित करण्याची गरज आहे, परंतु मला त्यासाठी ऑर्काइव्ह सापडू शकले नाही." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2780,11 +2780,11 @@ msgstr "" "दोष,पॅकेज समस्या निवारक::निवारण करतांना अडथळा निर्माण झाला, ह्याचे कारण स्थगित " "पॅकेजेस असू शकते." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "अडचणी दूर करण्यास असमर्थ, तुम्ही तुटलेले पॅकेज घेतलेले आहे." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2830,7 +2830,7 @@ msgstr "%s कार्यपध्दतीचा ड्राइव्हर msgid "Method %s did not start correctly" msgstr "%s कार्यपध्दती योग्य रीतीने सुरु झालेली नाही" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "कृपया '%s' लेबल असलेली डिस्क '%s' या ड्राइव्हमध्ये ठेवा आणि एन्टर कळ दाबा." diff --git a/po/nb.po b/po/nb.po index d97d38d76..646a79a85 100644 --- a/po/nb.po +++ b/po/nb.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+0200\n" "PO-Revision-Date: 2010-09-01 21:10+0200\n" "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n" "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n" @@ -640,7 +640,7 @@ msgstr "Avbryter." msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortsette [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikke å skaffe %s %s\n" @@ -1549,31 +1549,31 @@ msgstr "Denne HTTP-tjeneren har ødelagt støtte for område" msgid "Unknown date format" msgstr "Ukjent datoformat" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Utvalget mislykkes" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Tidsavbrudd på forbindelsen" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Feil ved lesing fra tjeneren" @@ -2814,7 +2814,7 @@ msgid "" msgstr "" "Pakka %s trenger å installeres på nytt, men jeg finner ikke lageret for den." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2822,11 +2822,11 @@ msgstr "" "Feil, pkgProblemResolver::Resolve skapte et brudd, det kan skyldes pakker " "som holdes tilbake." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "Klarer ikke å rette problemene, noen ødelagte pakker er holdt tilbake." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2872,7 +2872,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:440 +#: apt-pkg/acquire-worker.cc:447 #, 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." diff --git a/po/ne.po b/po/ne.po index 4d089bf20..9466eb66f 100644 --- a/po/ne.po +++ b/po/ne.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+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" @@ -633,7 +633,7 @@ msgstr "परित्याग गर्नुहोस् ।" msgid "Do you want to continue [Y/n]? " msgstr "के तपाईँ निरन्तरता दिन चाहनुहुन्छ [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s %s तान्न असफल भयो\n" @@ -1517,31 +1517,31 @@ msgstr "HTTP सर्भर संग भाँचिएको दायरा msgid "Unknown date format" msgstr "अज्ञात मिति ढाँचा" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "असफल चयन गर्नुहोस्" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "जडान समय सकियो" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "निर्गात फाइलमा त्रुटि लेखिदैछ" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "फाइलमा त्रुटि लेखिदैछ" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "फाइलमा त्रुटि लेखिदैछ" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "सर्भरबाट त्रुटि पढिदैछ । दूर गन्तब्य बन्द जडान" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "सर्भरबाट त्रुटि पढिदैछ" @@ -2769,7 +2769,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "प्याकेज %s पुन:स्थापना हुन चाहन्छ, तर यसको लागि मैले एउटा संग्रह फेला पार्न सकिन ।" -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2777,11 +2777,11 @@ msgstr "" "त्रुटि, pkgProblemResolver:: समाधानले विच्छेदन सिर्जना गर्दछ, यो भइरहेको प्याकेजहरुको " "कारणले गर्दा हो ।" -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "समस्याहरू सुधार्न असक्षम भयो, तपाईँले प्याकेजहरु भाँच्नुभयो ।" -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2827,7 +2827,7 @@ msgstr "विधि ड्राइभर %s फेला पार्न स msgid "Method %s did not start correctly" msgstr "विधि %s सही रुपले सुरू हुन सकेन" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "कृपया डिस्क लेबुल: '%s' ड्राइभ '%s'मा घुसउनुहोस् र इन्टर थिच्नुहोस् । " diff --git a/po/nl.po b/po/nl.po index c3bec13e5..ffedbd849 100644 --- a/po/nl.po +++ b/po/nl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.15.9\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+0200\n" "PO-Revision-Date: 2011-12-05 17:10+0100\n" "Last-Translator: Jeroen Schot <schot@a-eskwadraat.nl>\n" "Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n" @@ -642,7 +642,7 @@ msgstr "Afbreken." msgid "Do you want to continue [Y/n]? " msgstr "Wilt u doorgaan [J/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ophalen van %s is mislukt %s\n" @@ -1570,32 +1570,32 @@ msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet" msgid "Unknown date format" msgstr "Onbekend datumformaat" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Selectie is mislukt" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Verbinding verliep" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Fout bij het schrijven naar het uitvoerbestand" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Fout bij het schrijven naar bestand" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Fout bij het schrijven naar het bestand" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "" "Fout bij het lezen van de server, andere kant heeft de verbinding gesloten" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Fout bij het lezen van de server" @@ -2852,7 +2852,7 @@ msgstr "" "Pakket %s moet opnieuw geïnstalleerd worden, maar er kan geen archief voor " "gevonden worden." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2860,11 +2860,11 @@ msgstr "" "Fout, pkgProblemResolver::Resolve maakte scheidingen aan, dit kan " "veroorzaakt worden door vastgehouden pakketten." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "Kan problemen niet verhelpen, u houdt defecte pakketten vast." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2910,7 +2910,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:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" diff --git a/po/nn.po b/po/nn.po index 89489066a..07af56d7a 100644 --- a/po/nn.po +++ b/po/nn.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_nn\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+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" @@ -645,7 +645,7 @@ msgstr "Avbryt." msgid "Do you want to continue [Y/n]? " msgstr "Vil du halda fram [J/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikkje henta %s %s\n" @@ -1534,31 +1534,31 @@ msgstr "Denne HTTP-tenaren har msgid "Unknown date format" msgstr "Ukjend datoformat" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Utvalet mislukkast" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Tidsavbrot p sambandet" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing fr tenaren. Sambandet vart lukka i andre enden" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Feil ved lesing fr tenaren" @@ -2783,7 +2783,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Pakken %s m installerast p nytt, men arkivet finst ikkje." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2791,12 +2791,12 @@ msgstr "" "Feil, pkgProblemResolver::Resolve har laga brot. Dette kan skuldast pakkar " "som er haldne tilbake." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Klarte ikkje retta opp problema. Nokre ydelagde pakkar er haldne tilbake." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2842,7 +2842,7 @@ msgstr "Finn ikkje metodedrivaren %s." msgid "Method %s did not start correctly" msgstr "Metoden %s starta ikkje rett" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, fuzzy, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" diff --git a/po/pl.po b/po/pl.po index b8643a951..58bcdeeb0 100644 --- a/po/pl.po +++ b/po/pl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.3\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+0200\n" "PO-Revision-Date: 2012-07-28 21:53+0200\n" "Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n" "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n" @@ -640,7 +640,7 @@ msgstr "Przerwane." msgid "Do you want to continue [Y/n]? " msgstr "Kontynuować [T/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Nie udało się pobrać %s %s\n" @@ -1608,31 +1608,31 @@ msgstr "Ten serwer HTTP nieprawidłowo obsługuje zakresy (ranges)" msgid "Unknown date format" msgstr "Nieznany format daty" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Operacja select nie powiodła się" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Przekroczenie czasu połączenia" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Błąd przy pisaniu do pliku wyjściowego" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Błąd przy pisaniu do pliku" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Błąd przy pisaniu do pliku" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Błąd czytania z serwera: Zdalna strona zamknęła połączenie" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Błąd czytania z serwera" @@ -2885,7 +2885,7 @@ msgstr "" "Pakiet %s ma zostać ponownie zainstalowany, ale nie można znaleźć jego " "archiwum." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2893,11 +2893,11 @@ msgstr "" "Błąd, pkgProblemResolver::Resolve zwrócił błąd, może to być spowodowane " "zatrzymanymi pakietami." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "Nie udało się naprawić problemów, zatrzymano uszkodzone pakiety." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2942,7 +2942,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:440 +#: apt-pkg/acquire-worker.cc:447 #, 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." diff --git a/po/pt.po b/po/pt.po index febe90d83..2c39e640c 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+0200\n" "PO-Revision-Date: 2012-06-29 15:45+0100\n" "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" @@ -636,7 +636,7 @@ msgstr "Abortado." msgid "Do you want to continue [Y/n]? " msgstr "Deseja continuar [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falhou obter %s %s\n" @@ -1583,31 +1583,31 @@ msgstr "Este servidor HTTP possui suporte de range errado" msgid "Unknown date format" msgstr "Formato de data desconhecido" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "A selecção falhou" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "O tempo da ligação expirou" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Erro ao escrever para o ficheiro de saída" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Erro ao escrever para ficheiro" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Erro ao escrever para o ficheiro" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Erro ao ler do servidor. O lado remoto fechou a ligação" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Erro ao ler do servidor" @@ -2862,7 +2862,7 @@ msgstr "" "O pacote %s necessita ser reinstalado, mas não foi possível encontrar um " "repositório para o mesmo." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2870,13 +2870,13 @@ msgstr "" "Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por " "pacotes mantidos (hold)." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Não foi possível corrigir problemas, você tem pacotes mantidos (hold) " "estragados." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2921,7 +2921,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 correctamente" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 0a5317c70..fb4c0de59 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+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." @@ -641,7 +641,7 @@ msgstr "Abortar." msgid "Do you want to continue [Y/n]? " msgstr "Você quer continuar [S/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falhou ao buscar %s %s\n" @@ -1553,31 +1553,31 @@ msgstr "Este servidor HTTP possui suporte a \"range\" quebrado" msgid "Unknown date format" msgstr "Formato de data desconhecido" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Seleção falhou" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Conexão expirou" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Erro escrevendo para arquivo de saída" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Erro escrevendo para arquivo" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Erro escrevendo para o arquivo" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Erro lendo do servidor. Ponto remoto fechou a conexão" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Erro lendo do servidor" @@ -2824,7 +2824,7 @@ msgstr "" "O pacote %s precisa ser reinstalado, mas não foi possível encontrar um " "arquivo para o mesmo." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2832,11 +2832,11 @@ msgstr "" "Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por " "pacotes mantidos (hold)." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "Impossível corrigir problemas, você manteve (hold) pacotes quebrados." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2882,7 +2882,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:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" diff --git a/po/ro.po b/po/ro.po index 1b6c6c06c..1d5213ece 100644 --- a/po/ro.po +++ b/po/ro.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ro\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+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" @@ -636,7 +636,7 @@ msgstr "Renunțare." msgid "Do you want to continue [Y/n]? " msgstr "Vreți să continuați [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Eșec la aducerea lui %s %s\n" @@ -1557,32 +1557,32 @@ msgstr "Acest server HTTP are un suport defect de intervale" msgid "Unknown date format" msgstr "Format dată necunoscut" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Selecția a eșuat" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Timp de conectare expirat" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Eroare la scrierea fișierului de rezultat" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Eroare la scrierea în fișier" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Eroare la scrierea în fișierul" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "" "Eroare la citirea de la server. Conexiunea a fost închisă de la distanță" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Eroare la citirea de la server" @@ -2828,7 +2828,7 @@ msgid "" msgstr "" "Pachetul %s are nevoie să fie reinstalat, dar nu pot găsi o arhivă pentru el." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2836,11 +2836,11 @@ msgstr "" "Eroare, pkgProblemResolver::Resolve a generat întreruperi, aceasta poate fi " "cauzată de pachete ținute." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "Nu pot corecta problema, ați ținut pachete deteriorate." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2886,7 +2886,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:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" diff --git a/po/ru.po b/po/ru.po index 7ebebbd7f..1a556c6d0 100644 --- a/po/ru.po +++ b/po/ru.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: apt rev2227.1.3\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+0200\n" "PO-Revision-Date: 2012-06-30 08:47+0400\n" "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" @@ -647,7 +647,7 @@ msgstr "Аварийное завершение." msgid "Do you want to continue [Y/n]? " msgstr "Хотите продолжить [Д/н]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Не удалось получить %s %s\n" @@ -1603,31 +1603,31 @@ msgstr "Этот HTTP-сервер не поддерживает скачива msgid "Unknown date format" msgstr "Неизвестный формат данных" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Ошибка в select" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Время ожидания для соединения истекло" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Ошибка записи в выходной файл" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Ошибка записи в файл" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Ошибка записи в файл" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Ошибка чтения, удалённый сервер прервал соединение" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Ошибка чтения с сервера" @@ -2887,7 +2887,7 @@ msgid "" msgstr "" "Пакет %s нуждается в переустановке, но найти архив для него не удалось." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2895,11 +2895,11 @@ msgstr "" "Ошибка, pkgProblemResolver::Resolve сгенерировал повреждённые пакеты. Это " "может быть вызвано отложенными (held) пакетами." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "Невозможно исправить ошибки, у вас отложены (held) битые пакеты." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2944,7 +2944,7 @@ msgstr "Драйвер для метода %s не найден." msgid "Method %s did not start correctly" msgstr "Метод %s запустился не корректно" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Вставьте диск с меткой «%s» в устройство «%s» и нажмите ввод." diff --git a/po/sk.po b/po/sk.po index 90392e27c..72c82e655 100644 --- a/po/sk.po +++ b/po/sk.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+0200\n" "PO-Revision-Date: 2012-06-28 20:49+0100\n" "Last-Translator: Ivan Masár <helix84@centrum.sk>\n" "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n" @@ -633,7 +633,7 @@ msgstr "Prerušené." msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovať [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Zlyhalo stiahnutie %s %s\n" @@ -1576,31 +1576,31 @@ msgstr "Tento HTTP server má poškodenú podporu rozsahov" msgid "Unknown date format" msgstr "Neznámy formát dátumu" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Výber zlyhal" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Uplynul čas spojenia" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Chyba zápisu do výstupného súboru" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Chyba zápisu do súboru" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Chyba zápisu do tohto súboru" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba pri čítaní zo servera. Druhá strana ukončila spojenie" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Chyba pri čítaní zo servera" @@ -2834,7 +2834,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Je nutné preinštalovať balík %s, ale nedá sa nájsť jeho archív." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2842,11 +2842,11 @@ msgstr "" "Chyba, pkgProblemResolver::Resolve vytvára poruchy, čo môže být spôsobené " "pridržanými balíkmi." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "Problémy sa nedajú opraviť, niektoré balíky držíte v poškodenom stave." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2891,7 +2891,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:440 +#: apt-pkg/acquire-worker.cc:447 #, 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." diff --git a/po/sl.po b/po/sl.po index 2d92369d7..c8c407044 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+0200\n" "PO-Revision-Date: 2012-06-27 21:29+0000\n" "Last-Translator: Andrej Znidarsic <andrej.znidarsic@gmail.com>\n" "Language-Team: Slovenian <sl@li.org>\n" @@ -630,7 +630,7 @@ msgstr "Prekini." msgid "Do you want to continue [Y/n]? " msgstr "Ali želite nadaljevati [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ni mogoče dobiti %s %s\n" @@ -1574,31 +1574,31 @@ msgstr "Ta strežnik HTTP ima pokvarjen obseg podpore" msgid "Unknown date format" msgstr "Neznana oblika datuma" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Izbira ni uspela" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Povezava je zakasnela" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Napaka med pisanjem v izhodno datoteko" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Napaka med pisanjem v datoteko" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Napaka med pisanjem v datoteko" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Napaka med branjem s strežnika. Oddaljeni del je zaprl povezavo" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Napaka med branjem s strežnika" @@ -2839,7 +2839,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Paket %s mora biti znova nameščen, vendar ni mogoče najti arhiva zanj." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2847,11 +2847,11 @@ msgstr "" "Napaka. pkgProblemResolver::Resolve pri razrešitvi, ki so jih morda " "povzročili zadržani paketi." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "Ni mogoče popraviti težav. Imate pokvarjene pakete." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2896,7 +2896,7 @@ msgstr "Gonilnika načinov %s ni mogoče najti." msgid "Method %s did not start correctly" msgstr "Način %s se ni začel pravilno" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Vstavite disk z oznako '%s' v pogon '%s' in pritisnite vnosno tipko." diff --git a/po/sv.po b/po/sv.po index 5f22dc4f6..225a23ac3 100644 --- a/po/sv.po +++ b/po/sv.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+0200\n" "PO-Revision-Date: 2010-08-24 21:18+0100\n" "Last-Translator: Daniel Nylander <po@danielnylander.se>\n" "Language-Team: Swedish <debian-l10n-swedish@debian.org>\n" @@ -637,7 +637,7 @@ msgstr "Avbryter." msgid "Do you want to continue [Y/n]? " msgstr "Vill du fortsätta [J/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Misslyckades med att hämta %s %s\n" @@ -1566,31 +1566,31 @@ msgstr "Den här http-serverns stöd för delvis hämtning fungerar inte" msgid "Unknown date format" msgstr "Okänt datumformat" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "\"Select\" misslyckades" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Anslutningen överskred tidsgränsen" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Fel vid skrivning till utdatafil" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Fel vid skrivning till fil" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Fel vid skrivning till filen" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Fel vid läsning från server: Andra änden stängde förbindelsen" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Fel vid läsning från server" @@ -2838,7 +2838,7 @@ msgid "" msgstr "" "Paketet %s måste installeras om, men jag kan inte hitta något arkiv för det." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2846,11 +2846,11 @@ msgstr "" "Fel, pkgProblemResolver::Resolve genererade avbrott; detta kan bero på " "tillbakahållna paket." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "Kunde inte korrigera problemen, du har hållit tillbaka trasiga paket." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2896,7 +2896,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:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" diff --git a/po/th.po b/po/th.po index e093cd702..81afe575f 100644 --- a/po/th.po +++ b/po/th.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+0200\n" "PO-Revision-Date: 2012-10-27 22:44+0700\n" "Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n" "Language-Team: Thai <thai-l10n@googlegroups.com>\n" @@ -623,7 +623,7 @@ msgstr "เลิกทำ" msgid "Do you want to continue [Y/n]? " msgstr "คุณต้องการจะดำเนินการต่อไปหรือไม่ [Y/n]?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "ไม่สามารถดาวน์โหลด %s %s\n" @@ -1529,31 +1529,31 @@ msgstr "การสนับสนุน Content-Range ที่เซิร์ msgid "Unknown date format" msgstr "พบรูปแบบวันที่ที่ไม่รู้จัก" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "select ไม่สำเร็จ" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "หมดเวลารอเชื่อมต่อ" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้มผลลัพธ์" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์ ปลายทางอีกด้านหนึ่งปิดการเชื่อมต่อ" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์" @@ -2772,7 +2772,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "จำเป็นต้องติดตั้งแพกเกจ %s ซ้ำ แต่หาตัวแพกเกจไม่พบ" -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2780,11 +2780,11 @@ msgstr "" "ข้อผิดพลาด: pkgProblemResolver::Resolve สร้างคำตอบที่ทำให้เกิดแพกเกจเสีย " "อาจเกิดจากแพกเกจที่ถูกกำหนดให้คงรุ่นไว้" -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "ไม่สามารถแก้ปัญหาได้ คุณได้คงรุ่นแพกเกจที่เสียอยู่ไว้" -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2827,7 +2827,7 @@ msgstr "ไม่พบไดรเวอร์สำหรับวิธีก msgid "Method %s did not start correctly" msgstr "ไม่สามารถเรียกทำงานวิธีการ %s" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "กรุณาใส่แผ่นชื่อ: '%s' ลงในไดรว์ '%s' แล้วกด enter" diff --git a/po/tl.po b/po/tl.po index 964710f42..c10ffd6f7 100644 --- a/po/tl.po +++ b/po/tl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+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" @@ -647,7 +647,7 @@ msgstr "Abort." msgid "Do you want to continue [Y/n]? " msgstr "Nais niyo bang magpatuloy [O/h]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Bigo sa pagkuha ng %s %s\n" @@ -1544,31 +1544,31 @@ msgstr "Sira ang range support ng HTTP server na ito" msgid "Unknown date format" msgstr "Di kilalang anyo ng petsa" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Bigo ang pagpili" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Nag-timeout ang koneksyon" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Error sa pagsulat ng talaksang output" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Error sa pagsulat sa talaksan" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Error sa pagsusulat sa talaksan" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Error sa pagbasa mula sa server" @@ -2814,7 +2814,7 @@ msgstr "" "Kailangan ma-instol muli ang paketeng %s, ngunit hindi ko mahanap ang arkibo " "para dito." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2822,12 +2822,12 @@ msgstr "" "Error, pkgProblemResolver::Resolve ay naghudyat ng mga break, maaaring dulot " "ito ng mga paketeng naka-hold." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Hindi maayos ang mga problema, mayroon kayong sirang mga pakete na naka-hold." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2873,7 +2873,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:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" diff --git a/po/uk.po b/po/uk.po index 046caead1..c5ab2b82e 100644 --- a/po/uk.po +++ b/po/uk.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-all\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+0200\n" "PO-Revision-Date: 2012-09-25 20:19+0300\n" "Last-Translator: A. Bondarenko <artem.brz@gmail.com>\n" "Language-Team: Українська <uk@li.org>\n" @@ -644,7 +644,7 @@ msgstr "Перервано." msgid "Do you want to continue [Y/n]? " msgstr "Бажаєте продовжити [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Не вдалося завантажити %s %s\n" @@ -1597,31 +1597,31 @@ msgstr "Цей HTTP сервер має поламану підтримку 'ran msgid "Unknown date format" msgstr "Невідомий формат дати" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Вибір провалився" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Час очікування з'єднання вийшов" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Помилка запису у вихідний файл" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Помилка запису у файл" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Помилка запису у файл" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Помилка зчитування з сервера. Віддалена сторона закрила з'єднання" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Помилка зчитування з сервера" @@ -2885,7 +2885,7 @@ msgid "" msgstr "" "Пакунок %s повинен бути перевстановленим, але я не можу знайти його архів." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2893,11 +2893,11 @@ msgstr "" "Помилка, pkgProblemResolver::Resolve згенерував зупинку, це може бути " "пов'язано з зафіксованими пакунками." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "Неможливо усунути проблеми, ви маєте поламані зафіксовані пакунки." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2942,7 +2942,7 @@ msgstr "Драйвер для метода %s не знайдено." msgid "Method %s did not start correctly" msgstr "Метод %s стартував некоректно" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" diff --git a/po/vi.po b/po/vi.po index 4ba5c19d9..68ea473b7 100644 --- a/po/vi.po +++ b/po/vi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+0200\n" "PO-Revision-Date: 2012-11-20 14:12+0700\n" "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" @@ -640,7 +640,7 @@ msgstr "Hủy bỏ." msgid "Do you want to continue [Y/n]? " msgstr "Bạn có muốn tiếp tục không? [C/k] " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Việc lấy %s bị lỗi %s\n" @@ -1577,31 +1577,31 @@ msgstr "Máy phục vụ HTTP đã ngắt cách hỗ trợ phạm vị" msgid "Unknown date format" msgstr "Không rõ dạng ngày" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Việc chọn bị lỗi" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Kết nối đã quá giờ" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Gặp lỗi khi ghi vào tập tin xuất" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Gặp lỗi khi ghi vào tập tin" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Gặp lỗi khi ghi vào tập tin đó" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Gặp lỗi khi đọc từ máy phục vụ: cuối ở xa đã đóng kết nối" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Gặp lỗi khi đọc từ máy phục vụ" @@ -2871,7 +2871,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Cần phải cài đặt lại gói %s, nhưng mà không thể tìm kho cho nó." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2879,11 +2879,11 @@ msgstr "" "Lỗi: “pkgProblemResolver::Resolve” (bộ tháo gỡ vấn đề gọi::tháo gỡ) đã tạo " "ra nhiều chỗ ngắt, có lẽ một số gói đã giữ lại đã gây ra trường hợp này." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "Không thể sửa vấn đề, bạn đã giữ lại một số gói bị ngắt." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2928,7 +2928,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:440 +#: apt-pkg/acquire-worker.cc:447 #, 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." diff --git a/po/zh_CN.po b/po/zh_CN.po index 8f25691e9..ea683e288 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.0~pre1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+0200\n" "PO-Revision-Date: 2010-08-26 14:42+0800\n" "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n" "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" @@ -629,7 +629,7 @@ msgstr "中止执行。" msgid "Do you want to continue [Y/n]? " msgstr "您希望继续执行吗？[Y/n]" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "无法下载 %s %s\n" @@ -1515,31 +1515,31 @@ msgstr "该 HTTP 服务器的 range 支持不正常" msgid "Unknown date format" msgstr "无法识别的日期格式" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "select 调用出错" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "连接超时" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "写输出文件时出错" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "写入文件出错" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "写入文件出错" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "从服务器读取数据时出错，对方关闭了连接" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "从服务器读取数据出错" @@ -2761,7 +2761,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "软件包 %s 需要重新安装，但是我无法找到相应的安装文件。" -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2769,13 +2769,13 @@ msgstr "" "错误，pkgProblemResolver::Resolve 发生故障，这可能是有软件包被要求保持现状的" "缘故。" -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "" "无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关" "系。" -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2820,7 +2820,7 @@ msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。" msgid "Method %s did not start correctly" msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。" diff --git a/po/zh_TW.po b/po/zh_TW.po index 0cb4f8b8c..cf7815be3 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.5.4\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+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." @@ -630,7 +630,7 @@ msgstr "放棄執行。" msgid "Do you want to continue [Y/n]? " msgstr "是否繼續進行 [Y/n]？" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "無法取得 %s，%s\n" @@ -1511,31 +1511,31 @@ msgstr "這個 HTTP 伺服器的範圍支援有問題" msgid "Unknown date format" msgstr "未知的資料格式" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "選擇失敗" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "連線逾時" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "在寫入輸出檔時發生錯誤" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "在寫入檔案時發生錯誤" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "在寫入該檔時發生錯誤" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "在讀取伺服器時發生錯誤，遠端主機已關閉連線" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "在讀取伺服器時發生錯誤" @@ -2756,7 +2756,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "套件 %s 需要重新安裝，但找不到它的套件檔。" -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2764,11 +2764,11 @@ msgstr "" "錯誤，pkgProblemResolver::Resolve 的建立中斷了，這可能肇因於保留 (hold) 套" "件。" -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "無法修正問題，您保留 (hold) 了損毀的套件。" -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2812,7 +2812,7 @@ msgstr "找不到安裝方式的驅動程式 %s。" msgid "Method %s did not start correctly" msgstr "安裝方式 %s 沒有正確啟動" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "請把標籤為 '%s' 的光碟放入 '%s' 裝置中，然後按下 [Enter] 鍵。" -- cgit v1.2.3 From c2994dd971919a4337ea00a7aed522ccc82877c1 Mon Sep 17 00:00:00 2001 From: Michael Vogt <egon@debian-devbox> Date: Wed, 8 May 2013 18:58:10 +0200 Subject: fix uri test --- test/libapt/uri_test.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/libapt/uri_test.cc b/test/libapt/uri_test.cc index 16fde503f..8216ade71 100644 --- a/test/libapt/uri_test.cc +++ b/test/libapt/uri_test.cc @@ -113,7 +113,7 @@ int main() { URI U("ftp://foo:b%40r@example.org"); equals("foo", U.User); equals("b@r", U.Password); - equals("ftp://foo:b%40r@example.org", (std::string) U); + equals("ftp://foo:b%40r@example.org/", (std::string) U); } return 0; -- cgit v1.2.3 From 3bd93b6f774db001674da74bc6e316927da20262 Mon Sep 17 00:00:00 2001 From: Michael Vogt <egon@debian-devbox> Date: Wed, 8 May 2013 18:58:29 +0200 Subject: releasing version 0.9.8 --- configure.in | 2 +- debian/changelog | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 91a157c33..fe2392934 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) PACKAGE="apt" -PACKAGE_VERSION="0.9.7.9~exp3" +PACKAGE_VERSION="0.9.8" PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION") diff --git a/debian/changelog b/debian/changelog index d5ae8448b..6eb44a47c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.9.8) UNRELEASED; urgency=low +apt (0.9.8) unstable; urgency=low [ Ludovico Cavedon ] * properly handle if-modfied-since with libcurl/https @@ -67,7 +67,7 @@ apt (0.9.8) UNRELEASED; urgency=low directive ("DIRECT") in apt.conf - disregard all_proxy environment variable, like other methods - -- Michael Vogt <mvo@debian.org> Mon, 08 Apr 2013 08:43:21 +0200 + -- Michael Vogt <mvo@debian.org> Wed, 08 May 2013 18:43:28 +0200 apt (0.9.7.9~exp2) experimental; urgency=low -- cgit v1.2.3 From e7baf3065de20cc6d0ca661443b575f35144b225 Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@ubuntu.com> Date: Thu, 16 May 2013 11:34:38 +0200 Subject: add .gitignore and gbp.conf --- .gitignore | 18 ++++++++++++++++++ debian/gbp.conf | 3 +++ 2 files changed, 21 insertions(+) create mode 100644 .gitignore create mode 100644 debian/gbp.conf diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..d40fb818a --- /dev/null +++ b/.gitignore @@ -0,0 +1,18 @@ +aclocal.m4 +autom4te.cache/ +build/ +buildlib/config.guess +buildlib/config.sub +configure +debian/copyright +doc/de/ +doc/es/ +doc/fr/ +doc/it/ +doc/ja/ +doc/pl/ +doc/pt/ +doc/pt_BR/ +doc/examples/sources.list +marks.bzr +marks.git diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 000000000..1df123ac5 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,3 @@ +[DEFAULT] +prebuild = ./prepare-release pre-export +postbuild = ./prepare-release post-build -- cgit v1.2.3 From 97844726f013c8c1b5d71bdf15c0ad0e02512ee9 Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@ubuntu.com> Date: Thu, 16 May 2013 11:35:32 +0200 Subject: rebuild po --- configure.in | 2 +- doc/apt-verbatim.ent | 2 +- doc/po/apt-doc.pot | 4 +- doc/po/fr.po | 287 +++++++++++++++++---------------------------------- po/apt-all.pot | 28 ++--- po/ar.po | 26 ++--- po/ast.po | 26 ++--- po/bg.po | 26 ++--- po/bs.po | 26 ++--- po/ca.po | 26 ++--- po/cs.po | 26 ++--- po/cy.po | 26 ++--- po/da.po | 26 ++--- po/de.po | 26 ++--- po/dz.po | 26 ++--- po/el.po | 26 ++--- po/es.po | 26 ++--- po/eu.po | 26 ++--- po/fi.po | 26 ++--- po/fr.po | 26 ++--- po/gl.po | 26 ++--- po/hu.po | 26 ++--- po/it.po | 26 ++--- po/ja.po | 26 ++--- po/km.po | 26 ++--- po/ko.po | 26 ++--- po/ku.po | 26 ++--- po/lt.po | 26 ++--- po/mr.po | 26 ++--- po/nb.po | 26 ++--- po/ne.po | 26 ++--- po/nl.po | 26 ++--- po/nn.po | 26 ++--- po/pl.po | 26 ++--- po/pt.po | 26 ++--- po/pt_BR.po | 26 ++--- po/ro.po | 26 ++--- po/ru.po | 26 ++--- po/sk.po | 26 ++--- po/sl.po | 26 ++--- po/sv.po | 26 ++--- po/th.po | 26 ++--- po/tl.po | 26 ++--- po/uk.po | 26 ++--- po/vi.po | 26 ++--- po/zh_CN.po | 26 ++--- po/zh_TW.po | 26 ++--- 47 files changed, 658 insertions(+), 757 deletions(-) diff --git a/configure.in b/configure.in index 91a157c33..fb58174d5 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) PACKAGE="apt" -PACKAGE_VERSION="0.9.7.9~exp3" +PACKAGE_VERSION="0.9.8~20130516" PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION") diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 2d6e96091..3b9426f25 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -213,7 +213,7 @@ "> <!-- this will be updated by 'prepare-release' --> -<!ENTITY apt-product-version "0.9.7.9~exp3"> +<!ENTITY apt-product-version "0.9.8~20130516"> <!-- Codenames for debian releases --> <!ENTITY oldstable-codename "squeeze"> diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 9ecd1ac03..f7734dbe8 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt-doc 0.9.7.9~exp2\n" +"Project-Id-Version: apt-doc 0.9.7.9~exp3\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0300\n" +"POT-Creation-Date: 2013-05-16 11:28+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/doc/po/fr.po b/doc/po/fr.po index 8663c0758..d2128c342 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-02 15:13+0300\n" +"POT-Creation-Date: 2013-05-16 11:28+0300\n" "PO-Revision-Date: 2013-04-09 07:56+0200\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -51,8 +51,7 @@ msgid "" msgstr "" "<!ENTITY apt-qapage \"\n" "\t<para>\n" -"\t\t<ulink url='http://packages.qa.debian.org/a/apt.html'>Page qualité</ulink>" -"\n" +"\t\t<ulink url='http://packages.qa.debian.org/a/apt.html'>Page qualité</ulink>\n" "\t</para>\n" "\">\n" @@ -74,8 +73,7 @@ msgstr "" "<!-- Boiler plate Bug reporting section -->\n" "<!ENTITY manbugs \"\n" " <refsect1><title>Bogues\n" -" Page des bogues d'APT<" -"/ulink>. \n" +" Page des bogues d'APT. \n" " Si vous souhaitez signaler un bogue à propos d'APT, veuillez lire\n" " /usr/share/doc/debian/bug-reporting.txt ou utiliser\n" " la commande &reportbug;.\n" @@ -90,8 +88,7 @@ msgid "" "\n" "Author\n" -" APT was written by the APT team apt@packages.debian.org<" -"/email>.\n" +" APT was written by the APT team apt@packages.debian.org.\n" " \n" " \n" "\">\n" @@ -99,8 +96,7 @@ msgstr "" "\n" "Author\n" -" APT a été écrit par l'équipe de développement APT " -"apt@packages.debian.org.\n" +" APT a été écrit par l'équipe de développement APT apt@packages.debian.org.\n" " \n" " \n" "\">\n" @@ -156,12 +152,10 @@ msgid "" " \n" " \n" " \n" -" Configuration File; Specify a configuration file to use. " -"\n" +" Configuration File; Specify a configuration file to use. \n" " The program will read the default configuration file and then this \n" " configuration file. If configuration settings need to be set before the\n" -" default configuration files are parsed specify a file with the " -"APT_CONFIG\n" +" default configuration files are parsed specify a file with the APT_CONFIG\n" " environment variable. See &apt-conf; for syntax information.\n" " \n" " \n" @@ -170,15 +164,10 @@ msgstr "" " \n" " \n" " \n" -" Fichier de configuration ; indique le fichier de " -"configuration à utiliser. \n" -" Le programme lira le fichier de configuration par défaut puis le fichier " -"indiqué ici. \n" -" Si les réglages de configuration doivent être établis avant l'analyse " -"des fichiers\n" -" de configuration par défaut, un fichier peut être indiqué avec la " -"variable d'environnement APT_CONFIG. Veuillez consulter " -"&apt-conf; pour des informations sur la syntaxe d'utilisation. \n" +" Fichier de configuration ; indique le fichier de configuration à utiliser. \n" +" Le programme lira le fichier de configuration par défaut puis le fichier indiqué ici. \n" +" Si les réglages de configuration doivent être établis avant l'analyse des fichiers\n" +" de configuration par défaut, un fichier peut être indiqué avec la variable d'environnement APT_CONFIG. Veuillez consulter &apt-conf; pour des informations sur la syntaxe d'utilisation. \n" " \n" " \n" " \n" @@ -203,10 +192,8 @@ msgstr "" " \n" " \n" " Définir une option de configuration ; permet de régler\n" -" une option de configuration donnée. La syntaxe est .\n" -" et peuvent être utilisées " -"plusieurs fois\n" +" une option de configuration donnée. La syntaxe est .\n" +" et peuvent être utilisées plusieurs fois\n" " pour définir des options différentes.\n" " \n" " \n" @@ -220,8 +207,7 @@ msgid "" "\n" "All command line options may be set using the configuration file, " -"the\n" +" All command line options may be set using the configuration file, the\n" " descriptions indicate the configuration option to set. For boolean\n" " options you can override the config file by using something like \n" " ,, \n" @@ -232,12 +218,9 @@ msgstr "" "\n" "Toutes les options de la ligne de commande peuvent être définies " -"dans le fichier de configuration, \n" -" les descriptions indiquant l'option de configuration concernée. Pour les " -"options\n" -" booléennes, vous pouvez inverser les réglages du fichiers de configuration " -"avec \n" +" Toutes les options de la ligne de commande peuvent être définies dans le fichier de configuration, \n" +" les descriptions indiquant l'option de configuration concernée. Pour les options\n" +" booléennes, vous pouvez inverser les réglages du fichiers de configuration avec \n" " ,, \n" " et d'autres variantes analogues.\n" " \n" @@ -250,15 +233,13 @@ msgid "" "/etc/apt/apt.conf\n" " APT configuration file.\n" -" Configuration Item: Dir::Etc::Main." -"\n" +" Configuration Item: Dir::Etc::Main.\n" " \n" msgstr "" "/etc/apt/apt.conf\n" " Fichier de configuration d'APT.\n" -" Élément de configuration : Dir::Etc::Main.<" -"/listitem>\n" +" Élément de configuration : Dir::Etc::Main.\n" " \n" #. type: Plain text @@ -267,15 +248,13 @@ msgstr "" msgid "" " /etc/apt/apt.conf.d/\n" " APT configuration file fragments.\n" -" Configuration Item: Dir::Etc::Parts." -"\n" +" Configuration Item: Dir::Etc::Parts.\n" " \n" "\">\n" msgstr "" " /etc/apt/apt.conf.d/\n" " Fragments du fichier de configuration d'APT.\n" -" Élément de configuration : Dir::Etc::Parts.<" -"/listitem>\n" +" Élément de configuration : Dir::Etc::Parts.\n" " \n" "\">\n" @@ -286,34 +265,28 @@ msgid "" "&cachedir;/archives/\n" " Storage area for retrieved package files.\n" -" Configuration Item: Dir::Cache::Archives.<" -"/listitem>\n" +" Configuration Item: Dir::Cache::Archives.\n" " \n" msgstr "" "&cachedir;/archives/\n" " Zone de stockage des fichiers récupérés.\n" -" Élément de configuration : Dir::Cache::Archives.<" -"/para>\n" +" Élément de configuration : Dir::Cache::Archives.\n" " \n" #. type: Plain text #: apt.ent:109 #, no-wrap msgid "" -" &cachedir;/archives/partial/<" -"/term>\n" +" &cachedir;/archives/partial/\n" " Storage area for package files in transit.\n" -" Configuration Item: Dir::Cache::Archives (" -"partial will be implicitly appended)\n" +" Configuration Item: Dir::Cache::Archives (partial will be implicitly appended)\n" " \n" "\">\n" msgstr "" -" &cachedir;/archives/partial/<" -"/term>\n" +" &cachedir;/archives/partial/\n" " Zone de stockage pour les paquets en transit.\n" -" Élément de configuration : Dir::Cache::Archives (<" -"filename>partial sera implicitement ajouté). \n" +" Élément de configuration : Dir::Cache::Archives (partial sera implicitement ajouté). \n" " \n" "\">\n" @@ -328,18 +301,14 @@ msgid "" " i.e. a preference to get certain packages\n" " from a separate source\n" " or from a different version of a distribution.\n" -" Configuration Item: Dir::Etc::Preferences.<" -"/listitem>\n" +" Configuration Item: Dir::Etc::Preferences.\n" " \n" msgstr "" "/etc/apt/preferences\n" " Fichier des préférences.\n" -" C'est dans ce fichier qu'on peut faire de l'épinglage (pinning) " -"c'est-à-dire, choisir d'obtenir des paquets d'une source distincte ou d'une " -"distribution différente.\n" -" Élément de configuration : Dir::Etc::Preferences.<" -"/para>\n" +" C'est dans ce fichier qu'on peut faire de l'épinglage (pinning) c'est-à-dire, choisir d'obtenir des paquets d'une source distincte ou d'une distribution différente.\n" +" Élément de configuration : Dir::Etc::Preferences.\n" " \n" #. type: Plain text @@ -348,15 +317,13 @@ msgstr "" msgid "" " /etc/apt/preferences.d/\n" " File fragments for the version preferences.\n" -" Configuration Item: Dir::Etc::PreferencesParts." -"\n" +" Configuration Item: Dir::Etc::PreferencesParts.\n" " \n" "\">\n" msgstr "" " /etc/apt/preferences.d/\n" " Fragments de fichiers pour la préférence des versions.\n" -" Élément de configuration : Dir::Etc::PreferencesParts" -".\n" +" Élément de configuration : Dir::Etc::PreferencesParts.\n" " \n" "\">\n" @@ -367,35 +334,28 @@ msgid "" "/etc/apt/sources.list\n" " Locations to fetch packages from.\n" -" Configuration Item: Dir::Etc::SourceList.<" -"/listitem>\n" +" Configuration Item: Dir::Etc::SourceList.\n" " \n" msgstr "" "/etc/apt/sources.list\n" " Emplacement pour la récupération des paquets.\n" -" Élément de configuration : Dir::Etc::SourceList.<" -"/para>\n" +" Élément de configuration : Dir::Etc::SourceList.\n" " \n" #. type: Plain text #: apt.ent:137 #, no-wrap msgid "" -" /etc/apt/sources.list.d/" -"\n" +" /etc/apt/sources.list.d/\n" " File fragments for locations to fetch packages from.\n" -" Configuration Item: Dir::Etc::SourceParts.<" -"/listitem>\n" +" Configuration Item: Dir::Etc::SourceParts.\n" " \n" "\">\n" msgstr "" -" /etc/apt/sources.list.d/" -"\n" -" Fragments de fichiers définissant les emplacements de " -"récupération de paquets.\n" -" Élément de configuration : Dir::Etc::SourceParts.<" -"/para>\n" +" /etc/apt/sources.list.d/\n" +" Fragments de fichiers définissant les emplacements de récupération de paquets.\n" +" Élément de configuration : Dir::Etc::SourceParts.\n" " \n" "\">\n" @@ -405,38 +365,30 @@ msgstr "" msgid "" "&statedir;/lists/\n" -" Storage area for state information for each package " -"resource specified in\n" +" Storage area for state information for each package resource specified in\n" " &sources-list;\n" -" Configuration Item: Dir::State::Lists.<" -"/listitem>\n" +" Configuration Item: Dir::State::Lists.\n" " \n" msgstr "" "&statedir;/lists/\n" -" Zone de stockage pour les informations qui concernent " -"chaque ressource de paquet spécifiée dans &sources-list;\n" -" Élément de configuration : Dir::State::Lists.<" -"/listitem>\n" +" Zone de stockage pour les informations qui concernent chaque ressource de paquet spécifiée dans &sources-list;\n" +" Élément de configuration : Dir::State::Lists.\n" " \n" #. type: Plain text #: apt.ent:150 #, no-wrap msgid "" -" &statedir;/lists/partial/" -"\n" +" &statedir;/lists/partial/\n" " Storage area for state information in transit.\n" -" Configuration Item: Dir::State::Lists (" -"partial will be implicitly appended)\n" +" Configuration Item: Dir::State::Lists (partial will be implicitly appended)\n" " \n" "\">\n" msgstr "" -" &statedir;/lists/partial/" -"\n" +" &statedir;/lists/partial/\n" " Zone de stockage pour les informations en transit.\n" -" Élément de configuration : Dir::State::Lists (<" -"filename>partial sera implicitement ajouté).\n" +" Élément de configuration : Dir::State::Lists (partial sera implicitement ajouté).\n" " \n" "\">\n" @@ -446,18 +398,14 @@ msgstr "" msgid "" "/etc/apt/trusted.gpg\n" -" Keyring of local trusted keys, new keys will be added " -"here.\n" -" Configuration Item: Dir::Etc::Trusted.<" -"/listitem>\n" +" Keyring of local trusted keys, new keys will be added here.\n" +" Configuration Item: Dir::Etc::Trusted.\n" " \n" msgstr "" "/etc/apt/trusted.gpg\n" -" Porte-clés des clés de confiance locales. Les nouvelles " -"clés y seront ajoutées.\n" -" Élément de configuration: Dir::Etc::Trusted.<" -"/listitem>\n" +" Porte-clés des clés de confiance locales. Les nouvelles clés y seront ajoutées.\n" +" Élément de configuration: Dir::Etc::Trusted.\n" " \n" #. type: Plain text @@ -465,21 +413,16 @@ msgstr "" #, no-wrap msgid "" " /etc/apt/trusted.gpg.d/\n" -" File fragments for the trusted keys, additional keyrings " -"can\n" +" File fragments for the trusted keys, additional keyrings can\n" " be stored here (by other packages or the administrator).\n" -" Configuration Item Dir::Etc::TrustedParts.<" -"/listitem>\n" +" Configuration Item Dir::Etc::TrustedParts.\n" " \n" "\">\n" msgstr "" " /etc/apt/trusted.gpg.d/\n" -" Fragments de fichiers pour les clés de signatures sûres. " -"Des fichiers\n" -" supplémentaires peuvent être placés à cet endroit (par des paquets ou " -"par l'administrateur).\n" -" Élément de configuration : Dir::Etc::TrustedParts.<" -"/para>\n" +" Fragments de fichiers pour les clés de signatures sûres. Des fichiers\n" +" supplémentaires peuvent être placés à cet endroit (par des paquets ou par l'administrateur).\n" +" Élément de configuration : Dir::Etc::TrustedParts.\n" " \n" "\">\n" @@ -488,8 +431,7 @@ msgstr "" #, no-wrap msgid "" "/var/lib/apt/extended_states<" -"/term>\n" +" /var/lib/apt/extended_states\n" " Status list of auto-installed packages.\n" " Configuration Item: Dir::State::extended_states.\n" " \n" @@ -497,11 +439,9 @@ msgid "" "\">\n" msgstr "" "/var/lib/apt/extended_states<" -"/term>\n" +" /var/lib/apt/extended_states\n" " Liste d'état des paquets installés automatiquement.\n" -" Élément de configuration : Dir::State::extended_states" -".\n" +" Élément de configuration : Dir::State::extended_states.\n" " \n" "\">\n" @@ -509,10 +449,8 @@ msgstr "" #: apt.ent:175 #, no-wrap msgid "" -"\n" +"\n" "\n" msgstr "\n" @@ -520,39 +458,28 @@ msgstr "\n" #: apt.ent:184 #, no-wrap msgid "" -"\n" "john@doe.org " -"in 2009,\n" -" 2010 and Daniela Acme daniela@acme.us in 2010 together " -"with the\n" -" Debian Dummy l10n Team debian-l10n-dummy@lists.debian.org" -".\n" +" The english translation was done by John Doe john@doe.org in 2009,\n" +" 2010 and Daniela Acme daniela@acme.us in 2010 together with the\n" +" Debian Dummy l10n Team debian-l10n-dummy@lists.debian.org.\n" "\">\n" msgstr "" "" -"bubulle@debian.org (2000, 2005, 2009, 2010),\n" -" Équipe de traduction francophone de Debian " -"debian-l10n-french@lists.debian.org\n" +" Jérôme Marant, Philippe Batailler, Christian Perrier bubulle@debian.org (2000, 2005, 2009, 2010),\n" +" Équipe de traduction francophone de Debian debian-l10n-french@lists.debian.org\n" "\">\n" #. type: Plain text #: apt.ent:195 #, no-wrap msgid "" -"\n" "\n" msgstr "" "\n" @@ -4124,12 +4050,8 @@ msgstr "" #. type: Content of: #: apt.conf.5.xml:497 #, no-wrap -msgid "" -"Acquire::CompressionTypes::FileExtension \"<" -"replaceable>Methodname\";" -msgstr "" -"Acquire::CompressionTypes::ExtensionFichier \"<" -"replaceable>NomMethode\";" +msgid "Acquire::CompressionTypes::FileExtension \"Methodname\";" +msgstr "Acquire::CompressionTypes::ExtensionFichier \"NomMethode\";" #. type: Content of: #: apt.conf.5.xml:492 @@ -4278,10 +4200,8 @@ msgstr "" #. type: Content of: #: apt.conf.5.xml:549 #, no-wrap -msgid "" -"Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" -msgstr "" -"Acquire::Languages { \"environment\"; \"fr\"; \"en\"; \"none\"; \"de\"; };" +msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" +msgstr "Acquire::Languages { \"environment\"; \"fr\"; \"en\"; \"none\"; \"de\"; };" #. type: Content of: #: apt.conf.5.xml:537 @@ -4915,7 +4835,7 @@ msgstr "" #. TODO: provide a #. motivating example, except I haven't a clue why you'd want -#. to do this. +#. to do this. #. type: Content of: #: apt.conf.5.xml:836 msgid "" @@ -5198,7 +5118,7 @@ msgstr "" "Le fichier &configureindex; contient un modèle de fichier montrant des " "exemples pour toutes les options existantes." -#. ? reading apt.conf +#. ? reading apt.conf #. type: Content of: #: apt.conf.5.xml:1175 msgid "&apt-cache;, &apt-config;, &apt-preferences;." @@ -5311,12 +5231,8 @@ msgstr "Priorités affectées par défaut" #. type: Content of: #: apt_preferences.5.xml:94 #, no-wrap -msgid "" -"apt-get install -t testing some-package<" -"/command>\n" -msgstr "" -"apt-get install -t testing paquet<" -"/command>\n" +msgid "apt-get install -t testing some-package\n" +msgstr "apt-get install -t testing paquet\n" #. type: Content of: #: apt_preferences.5.xml:97 @@ -6463,10 +6379,8 @@ msgstr "Suivre l'évolution d'une version par son nom de code" #: apt_preferences.5.xml:654 #, no-wrap msgid "" -"Explanation: Uninstall or do not install any Debian-originated package " -"versions\n" -"Explanation: other than those in the distribution codenamed with " -"&testing-codename; or sid\n" +"Explanation: Uninstall or do not install any Debian-originated package versions\n" +"Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n" "Package: *\n" "Pin: release n=&testing-codename;\n" "Pin-Priority: 900\n" @@ -6814,13 +6728,11 @@ msgstr "Exemples :" #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" -"deb http://security.debian.org/ &stable-codename;/updates main contrib " -"non-free\n" +"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n" " " msgstr "" "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" -"deb http://security.debian.org/ &stable-codename;/updates main contrib " -"non-free\n" +"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n" " " #. type: Content of: @@ -8140,12 +8052,8 @@ msgstr "" #. type: Content of: <refentry><refsect1><para><programlisting> #: apt-ftparchive.1.xml:602 #, no-wrap -msgid "" -"<command>apt-ftparchive</command> packages <replaceable>directory<" -"/replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" -msgstr "" -"<command>apt-ftparchive</command> packages <replaceable>répertoire<" -"/replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" +msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" +msgstr "<command>apt-ftparchive</command> packages <replaceable>répertoire</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" #. type: Content of: <refentry><refsect1><para> #: apt-ftparchive.1.xml:598 @@ -8524,8 +8432,7 @@ msgid "" "Building Dependency Tree... Done" msgstr "" "# apt-get update\n" -"Réception de http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ " -"Packages\n" +"Réception de http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n" "Réception de http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n" "Lecture des listes de paquets... Fait\n" "Construction de l'arbre des dépendances... Fait" @@ -9245,11 +9152,9 @@ msgid "" "12 packages not fully installed or removed.\n" "Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used." msgstr "" -"206 paquets mis à jour, 8 nouvellement installés, 23 à enlever et 51 non mis " -"à jour.\n" +"206 paquets mis à jour, 8 nouvellement installés, 23 à enlever et 51 non mis à jour.\n" "12 paquets partiellement installés ou enlevés.\n" -"Il est nécessaire de prendre 65,7Mo/66,7Mo dans les archives. Après cette " -"opération, 26,5Mo d'espace disque supplémentaires seront utilisés." +"Il est nécessaire de prendre 65,7Mo/66,7Mo dans les archives. Après cette opération, 26,5Mo d'espace disque supplémentaires seront utilisés." #. type: <p></p> #: guide.sgml:470 @@ -9319,12 +9224,10 @@ msgid "" "11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s" msgstr "" "# apt-get update\n" -"Réception de :1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ " -"Packages\n" +"Réception de :1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n" "Réception de :2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n" "Atteint http://llug.sep.bnl.gov/debian/ testing/main Packages\n" -"Réception de :4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ " -"Packages\n" +"Réception de :4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n" "Réception de :5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n" "11% [5 testing/non-free `Attente du fichier' 0/32.1k 0%] 2203b/s 1m52s" @@ -9690,8 +9593,7 @@ msgstr "" " # apt-get update\n" " [ APT récupère les fichiers des paquets ]\n" " # apt-get dist-upgrade\n" -" [ APT récupère tous les fichiers nécessaires à la mise à jour de la machine " -"distante ]" +" [ APT récupère tous les fichiers nécessaires à la mise à jour de la machine distante ]" #. type: </example></p> #: offline.sgml:149 @@ -9812,8 +9714,7 @@ msgid "" " # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script" msgstr "" " # apt-get dist-upgrade \n" -" [ Répondre négativement à la question, pour être sûr(e) que les actions vous " -"conviennent ]\n" +" [ Répondre négativement à la question, pour être sûr(e) que les actions vous conviennent ]\n" " # apt-get -qq --print-uris dist-upgrade > uris\n" " # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script" diff --git a/po/apt-all.pot b/po/apt-all.pot index 763d8a034..bc001e3df 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt 0.9.7.9~exp2\n" +"Project-Id-Version: apt 0.9.7.9~exp3\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -569,7 +569,7 @@ msgstr "" msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -1393,31 +1393,31 @@ msgstr "" msgid "Unknown date format" msgstr "" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "" @@ -2561,17 +2561,17 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2614,7 +2614,7 @@ msgstr "" msgid "Method %s did not start correctly" msgstr "" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" diff --git a/po/ar.po b/po/ar.po index ffb394131..5af611f2a 100644 --- a/po/ar.po +++ b/po/ar.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+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" @@ -582,7 +582,7 @@ msgstr "إجهاض." msgid "Do you want to continue [Y/n]? " msgstr "هل تريد الاستمرار [Y/n]؟" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "فشل إحضار %s %s\n" @@ -1418,31 +1418,31 @@ msgstr "خادم http له دعم مدى معطوب" msgid "Unknown date format" msgstr "نسق تاريخ مجهول" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "فشل التحديد" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "انتهى وقت الاتصال" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "خطأ في الكتابة إلى ملف المُخرجات" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "خطأ في الكتابة إلى الملف" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "خطأ في الكتابة إلى الملف" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "خطأ في القراءة من الخادم. أقفل الطرف الآخر الاتصال" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "خطأ في القراءة من الخادم" @@ -2592,17 +2592,17 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2645,7 +2645,7 @@ msgstr "" msgid "Method %s did not start correctly" msgstr "" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "الرجاء إدخال القرص المُسمّى '%s' في السوّاقة '%s' وضغط مفتاح الإدخال." diff --git a/po/ast.po b/po/ast.po index b3c87bd06..951b91fd2 100644 --- a/po/ast.po +++ b/po/ast.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.18\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+0200\n" "PO-Revision-Date: 2010-10-02 23:35+0100\n" "Last-Translator: Iñigo Varela <ivarela@softastur.org>\n" "Language-Team: Asturian (ast)\n" @@ -628,7 +628,7 @@ msgstr "Encaboxar." msgid "Do you want to continue [Y/n]? " msgstr "¿Quies continuar [S/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falló algamar %s %s\n" @@ -1548,31 +1548,31 @@ msgstr "Esti sirvidor HTTP tien rotu'l soporte d'alcance" msgid "Unknown date format" msgstr "Formatu de data desconocíu" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Falló la escoyeta" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Gandió'l tiempu de conexón" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Fallu al escribir nel ficheru de salida" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Fallu al escribir nel ficheru" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Fallu al escribir nel ficheru" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Fallu al lleer nel sirvidor. El llau remotu zarró la conexón." -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Fallu al lleer nel sirvidor" @@ -2818,7 +2818,7 @@ msgid "" msgstr "" "El paquete %s necesita reinstalase, pero nun s'alcuentra un archivu pa el." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2826,11 +2826,11 @@ msgstr "" "Error, pkgProblemResolver::Resolve xeneró frañadures, esto puede ser pola " "mor de paquetes reteníos." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "Nun pueden iguase los problemes; tienes paquetes frañaos reteníos." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2876,7 +2876,7 @@ msgstr "Nun pudo alncontrase'l controlador de métodu %s." msgid "Method %s did not start correctly" msgstr "El métodu %s nun entamó correchamente" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Por favor, introduz el discu '%s' nel preséu '%s' y calca Intro." diff --git a/po/bg.po b/po/bg.po index 0768e88e7..a5a07ac47 100644 --- a/po/bg.po +++ b/po/bg.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.21\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+0200\n" "PO-Revision-Date: 2012-06-25 17:23+0300\n" "Last-Translator: Damyan Ivanov <dmn@debian.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" @@ -638,7 +638,7 @@ msgstr "Прекъсване." msgid "Do you want to continue [Y/n]? " msgstr "Искате ли да продължите [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Неуспех при изтеглянето на %s %s\n" @@ -1585,31 +1585,31 @@ msgstr "HTTP сървърът няма поддръжка за прехвърл msgid "Unknown date format" msgstr "Неизвестен формат на дата" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Неуспех на избора" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Допустимото време за свързване изтече" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Грешка при записа на изходен файл" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Грешка при записа на файл" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Грешка при записа на файла" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Грешка при четене от сървъра. Отдалеченият сървър прекъсна връзката" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Грешка при четене от сървъра" @@ -2865,7 +2865,7 @@ msgstr "" "Пакетът %s трябва да бъде преинсталиран, но не може да се намери архив за " "него." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2873,12 +2873,12 @@ msgstr "" "Грешка, pkgProblemResolver::Resolve генерира повреди, това може да е " "причинено от задържани пакети." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Неуспех при коригирането на проблемите, имате задържани счупени пакети." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2923,7 +2923,7 @@ msgstr "Неуспех при намирането на драйвер за ме msgid "Method %s did not start correctly" msgstr "Методът %s не стартира правилно" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Сложете диска, озаглавен „%s“ в устройство „%s“ и натиснете „Enter“." diff --git a/po/bs.po b/po/bs.po index 7dbe5c0be..6825d1bf3 100644 --- a/po/bs.po +++ b/po/bs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+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" @@ -587,7 +587,7 @@ msgstr "Odustani." msgid "Do you want to continue [Y/n]? " msgstr "Da li želite nastaviti? [Y/n]" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -1416,31 +1416,31 @@ msgstr "" msgid "Unknown date format" msgstr "Nepoznat oblik datuma" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "" @@ -2590,17 +2590,17 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2643,7 +2643,7 @@ msgstr "" msgid "Method %s did not start correctly" msgstr "" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" diff --git a/po/ca.po b/po/ca.po index 2bfee4717..ab9e30631 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.6\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+0200\n" "PO-Revision-Date: 2012-10-19 13:30+0200\n" "Last-Translator: Jordi Mallach <jordi@debian.org>\n" "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n" @@ -639,7 +639,7 @@ msgstr "Avortat." msgid "Do you want to continue [Y/n]? " msgstr "Voleu continuar [S/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "No s'ha pogut obtenir %s %s\n" @@ -1573,32 +1573,32 @@ msgstr "Aquest servidor HTTP té el suport d'abast trencat" msgid "Unknown date format" msgstr "Format de la data desconegut" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Ha fallat la selecció" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Connexió finalitzada" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "S'ha produït un error en escriure al fitxer de sortida" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "S'ha produït un error en escriure al fitxer" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "S'ha produït un error en escriure al fitxer" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "" "S'ha produït un error en llegir, el servidor remot ha tancat la connexió" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "S'ha produït un error en llegir des del servidor" @@ -2846,7 +2846,7 @@ msgid "" msgstr "" "El paquet %s necessita ser reinstaŀlat, però no se li pot trobar un arxiu." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2854,13 +2854,13 @@ msgstr "" "Error, pkgProblemResolver::Resolve ha generat pauses, això pot haver estat " "causat per paquets retinguts." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "" "No es poden corregir els problemes, teniu paquets retinguts que estan " "trencats." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2905,7 +2905,7 @@ msgstr "No s'ha pogut trobar el mètode de control %s." msgid "Method %s did not start correctly" msgstr "El mètode %s no s'ha iniciat correctament" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Inseriu el disc amb l'etiqueta: «%s» en la unitat «%s» i premeu Intro." diff --git a/po/cs.po b/po/cs.po index 4064c164b..429cbabdd 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+0200\n" "PO-Revision-Date: 2012-07-08 13:46+0200\n" "Last-Translator: Miroslav Kure <kurem@debian.cz>\n" "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n" @@ -626,7 +626,7 @@ msgstr "Přerušeno." msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovat [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Selhalo stažení %s %s\n" @@ -1561,31 +1561,31 @@ msgstr "Tento HTTP server má porouchanou podporu rozsahů" msgid "Unknown date format" msgstr "Neznámý formát data" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Výběr selhal" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Čas spojení vypršel" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Chyba zápisu do výstupního souboru" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Chyba čtení ze serveru" @@ -2814,7 +2814,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Balík %s je potřeba přeinstalovat, ale nemohu pro něj nalézt archiv." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2822,11 +2822,11 @@ msgstr "" "Chyba, pkgProblemResolver::Resolve vytváří poruchy, to může být způsobeno " "podrženými balíky." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "Nelze opravit problémy, některé balíky držíte v porouchaném stavu." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2871,7 +2871,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:440 +#: apt-pkg/acquire-worker.cc:447 #, 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." diff --git a/po/cy.po b/po/cy.po index c1867d70a..a72c91ebd 100644 --- a/po/cy.po +++ b/po/cy.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+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" @@ -663,7 +663,7 @@ msgstr "Erthylu." msgid "Do you want to continue [Y/n]? " msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Methwyd cyrchu %s %s\n" @@ -1577,32 +1577,32 @@ msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri" msgid "Unknown date format" msgstr "Fformat dyddiad anhysbys" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Methwyd dewis" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Goramserodd y cysylltiad" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Gwall wrth ysgrifennu i ffeil allbwn" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Gwall wrth ysgrifennu at ffeil" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Gwall wrth ysgrifennu at y ffeil" -#: methods/http.cc:923 +#: methods/http.cc:928 #, fuzzy msgid "Error reading from server. Remote end closed connection" msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Gwall wrth ddarllen o'r gweinydd" @@ -2865,7 +2865,7 @@ msgstr "" "Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar " "ei gyfer." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2873,12 +2873,12 @@ msgstr "" "Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi " "ei achosi gan pecynnau wedi eu dal." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2924,7 +2924,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:440 +#: apt-pkg/acquire-worker.cc:447 #, fuzzy, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" diff --git a/po/da.po b/po/da.po index e2982b563..b9094b081 100644 --- a/po/da.po +++ b/po/da.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+0200\n" "PO-Revision-Date: 2012-07-03 23:51+0200\n" "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n" "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n" @@ -635,7 +635,7 @@ msgstr "Afbryder." msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortsætte [J/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Kunne ikke hente %s %s\n" @@ -1572,31 +1572,31 @@ msgstr "" msgid "Unknown date format" msgstr "Ukendt datoformat" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Valg mislykkedes" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Tidsudløb på forbindelsen" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Fejl ved skrivning af uddatafil" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Fejl ved skrivning til fil" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Fejl ved skrivning til filen" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Fejl ved læsning fra serveren. Den fjerne ende lukkede forbindelsen" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Fejl ved læsning fra server" @@ -2836,7 +2836,7 @@ msgid "" msgstr "" "Pakken %s skal geninstalleres, men jeg kan ikke finde noget arkiv med den." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2844,12 +2844,12 @@ msgstr "" "Fejl, pkgProblemResolver::Resolve satte stopklodser op, det kan skyldes " "tilbageholdte pakker." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Kunne ikke korrigere problemerne, da du har tilbageholdt ødelagte pakker." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2894,7 +2894,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:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Indsæt disken med navnet: '%s' i drevet '%s' og tryk retur." diff --git a/po/de.po b/po/de.po index 00f40344e..9dd4a208d 100644 --- a/po/de.po +++ b/po/de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.2\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+0200\n" "PO-Revision-Date: 2012-06-27 10:55+0200\n" "Last-Translator: Holger Wansing <linux@wansing-online.de>\n" "Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n" @@ -648,7 +648,7 @@ msgstr "Abbruch." msgid "Do you want to continue [Y/n]? " msgstr "Möchten Sie fortfahren [J/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Fehlschlag beim Holen von %s %s\n" @@ -1623,33 +1623,33 @@ msgstr "" msgid "Unknown date format" msgstr "Unbekanntes Datumsformat" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Auswahl fehlgeschlagen" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Zeitüberschreitung bei Verbindung" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Fehler beim Schreiben der Ausgabedatei" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Fehler beim Schreiben in Datei" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Fehler beim Schreiben der Datei" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "" "Fehler beim Lesen vom Server: Verbindung wurde durch den Server auf der " "anderen Seite geschlossen." -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Fehler beim Lesen vom Server" @@ -2912,7 +2912,7 @@ msgstr "" "Das Paket %s muss neu installiert werden, es kann jedoch kein Archiv dafür " "gefunden werden." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2920,13 +2920,13 @@ msgstr "" "Fehler: Unterbrechungen durch pkgProblemResolver::Resolve hervorgerufen; " "dies könnte durch zurückgehaltene Pakete verursacht worden sein." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Probleme können nicht korrigiert werden, Sie haben zurückgehaltene defekte " "Pakete." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2971,7 +2971,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:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" diff --git a/po/dz.po b/po/dz.po index 01854d2d6..0215f21be 100644 --- a/po/dz.po +++ b/po/dz.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po.pot\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+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" @@ -645,7 +645,7 @@ msgstr "བར་བཤོལ་འབད།" msgid "Do you want to continue [Y/n]? " msgstr "ཁྱོན་ཀྱི་འཕྲོ་མཐུད་ནི་འབད་ནི་ཨིན་ན་[Y/n]?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n" @@ -1538,31 +1538,31 @@ msgstr "འ་ནི་ ཨེཆི་ཊི་ཊི་པི་ སར་བ msgid "Unknown date format" msgstr "མ་ཤེས་པའི་ཚེས་རྩ་སྒྲིག" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "སེལ་འཐུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "མཐུད་ལམ་ངལ་མཚམས་འབད་ཡོད།" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "ཨའུཊི་པུཊི་ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "ཡིག་སྣོད་འདི་ལུ་འབྲིཝ་ད་འཛོལ་བ།" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ། ཐག་རིང་མཇུག་གི་མཐུད་ལམ་དེ་ཁ་བསྡམས།" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ།" @@ -2802,7 +2802,7 @@ msgstr "" "ཐུམ་སྒྲིལ་%s་འདི་ལོག་འདི་རང་གཞི་བཙུགས་འབད་དགོཔ་འདུག་ འདི་འབདཝ་ད་འདི་གི་དོན་ལུ་ཡིག་མཛོད་ཅིག་འཚོལ་" "མ་ཐོབ།" -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2810,11 +2810,11 @@ msgstr "" "འཛོལ་བ་ pkgProblemResolver::གིས་བཟོ་བཏོན་འབད་ཡོད་པའི་མཚམས་དེ་ཚུ་མོས་མཐུན་བཟོཝ་ཨིན འ་ནི་ཐུམ་" "སྒྲིལ་ཚུ་འཛིན་པའི་རྒྱུ་རྐྱེན་ལས་བརྟེན་ཨིན་པས།" -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "དཀའ་ངལ་འདི་ནོར་བཅོས་འབད་མ་ཚུགས་ ཁྱོད་ཀྱི་ཐུམ་སྒྲིལ་ཆད་པ་ཚུ་འཆང་འདི་འདུག" -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2860,7 +2860,7 @@ msgstr "ཐབས་ལམ་འདྲེན་བྱེད་%s་འདི་ msgid "Method %s did not start correctly" msgstr "ཐབས་ལམ་ %s འདི་ངེས་བདེན་སྦེ་འགོ་མ་བཙུགས་འབད།" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "ཁ་ཡིག་བཀོད་ཡོད་པའི་ ཌིསི་འདི་བཙུགས་གནང་། '%s'འདྲེན་འཕྲུལ་ནང་'%s' དང་ལོག་ལྡེ་འདི་ཨེབ།་" diff --git a/po/el.po b/po/el.po index 75625de47..858175263 100644 --- a/po/el.po +++ b/po/el.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_el\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+0200\n" "PO-Revision-Date: 2008-08-26 18:25+0300\n" "Last-Translator: Θανάσης Νάτσης <natsisthanasis@gmail.com>\n" "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n" @@ -654,7 +654,7 @@ msgstr "Εγκατάλειψη." msgid "Do you want to continue [Y/n]? " msgstr "Θέλετε να συνεχίσετε [Ν/ο]; " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Αποτυχία ανάκτησης του %s %s\n" @@ -1560,32 +1560,32 @@ msgstr "Ο διακομιστής http δεν υποστηρίζει πλήρω msgid "Unknown date format" msgstr "Άγνωστη μορφή ημερομηνίας" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Η επιλογή απέτυχε" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Λήξη χρόνου σύνδεσης" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Σφάλμα στην εγγραφή στο αρχείο" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Σφάλμα στην εγγραφή στο αρχείο" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "" "Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Σφάλμα στην ανάγνωση από το διακομιστή" @@ -2829,7 +2829,7 @@ msgstr "" "Το πακέτο '%s' χρειάζεται να επανεγκατασταθεί, αλλά είναι αδύνατη η εύρεση " "κάποιας κατάλληλης αρχείοθήκης." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2837,11 +2837,11 @@ msgstr "" "Σφάλμα, το pkgProblemResolver::Resolve παρήγαγε διακοπές, αυτό ίσως " "προκλήθηκε από κρατούμενα πακέτα." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "Αδύνατη η διόρθωση προβλημάτων, έχετε κρατούμενα ελαττωματικά πακέτα." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2887,7 +2887,7 @@ msgstr "Ο οδηγός μεθόδου %s δεν μπορεί να εντοπι msgid "Method %s did not start correctly" msgstr "Η μέθοδος %s δεν εκκινήθηκε σωστά" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" diff --git a/po/es.po b/po/es.po index 286e5455b..df7ad92e1 100644 --- a/po/es.po +++ b/po/es.po @@ -33,7 +33,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.10\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+0200\n" "PO-Revision-Date: 2011-01-24 11:47+0100\n" "Last-Translator: Javier Fernández-Sanguino Peña <jfs@debian.org>\n" "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n" @@ -697,7 +697,7 @@ msgstr "Abortado." msgid "Do you want to continue [Y/n]? " msgstr "¿Desea continuar [S/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Imposible obtener %s %s\n" @@ -1623,31 +1623,31 @@ msgstr "Éste servidor de http tiene el soporte de alcance roto" msgid "Unknown date format" msgstr "Formato de fecha desconocido" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Falló la selección" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Expiró la conexión" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Error escribiendo al archivo de salida" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Error escribiendo a archivo" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Error escribiendo al archivo" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Error leyendo del servidor, el lado remoto cerró la conexión." -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Error leyendo del servidor" @@ -2909,7 +2909,7 @@ msgstr "" "El paquete %s necesita ser reinstalado, pero no se encuentra un archivo para " "éste." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2917,12 +2917,12 @@ msgstr "" "Error, pkgProblemResolver::Resolve generó cortes, esto puede haber sido " "causado por paquetes retenidos." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "" "No se pudieron corregir los problemas, usted ha retenido paquetes rotos." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2968,7 +2968,7 @@ msgstr "No se pudo encontrar el método %s." msgid "Method %s did not start correctly" msgstr "El método %s no se inició correctamente" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, 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 pulse Intro." diff --git a/po/eu.po b/po/eu.po index f327b113c..3e5e3f87a 100644 --- a/po/eu.po +++ b/po/eu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_eu\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+0200\n" "PO-Revision-Date: 2009-05-17 00:41+0200\n" "Last-Translator: Piarres Beobide <pi@beobide.net>\n" "Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n" @@ -635,7 +635,7 @@ msgstr "Abortatu." msgid "Do you want to continue [Y/n]? " msgstr "Aurrera jarraitu nahi al duzu [B/e]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ezin da lortu %s %s\n" @@ -1544,31 +1544,31 @@ msgstr "http zerbitzariak barruti onarpena apurturik du" msgid "Unknown date format" msgstr "Datu formatu ezezaguna" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Hautapenak huts egin du" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Konexioaren denbora muga gainditu da" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Errorea irteerako fitxategian idaztean" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Errorea zerbitzaritik irakurtzean" @@ -2802,7 +2802,7 @@ msgid "" msgstr "" "%s paketea berriro instalatu behar da, baina ezin dut artxiborik aurkitu." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2810,11 +2810,11 @@ msgstr "" "Errorea: pkgProblemResolver::Resolve. Etenak sortu ditu, beharbada " "atxikitako paketeek eraginda." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "Ezin dira arazoak konpondu; hautsitako paketeak atxiki dituzu." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2860,7 +2860,7 @@ msgstr "Ezin izan da %s metodo kontrolatzailea aurkitu." msgid "Method %s did not start correctly" msgstr "%s metodoa ez da behar bezala abiarazi" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Mesedez sa ''%s' izeneko diska '%s' gailuan eta enter sakatu" diff --git a/po/fi.po b/po/fi.po index 1637a9d97..9ca60943b 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+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" @@ -632,7 +632,7 @@ msgstr "Keskeytä." msgid "Do you want to continue [Y/n]? " msgstr "Haluatko jatkaa [K/e]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Tiedoston %s nouto ei onnistunut %s\n" @@ -1536,31 +1536,31 @@ msgstr "HTTP-palvelimen arvoaluetuki on rikki" msgid "Unknown date format" msgstr "Tuntematon päiväysmuoto" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Select ei toiminut" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Yhteys aikakatkaistiin" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Tapahtui virhe luettaessa palvelimelta" @@ -2792,7 +2792,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Paketti %s olisi asennettava uudelleen, mutta sen arkistoa ei löydy." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2800,11 +2800,11 @@ msgstr "" "Virhe, pkgProblemResolver::Resolve tuotti katkoja, syynä voi olla pysytetyt " "paketit." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "Pulmia ei voi korjata, rikkinäisiä paketteja on pysytetty." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2850,7 +2850,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:440 +#: apt-pkg/acquire-worker.cc:447 #, 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." diff --git a/po/fr.po b/po/fr.po index 835c0b206..d22e96cf2 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+0200\n" "PO-Revision-Date: 2013-04-09 07:58+0200\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -648,7 +648,7 @@ msgstr "Annulation." msgid "Do you want to continue [Y/n]? " msgstr "Souhaitez-vous continuer [O/n] ? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossible de récupérer %s %s\n" @@ -1621,31 +1621,31 @@ msgstr "Ce serveur http possède un support des limites non-valide" msgid "Unknown date format" msgstr "Format de date inconnu" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Sélection défaillante" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Délai de connexion dépassé" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Erreur d'écriture du fichier de sortie" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Erreur d'écriture sur un fichier" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Erreur d'écriture sur le fichier" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Erreur de lecture depuis le serveur distant et clôture de la connexion" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Erreur de lecture du serveur" @@ -2918,7 +2918,7 @@ msgstr "" "Le paquet %s doit être réinstallé, mais il est impossible de trouver son " "archive." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2926,13 +2926,13 @@ msgstr "" "Erreur, pkgProblem::Resolve a généré des ruptures, ce qui a pu être causé " "par les paquets devant être gardés en l'état." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Impossible de corriger les problèmes, des paquets défectueux sont en mode " "« garder en l'état »." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2977,7 +2977,7 @@ msgstr "Le pilote pour la méthode %s n'a pu être trouvé." msgid "Method %s did not start correctly" msgstr "La méthode %s n'a pas démarré correctement" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" diff --git a/po/gl.po b/po/gl.po index 12125eb54..7b2965759 100644 --- a/po/gl.po +++ b/po/gl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_gl\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+0200\n" "PO-Revision-Date: 2011-05-12 15:28+0100\n" "Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n" "Language-Team: galician <proxecto@trasno.net>\n" @@ -639,7 +639,7 @@ msgstr "Interromper." msgid "Do you want to continue [Y/n]? " msgstr "Quere continuar [S/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Non foi posíbel obter %s %s\n" @@ -1571,32 +1571,32 @@ msgstr "Este servidor HTTP ten a compatibilidade de rangos estragada" msgid "Unknown date format" msgstr "Formato de datos descoñecido" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Fallou a chamada a select" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "A conexión esgotou o tempo" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Produciuse un erro ao escribir no ficheiro de saída" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Produciuse un erro ao escribir nun ficheiro" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Produciuse un erro ao escribir no ficheiro" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "" "Produciuse un erro ao ler do servidor. O extremo remoto pechou a conexión" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Produciuse un erro ao ler do servidor" @@ -2851,7 +2851,7 @@ msgstr "" "O paquete %s ten que ser reinstalado, mais non é posíbel atopar o seu " "arquivo." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2859,11 +2859,11 @@ msgstr "" "Erro, pkgProblemResolver::Resolve xerou interrupcións, isto pode estar " "causado por paquetes retidos." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "Non é posíbel solucionar os problemas, ten retidos paquetes rotos." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2909,7 +2909,7 @@ msgstr "Non foi posíbel 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:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Insira o disco etiquetado: «%s» na unidade «%s» e prema Intro." diff --git a/po/hu.po b/po/hu.po index 9cf645472..a9f18732b 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt trunk\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+0200\n" "PO-Revision-Date: 2012-06-25 17:09+0200\n" "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n" "Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n" @@ -628,7 +628,7 @@ msgstr "Megszakítva." msgid "Do you want to continue [Y/n]? " msgstr "Folytatni akarja [I/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Sikertelen letöltés: %s %s\n" @@ -1578,31 +1578,31 @@ msgstr "A HTTP-kiszolgáló tartománytámogatása sérült" msgid "Unknown date format" msgstr "Ismeretlen dátumformátum" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "A kiválasztás sikertelen" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Időtúllépés a kapcsolatban" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Hiba a kimeneti fájl írásakor" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Hiba a fájl írásakor" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Hiba a fájl írásakor" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Hiba a kiszolgálóról olvasáskor, a túloldal lezárta a kapcsolatot" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Hiba a kiszolgálóról olvasáskor" @@ -2857,7 +2857,7 @@ msgid "" msgstr "" "A(z) %s csomagot újra kell telepíteni, de nem található hozzá archívum." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2865,11 +2865,11 @@ msgstr "" "Hiba, a pkgProblemResolver::Resolve töréseket generált, ezt visszafogott " "csomagok okozhatják." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "A problémák nem javíthatók, sérült csomagokat fogott vissza." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2914,7 +2914,7 @@ msgstr "A(z) %s metódusvezérlő nem található." msgid "Method %s did not start correctly" msgstr "A(z) %s metódus nem indult el megfelelően" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" diff --git a/po/it.po b/po/it.po index e0baac726..183cc7df5 100644 --- a/po/it.po +++ b/po/it.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+0200\n" "PO-Revision-Date: 2012-06-25 21:54+0200\n" "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n" "Language-Team: Italian <tp@lists.linux.it>\n" @@ -643,7 +643,7 @@ msgstr "Interrotto." msgid "Do you want to continue [Y/n]? " msgstr "Continuare [S/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossibile recuperare %s %s\n" @@ -1602,31 +1602,31 @@ msgstr "Questo server HTTP ha un supporto del range non corretto" msgid "Unknown date format" msgstr "Formato della data sconosciuto" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Select non riuscita" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Connessione terminata" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Errore nello scrivere sul file di output" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Errore nello scrivere su file" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Errore nello scrivere sul file" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Errore nel leggere dal server. Il lato remoto ha chiuso la connessione" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Errore nel leggere dal server" @@ -2897,7 +2897,7 @@ msgstr "" "Il pacchetto %s deve essere reinstallato, ma non è possibile trovarne un " "archivio." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2905,12 +2905,12 @@ msgstr "" "Errore, pkgProblemResolver::Resolve ha generato delle interruzioni. Questo " "potrebbe essere causato da pacchetti bloccati." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Impossibile correggere i problemi, ci sono pacchetti danneggiati bloccati." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2956,7 +2956,7 @@ msgstr "Impossibile trovare un driver per il metodo %s." msgid "Method %s did not start correctly" msgstr "Il metodo %s non si è avviato correttamente" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Inserire il disco chiamato \"%s\" nell'unità \"%s\" e premere Invio." diff --git a/po/ja.po b/po/ja.po index 399219f2f..344adfd21 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+0200\n" "PO-Revision-Date: 2012-07-01 00:14+0900\n" "Last-Translator: Kenshi Muto <kmuto@debian.org>\n" "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n" @@ -635,7 +635,7 @@ msgstr "中断しました。" msgid "Do you want to continue [Y/n]? " msgstr "続行しますか [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s の取得に失敗しました %s\n" @@ -1575,31 +1575,31 @@ msgstr "HTTP サーバのレンジサポートが壊れています" msgid "Unknown date format" msgstr "不明な日付フォーマットです" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "select に失敗しました" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "接続タイムアウト" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "出力ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "リモート側で接続がクローズされてサーバからの読み込みに失敗しました" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "サーバからの読み込みに失敗しました" @@ -2841,7 +2841,7 @@ msgstr "" "パッケージ %s を再インストールする必要がありますが、そのためのアーカイブを見" "つけることができませんでした。" -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2849,11 +2849,11 @@ msgstr "" "エラー、pkgProblemResolver::Resolve は停止しました。おそらく変更禁止パッケー" "ジが原因です。" -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "問題を解決することができません。壊れた変更禁止パッケージがあります。" -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2898,7 +2898,7 @@ msgstr "メソッドドライバ %s が見つかりません。" msgid "Method %s did not start correctly" msgstr "メソッド %s が正常に開始しませんでした" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" diff --git a/po/km.po b/po/km.po index bb7bd6ee1..5000daf79 100644 --- a/po/km.po +++ b/po/km.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_km\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+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" @@ -635,7 +635,7 @@ msgstr "បោះបង់ ។" msgid "Do you want to continue [Y/n]? " msgstr "តើ​អ្នក​ចង់​បន្តឬ​ [បាទ ចាស/ទេ​] ? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ %s %s\n" @@ -1516,31 +1516,31 @@ msgstr "ម៉ាស៊ីន​បម្រើ HTTP នេះបាន​ខូ msgid "Unknown date format" msgstr "មិនស្គាល់​ទ្រង់ទ្រាយ​កាលបរិច្ឆេទ" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "ជ្រើស​បាន​បរាជ័យ​" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "ការតភ្ជាប់​បាន​អស់ពេល​" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារលទ្ធផល" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារ" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "កំហុសក្នុងការ​សរសេរ​ទៅកាន់​ឯកសារ" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "កំហុស​ក្នុងការ​អាន​ពី​ម៉ាស៊ីនបម្រើ ។ ការបញ្ចប់​ពីចម្ងាយ​បានបិទការតភ្ជាប់" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "កំហុស​ក្នុងការអាន​ពី​ម៉ាស៊ីន​បម្រើ" @@ -2767,7 +2767,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "កញ្ចប់ %s ត្រូវការឲ្យដំឡើង ប៉ុន្តែ​ ខ្ញុំ​មិន​អាច​រក​ប័ណ្ណសារ​សម្រាប់​វា​បាន​ទេ​ ។" -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2775,11 +2775,11 @@ msgstr "" "កំហុស pkgProblemResolver::ដោះស្រាយ​សញ្ញាបញ្ឈប់​ដែលបានបង្កើត នេះ​ប្រហែលជា បង្កដោយកញ្ចប់​" "ដែលបាន​ទុក ។" -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "មិន​អាច​កែ​បញ្ហាបានទេេ អ្កបានទុក​កញ្ចប់​ដែល​ខូច ។។" -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2824,7 +2824,7 @@ msgstr "មិនអាច​រកឃើញ​កម្មវិធី​បញ msgid "Method %s did not start correctly" msgstr "វិធីសាស្ត្រ​ %s មិន​អាច​ចាប់​ផ្តើម​ត្រឹមត្រូវ​ទេ​" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "សូម​បញ្ចូល​ស្លាក​ឌីស​ ៖ '%s' ក្នុង​ដ្រាយ​ '%s' ហើយ​សង្កត់​ចូល ។" diff --git a/po/ko.po b/po/ko.po index a4d0af447..3595cd048 100644 --- a/po/ko.po +++ b/po/ko.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+0200\n" "PO-Revision-Date: 2010-08-30 02:31+0900\n" "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n" "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n" @@ -632,7 +632,7 @@ msgstr "중단." msgid "Do you want to continue [Y/n]? " msgstr "계속 하시겠습니까 [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s 파일을 받는데 실패했습니다 %s\n" @@ -1534,31 +1534,31 @@ msgstr "HTTP 서버에 범위 지원 기능이 잘못되어 있습니다" msgid "Unknown date format" msgstr "데이터 형식을 알 수 없습니다" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "select가 실패했습니다" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "연결 시간이 초과했습니다" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "출력 파일에 쓰는데 오류가 발생했습니다" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "파일에 쓰는데 오류가 발생했습니다" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "해당 파일에 쓰는데 오류가 발생했습니다" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "서버에서 읽고 연결을 닫는데 오류가 발생했습니다" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "서버에서 읽는데 오류가 발생했습니다" @@ -2793,7 +2793,7 @@ msgid "" msgstr "" "%s 패키지를 다시 설치해야 하지만, 이 패키지의 아카이브를 찾을 수 없습니다." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2801,11 +2801,11 @@ msgstr "" "오류, pkgProblemResolver::Resolve가 망가졌습니다. 고정 패키지때문에 발생할 수" "도 있습니다." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "문제를 바로잡을 수 없습니다. 망가진 고정 패키지가 있습니다." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2851,7 +2851,7 @@ msgstr "설치 방법 드라이버 %s을(를) 찾을 수 없습니다." msgid "Method %s did not start correctly" msgstr "설치 방법 %s이(가) 올바르게 시작하지 않았습니다" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" diff --git a/po/ku.po b/po/ku.po index f7f2d0996..c51cafac2 100644 --- a/po/ku.po +++ b/po/ku.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-ku\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+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" @@ -590,7 +590,7 @@ msgstr "Betal." msgid "Do you want to continue [Y/n]? " msgstr "Dixwazî bidomînî [E/n]?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Anîna %s %s biserneket\n" @@ -1418,32 +1418,32 @@ msgstr "" msgid "Unknown date format" msgstr "" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Hilbijartin neserketî" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "" -#: methods/http.cc:850 +#: methods/http.cc:855 #, fuzzy msgid "Error writing to output file" msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Dema li pelî dihate nivîsîn çewtî" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Dema li pelî dihate nivîsîn çewtî" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "" @@ -2606,17 +2606,17 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2659,7 +2659,7 @@ msgstr "" msgid "Method %s did not start correctly" msgstr "" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, 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" diff --git a/po/lt.po b/po/lt.po index 22e5fc152..37755a6cf 100644 --- a/po/lt.po +++ b/po/lt.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+0200\n" "PO-Revision-Date: 2008-08-02 01:47-0400\n" "Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n" "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n" @@ -598,7 +598,7 @@ msgstr "Nutraukti." msgid "Do you want to continue [Y/n]? " msgstr "Ar norite tęsti [T/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Nepavyko parsiųsti %s %s\n" @@ -1442,31 +1442,31 @@ msgstr "" msgid "Unknown date format" msgstr "" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Prisijungimo laiko limitas baigėsi" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Klaida bandant rašyti į failą" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "" @@ -2700,17 +2700,17 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2756,7 +2756,7 @@ msgstr "" msgid "Method %s did not start correctly" msgstr "" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Įdėkite diską „%s“ į įrenginį „%s“ ir paspauskite Enter." diff --git a/po/mr.po b/po/mr.po index 84ff30882..8bac3c3e6 100644 --- a/po/mr.po +++ b/po/mr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+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 " @@ -629,7 +629,7 @@ msgstr "व्यत्यय/बंद करा." msgid "Do you want to continue [Y/n]? " msgstr "तुम्हाला पुढे जायचे आहे [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s %s आणणे असफल\n" @@ -1520,31 +1520,31 @@ msgstr "HTTP सर्व्हरने विस्तार तांत् msgid "Unknown date format" msgstr "अपरिचित दिनांक प्रकार/स्वरूप " -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "चुकले/असमर्थ निवड करा" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "जोडणी वेळेअभावी तुटली" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "निर्गत फाईल मध्ये लिहिताना त्रुटी/चूक" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "सर्व्हर मधून वाचण्यात चूक. लांब शेवट आणि बंद झालेली जोडणी" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "सर्व्हर मधून वाचण्यात चूक" @@ -2772,7 +2772,7 @@ msgid "" msgstr "" "%s पॅकेज पुनः:अधिष्ठापित करण्याची गरज आहे, परंतु मला त्यासाठी ऑर्काइव्ह सापडू शकले नाही." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2780,11 +2780,11 @@ msgstr "" "दोष,पॅकेज समस्या निवारक::निवारण करतांना अडथळा निर्माण झाला, ह्याचे कारण स्थगित " "पॅकेजेस असू शकते." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "अडचणी दूर करण्यास असमर्थ, तुम्ही तुटलेले पॅकेज घेतलेले आहे." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2830,7 +2830,7 @@ msgstr "%s कार्यपध्दतीचा ड्राइव्हर msgid "Method %s did not start correctly" msgstr "%s कार्यपध्दती योग्य रीतीने सुरु झालेली नाही" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "कृपया '%s' लेबल असलेली डिस्क '%s' या ड्राइव्हमध्ये ठेवा आणि एन्टर कळ दाबा." diff --git a/po/nb.po b/po/nb.po index d97d38d76..a0809c350 100644 --- a/po/nb.po +++ b/po/nb.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+0200\n" "PO-Revision-Date: 2010-09-01 21:10+0200\n" "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n" "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n" @@ -640,7 +640,7 @@ msgstr "Avbryter." msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortsette [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikke å skaffe %s %s\n" @@ -1549,31 +1549,31 @@ msgstr "Denne HTTP-tjeneren har ødelagt støtte for område" msgid "Unknown date format" msgstr "Ukjent datoformat" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Utvalget mislykkes" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Tidsavbrudd på forbindelsen" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Feil ved lesing fra tjeneren" @@ -2814,7 +2814,7 @@ msgid "" msgstr "" "Pakka %s trenger å installeres på nytt, men jeg finner ikke lageret for den." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2822,11 +2822,11 @@ msgstr "" "Feil, pkgProblemResolver::Resolve skapte et brudd, det kan skyldes pakker " "som holdes tilbake." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "Klarer ikke å rette problemene, noen ødelagte pakker er holdt tilbake." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2872,7 +2872,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:440 +#: apt-pkg/acquire-worker.cc:447 #, 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." diff --git a/po/ne.po b/po/ne.po index 4d089bf20..2081389fc 100644 --- a/po/ne.po +++ b/po/ne.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+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" @@ -633,7 +633,7 @@ msgstr "परित्याग गर्नुहोस् ।" msgid "Do you want to continue [Y/n]? " msgstr "के तपाईँ निरन्तरता दिन चाहनुहुन्छ [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s %s तान्न असफल भयो\n" @@ -1517,31 +1517,31 @@ msgstr "HTTP सर्भर संग भाँचिएको दायरा msgid "Unknown date format" msgstr "अज्ञात मिति ढाँचा" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "असफल चयन गर्नुहोस्" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "जडान समय सकियो" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "निर्गात फाइलमा त्रुटि लेखिदैछ" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "फाइलमा त्रुटि लेखिदैछ" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "फाइलमा त्रुटि लेखिदैछ" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "सर्भरबाट त्रुटि पढिदैछ । दूर गन्तब्य बन्द जडान" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "सर्भरबाट त्रुटि पढिदैछ" @@ -2769,7 +2769,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "प्याकेज %s पुन:स्थापना हुन चाहन्छ, तर यसको लागि मैले एउटा संग्रह फेला पार्न सकिन ।" -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2777,11 +2777,11 @@ msgstr "" "त्रुटि, pkgProblemResolver:: समाधानले विच्छेदन सिर्जना गर्दछ, यो भइरहेको प्याकेजहरुको " "कारणले गर्दा हो ।" -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "समस्याहरू सुधार्न असक्षम भयो, तपाईँले प्याकेजहरु भाँच्नुभयो ।" -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2827,7 +2827,7 @@ msgstr "विधि ड्राइभर %s फेला पार्न स msgid "Method %s did not start correctly" msgstr "विधि %s सही रुपले सुरू हुन सकेन" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "कृपया डिस्क लेबुल: '%s' ड्राइभ '%s'मा घुसउनुहोस् र इन्टर थिच्नुहोस् । " diff --git a/po/nl.po b/po/nl.po index c3bec13e5..dad286af5 100644 --- a/po/nl.po +++ b/po/nl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.15.9\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+0200\n" "PO-Revision-Date: 2011-12-05 17:10+0100\n" "Last-Translator: Jeroen Schot <schot@a-eskwadraat.nl>\n" "Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n" @@ -642,7 +642,7 @@ msgstr "Afbreken." msgid "Do you want to continue [Y/n]? " msgstr "Wilt u doorgaan [J/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ophalen van %s is mislukt %s\n" @@ -1570,32 +1570,32 @@ msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet" msgid "Unknown date format" msgstr "Onbekend datumformaat" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Selectie is mislukt" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Verbinding verliep" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Fout bij het schrijven naar het uitvoerbestand" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Fout bij het schrijven naar bestand" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Fout bij het schrijven naar het bestand" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "" "Fout bij het lezen van de server, andere kant heeft de verbinding gesloten" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Fout bij het lezen van de server" @@ -2852,7 +2852,7 @@ msgstr "" "Pakket %s moet opnieuw geïnstalleerd worden, maar er kan geen archief voor " "gevonden worden." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2860,11 +2860,11 @@ msgstr "" "Fout, pkgProblemResolver::Resolve maakte scheidingen aan, dit kan " "veroorzaakt worden door vastgehouden pakketten." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "Kan problemen niet verhelpen, u houdt defecte pakketten vast." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2910,7 +2910,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:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" diff --git a/po/nn.po b/po/nn.po index 89489066a..73d1bbecc 100644 --- a/po/nn.po +++ b/po/nn.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_nn\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+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" @@ -645,7 +645,7 @@ msgstr "Avbryt." msgid "Do you want to continue [Y/n]? " msgstr "Vil du halda fram [J/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikkje henta %s %s\n" @@ -1534,31 +1534,31 @@ msgstr "Denne HTTP-tenaren har msgid "Unknown date format" msgstr "Ukjend datoformat" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Utvalet mislukkast" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Tidsavbrot p sambandet" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing fr tenaren. Sambandet vart lukka i andre enden" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Feil ved lesing fr tenaren" @@ -2783,7 +2783,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Pakken %s m installerast p nytt, men arkivet finst ikkje." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2791,12 +2791,12 @@ msgstr "" "Feil, pkgProblemResolver::Resolve har laga brot. Dette kan skuldast pakkar " "som er haldne tilbake." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Klarte ikkje retta opp problema. Nokre ydelagde pakkar er haldne tilbake." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2842,7 +2842,7 @@ msgstr "Finn ikkje metodedrivaren %s." msgid "Method %s did not start correctly" msgstr "Metoden %s starta ikkje rett" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, fuzzy, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" diff --git a/po/pl.po b/po/pl.po index b8643a951..67cc53990 100644 --- a/po/pl.po +++ b/po/pl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.3\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+0200\n" "PO-Revision-Date: 2012-07-28 21:53+0200\n" "Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n" "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n" @@ -640,7 +640,7 @@ msgstr "Przerwane." msgid "Do you want to continue [Y/n]? " msgstr "Kontynuować [T/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Nie udało się pobrać %s %s\n" @@ -1608,31 +1608,31 @@ msgstr "Ten serwer HTTP nieprawidłowo obsługuje zakresy (ranges)" msgid "Unknown date format" msgstr "Nieznany format daty" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Operacja select nie powiodła się" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Przekroczenie czasu połączenia" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Błąd przy pisaniu do pliku wyjściowego" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Błąd przy pisaniu do pliku" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Błąd przy pisaniu do pliku" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Błąd czytania z serwera: Zdalna strona zamknęła połączenie" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Błąd czytania z serwera" @@ -2885,7 +2885,7 @@ msgstr "" "Pakiet %s ma zostać ponownie zainstalowany, ale nie można znaleźć jego " "archiwum." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2893,11 +2893,11 @@ msgstr "" "Błąd, pkgProblemResolver::Resolve zwrócił błąd, może to być spowodowane " "zatrzymanymi pakietami." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "Nie udało się naprawić problemów, zatrzymano uszkodzone pakiety." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2942,7 +2942,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:440 +#: apt-pkg/acquire-worker.cc:447 #, 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." diff --git a/po/pt.po b/po/pt.po index febe90d83..6cb0868c6 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+0200\n" "PO-Revision-Date: 2012-06-29 15:45+0100\n" "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" @@ -636,7 +636,7 @@ msgstr "Abortado." msgid "Do you want to continue [Y/n]? " msgstr "Deseja continuar [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falhou obter %s %s\n" @@ -1583,31 +1583,31 @@ msgstr "Este servidor HTTP possui suporte de range errado" msgid "Unknown date format" msgstr "Formato de data desconhecido" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "A selecção falhou" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "O tempo da ligação expirou" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Erro ao escrever para o ficheiro de saída" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Erro ao escrever para ficheiro" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Erro ao escrever para o ficheiro" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Erro ao ler do servidor. O lado remoto fechou a ligação" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Erro ao ler do servidor" @@ -2862,7 +2862,7 @@ msgstr "" "O pacote %s necessita ser reinstalado, mas não foi possível encontrar um " "repositório para o mesmo." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2870,13 +2870,13 @@ msgstr "" "Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por " "pacotes mantidos (hold)." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Não foi possível corrigir problemas, você tem pacotes mantidos (hold) " "estragados." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2921,7 +2921,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 correctamente" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 0a5317c70..e0d569c93 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+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." @@ -641,7 +641,7 @@ msgstr "Abortar." msgid "Do you want to continue [Y/n]? " msgstr "Você quer continuar [S/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falhou ao buscar %s %s\n" @@ -1553,31 +1553,31 @@ msgstr "Este servidor HTTP possui suporte a \"range\" quebrado" msgid "Unknown date format" msgstr "Formato de data desconhecido" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Seleção falhou" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Conexão expirou" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Erro escrevendo para arquivo de saída" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Erro escrevendo para arquivo" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Erro escrevendo para o arquivo" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Erro lendo do servidor. Ponto remoto fechou a conexão" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Erro lendo do servidor" @@ -2824,7 +2824,7 @@ msgstr "" "O pacote %s precisa ser reinstalado, mas não foi possível encontrar um " "arquivo para o mesmo." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2832,11 +2832,11 @@ msgstr "" "Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por " "pacotes mantidos (hold)." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "Impossível corrigir problemas, você manteve (hold) pacotes quebrados." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2882,7 +2882,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:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" diff --git a/po/ro.po b/po/ro.po index 1b6c6c06c..d1c33ea49 100644 --- a/po/ro.po +++ b/po/ro.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ro\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+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" @@ -636,7 +636,7 @@ msgstr "Renunțare." msgid "Do you want to continue [Y/n]? " msgstr "Vreți să continuați [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Eșec la aducerea lui %s %s\n" @@ -1557,32 +1557,32 @@ msgstr "Acest server HTTP are un suport defect de intervale" msgid "Unknown date format" msgstr "Format dată necunoscut" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Selecția a eșuat" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Timp de conectare expirat" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Eroare la scrierea fișierului de rezultat" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Eroare la scrierea în fișier" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Eroare la scrierea în fișierul" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "" "Eroare la citirea de la server. Conexiunea a fost închisă de la distanță" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Eroare la citirea de la server" @@ -2828,7 +2828,7 @@ msgid "" msgstr "" "Pachetul %s are nevoie să fie reinstalat, dar nu pot găsi o arhivă pentru el." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2836,11 +2836,11 @@ msgstr "" "Eroare, pkgProblemResolver::Resolve a generat întreruperi, aceasta poate fi " "cauzată de pachete ținute." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "Nu pot corecta problema, ați ținut pachete deteriorate." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2886,7 +2886,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:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" diff --git a/po/ru.po b/po/ru.po index 7ebebbd7f..e71539f17 100644 --- a/po/ru.po +++ b/po/ru.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: apt rev2227.1.3\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+0200\n" "PO-Revision-Date: 2012-06-30 08:47+0400\n" "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" @@ -647,7 +647,7 @@ msgstr "Аварийное завершение." msgid "Do you want to continue [Y/n]? " msgstr "Хотите продолжить [Д/н]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Не удалось получить %s %s\n" @@ -1603,31 +1603,31 @@ msgstr "Этот HTTP-сервер не поддерживает скачива msgid "Unknown date format" msgstr "Неизвестный формат данных" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Ошибка в select" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Время ожидания для соединения истекло" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Ошибка записи в выходной файл" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Ошибка записи в файл" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Ошибка записи в файл" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Ошибка чтения, удалённый сервер прервал соединение" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Ошибка чтения с сервера" @@ -2887,7 +2887,7 @@ msgid "" msgstr "" "Пакет %s нуждается в переустановке, но найти архив для него не удалось." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2895,11 +2895,11 @@ msgstr "" "Ошибка, pkgProblemResolver::Resolve сгенерировал повреждённые пакеты. Это " "может быть вызвано отложенными (held) пакетами." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "Невозможно исправить ошибки, у вас отложены (held) битые пакеты." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2944,7 +2944,7 @@ msgstr "Драйвер для метода %s не найден." msgid "Method %s did not start correctly" msgstr "Метод %s запустился не корректно" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Вставьте диск с меткой «%s» в устройство «%s» и нажмите ввод." diff --git a/po/sk.po b/po/sk.po index 90392e27c..defb22e44 100644 --- a/po/sk.po +++ b/po/sk.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+0200\n" "PO-Revision-Date: 2012-06-28 20:49+0100\n" "Last-Translator: Ivan Masár <helix84@centrum.sk>\n" "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n" @@ -633,7 +633,7 @@ msgstr "Prerušené." msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovať [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Zlyhalo stiahnutie %s %s\n" @@ -1576,31 +1576,31 @@ msgstr "Tento HTTP server má poškodenú podporu rozsahov" msgid "Unknown date format" msgstr "Neznámy formát dátumu" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Výber zlyhal" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Uplynul čas spojenia" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Chyba zápisu do výstupného súboru" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Chyba zápisu do súboru" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Chyba zápisu do tohto súboru" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba pri čítaní zo servera. Druhá strana ukončila spojenie" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Chyba pri čítaní zo servera" @@ -2834,7 +2834,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Je nutné preinštalovať balík %s, ale nedá sa nájsť jeho archív." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2842,11 +2842,11 @@ msgstr "" "Chyba, pkgProblemResolver::Resolve vytvára poruchy, čo môže být spôsobené " "pridržanými balíkmi." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "Problémy sa nedajú opraviť, niektoré balíky držíte v poškodenom stave." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2891,7 +2891,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:440 +#: apt-pkg/acquire-worker.cc:447 #, 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." diff --git a/po/sl.po b/po/sl.po index 2d92369d7..2bec2772c 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+0200\n" "PO-Revision-Date: 2012-06-27 21:29+0000\n" "Last-Translator: Andrej Znidarsic <andrej.znidarsic@gmail.com>\n" "Language-Team: Slovenian <sl@li.org>\n" @@ -630,7 +630,7 @@ msgstr "Prekini." msgid "Do you want to continue [Y/n]? " msgstr "Ali želite nadaljevati [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ni mogoče dobiti %s %s\n" @@ -1574,31 +1574,31 @@ msgstr "Ta strežnik HTTP ima pokvarjen obseg podpore" msgid "Unknown date format" msgstr "Neznana oblika datuma" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Izbira ni uspela" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Povezava je zakasnela" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Napaka med pisanjem v izhodno datoteko" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Napaka med pisanjem v datoteko" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Napaka med pisanjem v datoteko" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Napaka med branjem s strežnika. Oddaljeni del je zaprl povezavo" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Napaka med branjem s strežnika" @@ -2839,7 +2839,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Paket %s mora biti znova nameščen, vendar ni mogoče najti arhiva zanj." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2847,11 +2847,11 @@ msgstr "" "Napaka. pkgProblemResolver::Resolve pri razrešitvi, ki so jih morda " "povzročili zadržani paketi." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "Ni mogoče popraviti težav. Imate pokvarjene pakete." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2896,7 +2896,7 @@ msgstr "Gonilnika načinov %s ni mogoče najti." msgid "Method %s did not start correctly" msgstr "Način %s se ni začel pravilno" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Vstavite disk z oznako '%s' v pogon '%s' in pritisnite vnosno tipko." diff --git a/po/sv.po b/po/sv.po index 5f22dc4f6..261f84876 100644 --- a/po/sv.po +++ b/po/sv.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+0200\n" "PO-Revision-Date: 2010-08-24 21:18+0100\n" "Last-Translator: Daniel Nylander <po@danielnylander.se>\n" "Language-Team: Swedish <debian-l10n-swedish@debian.org>\n" @@ -637,7 +637,7 @@ msgstr "Avbryter." msgid "Do you want to continue [Y/n]? " msgstr "Vill du fortsätta [J/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Misslyckades med att hämta %s %s\n" @@ -1566,31 +1566,31 @@ msgstr "Den här http-serverns stöd för delvis hämtning fungerar inte" msgid "Unknown date format" msgstr "Okänt datumformat" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "\"Select\" misslyckades" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Anslutningen överskred tidsgränsen" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Fel vid skrivning till utdatafil" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Fel vid skrivning till fil" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Fel vid skrivning till filen" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Fel vid läsning från server: Andra änden stängde förbindelsen" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Fel vid läsning från server" @@ -2838,7 +2838,7 @@ msgid "" msgstr "" "Paketet %s måste installeras om, men jag kan inte hitta något arkiv för det." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2846,11 +2846,11 @@ msgstr "" "Fel, pkgProblemResolver::Resolve genererade avbrott; detta kan bero på " "tillbakahållna paket." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "Kunde inte korrigera problemen, du har hållit tillbaka trasiga paket." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2896,7 +2896,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:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" diff --git a/po/th.po b/po/th.po index e093cd702..548394cab 100644 --- a/po/th.po +++ b/po/th.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+0200\n" "PO-Revision-Date: 2012-10-27 22:44+0700\n" "Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n" "Language-Team: Thai <thai-l10n@googlegroups.com>\n" @@ -623,7 +623,7 @@ msgstr "เลิกทำ" msgid "Do you want to continue [Y/n]? " msgstr "คุณต้องการจะดำเนินการต่อไปหรือไม่ [Y/n]?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "ไม่สามารถดาวน์โหลด %s %s\n" @@ -1529,31 +1529,31 @@ msgstr "การสนับสนุน Content-Range ที่เซิร์ msgid "Unknown date format" msgstr "พบรูปแบบวันที่ที่ไม่รู้จัก" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "select ไม่สำเร็จ" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "หมดเวลารอเชื่อมต่อ" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้มผลลัพธ์" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์ ปลายทางอีกด้านหนึ่งปิดการเชื่อมต่อ" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์" @@ -2772,7 +2772,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "จำเป็นต้องติดตั้งแพกเกจ %s ซ้ำ แต่หาตัวแพกเกจไม่พบ" -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2780,11 +2780,11 @@ msgstr "" "ข้อผิดพลาด: pkgProblemResolver::Resolve สร้างคำตอบที่ทำให้เกิดแพกเกจเสีย " "อาจเกิดจากแพกเกจที่ถูกกำหนดให้คงรุ่นไว้" -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "ไม่สามารถแก้ปัญหาได้ คุณได้คงรุ่นแพกเกจที่เสียอยู่ไว้" -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2827,7 +2827,7 @@ msgstr "ไม่พบไดรเวอร์สำหรับวิธีก msgid "Method %s did not start correctly" msgstr "ไม่สามารถเรียกทำงานวิธีการ %s" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "กรุณาใส่แผ่นชื่อ: '%s' ลงในไดรว์ '%s' แล้วกด enter" diff --git a/po/tl.po b/po/tl.po index 964710f42..6fd464bb1 100644 --- a/po/tl.po +++ b/po/tl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+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" @@ -647,7 +647,7 @@ msgstr "Abort." msgid "Do you want to continue [Y/n]? " msgstr "Nais niyo bang magpatuloy [O/h]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Bigo sa pagkuha ng %s %s\n" @@ -1544,31 +1544,31 @@ msgstr "Sira ang range support ng HTTP server na ito" msgid "Unknown date format" msgstr "Di kilalang anyo ng petsa" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Bigo ang pagpili" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Nag-timeout ang koneksyon" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Error sa pagsulat ng talaksang output" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Error sa pagsulat sa talaksan" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Error sa pagsusulat sa talaksan" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Error sa pagbasa mula sa server" @@ -2814,7 +2814,7 @@ msgstr "" "Kailangan ma-instol muli ang paketeng %s, ngunit hindi ko mahanap ang arkibo " "para dito." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2822,12 +2822,12 @@ msgstr "" "Error, pkgProblemResolver::Resolve ay naghudyat ng mga break, maaaring dulot " "ito ng mga paketeng naka-hold." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Hindi maayos ang mga problema, mayroon kayong sirang mga pakete na naka-hold." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2873,7 +2873,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:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" diff --git a/po/uk.po b/po/uk.po index 046caead1..9778a3aa6 100644 --- a/po/uk.po +++ b/po/uk.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-all\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+0200\n" "PO-Revision-Date: 2012-09-25 20:19+0300\n" "Last-Translator: A. Bondarenko <artem.brz@gmail.com>\n" "Language-Team: Українська <uk@li.org>\n" @@ -644,7 +644,7 @@ msgstr "Перервано." msgid "Do you want to continue [Y/n]? " msgstr "Бажаєте продовжити [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Не вдалося завантажити %s %s\n" @@ -1597,31 +1597,31 @@ msgstr "Цей HTTP сервер має поламану підтримку 'ran msgid "Unknown date format" msgstr "Невідомий формат дати" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Вибір провалився" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Час очікування з'єднання вийшов" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Помилка запису у вихідний файл" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Помилка запису у файл" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Помилка запису у файл" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Помилка зчитування з сервера. Віддалена сторона закрила з'єднання" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Помилка зчитування з сервера" @@ -2885,7 +2885,7 @@ msgid "" msgstr "" "Пакунок %s повинен бути перевстановленим, але я не можу знайти його архів." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2893,11 +2893,11 @@ msgstr "" "Помилка, pkgProblemResolver::Resolve згенерував зупинку, це може бути " "пов'язано з зафіксованими пакунками." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "Неможливо усунути проблеми, ви маєте поламані зафіксовані пакунки." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2942,7 +2942,7 @@ msgstr "Драйвер для метода %s не знайдено." msgid "Method %s did not start correctly" msgstr "Метод %s стартував некоректно" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" diff --git a/po/vi.po b/po/vi.po index 4ba5c19d9..03e2e5506 100644 --- a/po/vi.po +++ b/po/vi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+0200\n" "PO-Revision-Date: 2012-11-20 14:12+0700\n" "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" @@ -640,7 +640,7 @@ msgstr "Hủy bỏ." msgid "Do you want to continue [Y/n]? " msgstr "Bạn có muốn tiếp tục không? [C/k] " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Việc lấy %s bị lỗi %s\n" @@ -1577,31 +1577,31 @@ msgstr "Máy phục vụ HTTP đã ngắt cách hỗ trợ phạm vị" msgid "Unknown date format" msgstr "Không rõ dạng ngày" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "Việc chọn bị lỗi" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "Kết nối đã quá giờ" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "Gặp lỗi khi ghi vào tập tin xuất" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "Gặp lỗi khi ghi vào tập tin" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "Gặp lỗi khi ghi vào tập tin đó" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "Gặp lỗi khi đọc từ máy phục vụ: cuối ở xa đã đóng kết nối" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "Gặp lỗi khi đọc từ máy phục vụ" @@ -2871,7 +2871,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Cần phải cài đặt lại gói %s, nhưng mà không thể tìm kho cho nó." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2879,11 +2879,11 @@ msgstr "" "Lỗi: “pkgProblemResolver::Resolve” (bộ tháo gỡ vấn đề gọi::tháo gỡ) đã tạo " "ra nhiều chỗ ngắt, có lẽ một số gói đã giữ lại đã gây ra trường hợp này." -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "Không thể sửa vấn đề, bạn đã giữ lại một số gói bị ngắt." -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2928,7 +2928,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:440 +#: apt-pkg/acquire-worker.cc:447 #, 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." diff --git a/po/zh_CN.po b/po/zh_CN.po index 8f25691e9..50e1eca86 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.0~pre1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+0200\n" "PO-Revision-Date: 2010-08-26 14:42+0800\n" "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n" "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" @@ -629,7 +629,7 @@ msgstr "中止执行。" msgid "Do you want to continue [Y/n]? " msgstr "您希望继续执行吗？[Y/n]" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "无法下载 %s %s\n" @@ -1515,31 +1515,31 @@ msgstr "该 HTTP 服务器的 range 支持不正常" msgid "Unknown date format" msgstr "无法识别的日期格式" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "select 调用出错" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "连接超时" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "写输出文件时出错" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "写入文件出错" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "写入文件出错" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "从服务器读取数据时出错，对方关闭了连接" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "从服务器读取数据出错" @@ -2761,7 +2761,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "软件包 %s 需要重新安装，但是我无法找到相应的安装文件。" -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2769,13 +2769,13 @@ msgstr "" "错误，pkgProblemResolver::Resolve 发生故障，这可能是有软件包被要求保持现状的" "缘故。" -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "" "无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关" "系。" -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2820,7 +2820,7 @@ msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。" msgid "Method %s did not start correctly" msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。" diff --git a/po/zh_TW.po b/po/zh_TW.po index 0cb4f8b8c..88eb4dbef 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.5.4\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-08 15:40+0200\n" +"POT-Creation-Date: 2013-05-16 11:28+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." @@ -630,7 +630,7 @@ msgstr "放棄執行。" msgid "Do you want to continue [Y/n]? " msgstr "是否繼續進行 [Y/n]？" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 #, c-format msgid "Failed to fetch %s %s\n" msgstr "無法取得 %s，%s\n" @@ -1511,31 +1511,31 @@ msgstr "這個 HTTP 伺服器的範圍支援有問題" msgid "Unknown date format" msgstr "未知的資料格式" -#: methods/http.cc:822 +#: methods/http.cc:827 msgid "Select failed" msgstr "選擇失敗" -#: methods/http.cc:827 +#: methods/http.cc:832 msgid "Connection timed out" msgstr "連線逾時" -#: methods/http.cc:850 +#: methods/http.cc:855 msgid "Error writing to output file" msgstr "在寫入輸出檔時發生錯誤" -#: methods/http.cc:881 +#: methods/http.cc:886 msgid "Error writing to file" msgstr "在寫入檔案時發生錯誤" -#: methods/http.cc:909 +#: methods/http.cc:914 msgid "Error writing to the file" msgstr "在寫入該檔時發生錯誤" -#: methods/http.cc:923 +#: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" msgstr "在讀取伺服器時發生錯誤，遠端主機已關閉連線" -#: methods/http.cc:925 +#: methods/http.cc:930 msgid "Error reading from server" msgstr "在讀取伺服器時發生錯誤" @@ -2756,7 +2756,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "套件 %s 需要重新安裝，但找不到它的套件檔。" -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1234 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2764,11 +2764,11 @@ msgstr "" "錯誤，pkgProblemResolver::Resolve 的建立中斷了，這可能肇因於保留 (hold) 套" "件。" -#: apt-pkg/algorithms.cc:1233 +#: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "無法修正問題，您保留 (hold) 了損毀的套件。" -#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 +#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2812,7 +2812,7 @@ msgstr "找不到安裝方式的驅動程式 %s。" msgid "Method %s did not start correctly" msgstr "安裝方式 %s 沒有正確啟動" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "請把標籤為 '%s' 的光碟放入 '%s' 裝置中，然後按下 [Enter] 鍵。" -- cgit v1.2.3 From 27cc55ee824913aa3687cc3adf91d96e89bd27d0 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 11 May 2013 10:10:07 +0200 Subject: non-inline RunGPGV methods to restore ABI compatibility with previous versions to fix partial upgrades (Closes: #707771) The rename in 0.9.7.9~exp2 moved the method body to the class definition which means it became inline, which isn't ABI compatibile. The reverse of moving inline to non-inline is safe though. --- apt-pkg/indexcopy.cc | 12 ++++++++++++ apt-pkg/indexcopy.h | 10 ++-------- debian/changelog | 9 +++++++++ 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index a262ef789..0e36b3ded 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -642,6 +642,18 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList, return true; } /*}}}*/ +// SigVerify::RunGPGV - deprecated wrapper calling ExecGPGV /*{{{*/ +bool SigVerify::RunGPGV(std::string const &File, std::string const &FileOut, + int const &statusfd, int fd[2]) { + ExecGPGV(File, FileOut, statusfd, fd); + return false; +}; +bool SigVerify::RunGPGV(std::string const &File, std::string const &FileOut, + int const &statusfd) { + ExecGPGV(File, FileOut, statusfd); + return false; +}; + /*}}}*/ bool TranslationsCopy::CopyTranslations(string CDROM,string Name, /*{{{*/ vector<string> &List, pkgCdromStatus *log) { diff --git a/apt-pkg/indexcopy.h b/apt-pkg/indexcopy.h index aa221158e..e6a07a887 100644 --- a/apt-pkg/indexcopy.h +++ b/apt-pkg/indexcopy.h @@ -100,15 +100,9 @@ class SigVerify /*{{{*/ std::vector<std::string> PkgList,std::vector<std::string> SrcList); __deprecated static bool RunGPGV(std::string const &File, std::string const &FileOut, - int const &statusfd, int fd[2]) { - ExecGPGV(File, FileOut, statusfd, fd); - return false; - }; + int const &statusfd, int fd[2]); __deprecated static bool RunGPGV(std::string const &File, std::string const &FileOut, - int const &statusfd = -1) { - ExecGPGV(File, FileOut, statusfd); - return false; - }; + int const &statusfd = -1); }; /*}}}*/ diff --git a/debian/changelog b/debian/changelog index d5ae8448b..6ccbd37c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +apt (0.9.8.1) UNRELEASED; urgency=low + + [ David Kalnischkies ] + * apt-pkg/indexcopy.cc: + - non-inline RunGPGV methods to restore ABI compatibility with previous + versions to fix partial upgrades (Closes: #707771) + + -- David Kalnischkies <kalnischkies@gmail.com> Sat, 11 May 2013 09:53:59 +0200 + apt (0.9.8) UNRELEASED; urgency=low [ Ludovico Cavedon ] -- cgit v1.2.3 From 1af6a591aeadb837b76d89dace9badf2d4fe5a0d Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@ubuntu.com> Date: Thu, 16 May 2013 14:22:12 +0200 Subject: moved to git, updated gbp.conf to match the bzr version --- debian/changelog | 3 +++ debian/control | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6ccbd37c4..f6ff44578 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,9 @@ apt (0.9.8.1) UNRELEASED; urgency=low * apt-pkg/indexcopy.cc: - non-inline RunGPGV methods to restore ABI compatibility with previous versions to fix partial upgrades (Closes: #707771) + + [ Michael Vogt ] + * moved to git, updated gbp.conf to match the bzr version -- David Kalnischkies <kalnischkies@gmail.com> Sat, 11 May 2013 09:53:59 +0200 diff --git a/debian/control b/debian/control index 6507f6d6d..1c32783ab 100644 --- a/debian/control +++ b/debian/control @@ -12,8 +12,8 @@ Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev, po4a (>= 0.34-2), autotools-dev, autoconf, automake Build-Depends-Indep: doxygen, debiandoc-sgml Build-Conflicts: autoconf2.13, automake1.4 -Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ -Vcs-Browser: http://bzr.debian.org/loggerhead/apt/debian-sid/ +Vcs-Bzr: http://git.debian.org/apt/apt.git +Vcs-Browser: http://git.debian.org/apt/apt.git Package: apt Architecture: any -- cgit v1.2.3 From 614e65dfc6b29b465eef749d7827f85ea39608a0 Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Thu, 16 May 2013 14:58:56 +0200 Subject: prepare upload --- .bzr-builddeb/default.conf | 6 ------ debian/changelog | 8 +++++--- 2 files changed, 5 insertions(+), 9 deletions(-) delete mode 100644 .bzr-builddeb/default.conf diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf deleted file mode 100644 index c33445b56..000000000 --- a/.bzr-builddeb/default.conf +++ /dev/null @@ -1,6 +0,0 @@ -[BUILDDEB] -native = true - -[HOOKS] -pre-export = ./prepare-release pre-export -post-build = ./prepare-release post-build diff --git a/debian/changelog b/debian/changelog index 625519fff..1aaa0794a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.9.8.1) UNRELEASED; urgency=low +apt (0.9.8.1) unstable; urgency=low [ David Kalnischkies ] * apt-pkg/indexcopy.cc: @@ -6,9 +6,11 @@ apt (0.9.8.1) UNRELEASED; urgency=low versions to fix partial upgrades (Closes: #707771) [ Michael Vogt ] - * moved to git, updated gbp.conf to match the bzr version + * moved source to http://git.debian.org/apt/apt.git + * updated gbp.conf to match what bzr-buildpackage is doing + * remove .bzr-buildpackage/default.conf (superseeded by gbp.conf) - -- David Kalnischkies <kalnischkies@gmail.com> Sat, 11 May 2013 09:53:59 +0200 + -- Michael Vogt <mvo@debian.org> Thu, 16 May 2013 14:50:43 +0200 apt (0.9.8) unstable; urgency=low -- cgit v1.2.3 From 8ffc2406c7fe05eb3db7f436967e8680deda0e5b Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Thu, 16 May 2013 15:02:24 +0200 Subject: update .gitignore --- .gitignore | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.gitignore b/.gitignore index d40fb818a..bcdb18914 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,15 @@ doc/pt_BR/ doc/examples/sources.list marks.bzr marks.git +debian/*.log +debian/*.substvars +debian/*.debhelper +debian/apt-doc +debian/apt +debian/apt-utils +debian/libapt-pkg4.12 +debian/libapt-inst1.5 +debian/libapt-pkg-dev +debian/libapt-pkg-doc +debian/apt-transport-https +debian/files -- cgit v1.2.3 From 26751d22f2043531fd4c7291b6f391cd27a25942 Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Thu, 16 May 2013 15:30:23 +0200 Subject: add export-dir and debian-branch --- debian/gbp.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/gbp.conf b/debian/gbp.conf index 1df123ac5..0d48f8317 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,3 +1,5 @@ [DEFAULT] prebuild = ./prepare-release pre-export postbuild = ./prepare-release post-build +export-dir = ../build-area +debian-branch = debian/sid -- cgit v1.2.3 From 572bad27ab2bbd8d643c81049f6596ed2b423166 Mon Sep 17 00:00:00 2001 From: Guillem Jover <guillem@debian.org> Date: Thu, 16 May 2013 19:45:25 +0200 Subject: Update Vcs fields Use the canonical URLs. Rename Vcs-Bzr to Vcs-Git and use the more efficient git protocol instead of http. Point Vcs-Browser to the gitweb interface. --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 1c32783ab..7730c2491 100644 --- a/debian/control +++ b/debian/control @@ -12,8 +12,8 @@ Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev, po4a (>= 0.34-2), autotools-dev, autoconf, automake Build-Depends-Indep: doxygen, debiandoc-sgml Build-Conflicts: autoconf2.13, automake1.4 -Vcs-Bzr: http://git.debian.org/apt/apt.git -Vcs-Browser: http://git.debian.org/apt/apt.git +Vcs-Git: git://anonscm.debian.org/apt/apt.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=apt/apt.git Package: apt Architecture: any -- cgit v1.2.3 From e62050a7d0c5f835bf44a0560180d763e7662f68 Mon Sep 17 00:00:00 2001 From: Christian PERRIER <bubulle@debian.org> Date: Thu, 16 May 2013 22:28:52 +0200 Subject: French translation : typo fix. Closes: #677272 --- debian/changelog | 7 +++++++ po/fr.po | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1aaa0794a..ad0f75883 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.9.8.2) UNRELEASED; urgency=low + + [ Programs translations ] + * French translation : typo fix. Closes: #677272 + + -- Christian Perrier <bubulle@debian.org> Thu, 16 May 2013 22:28:22 +0200 + apt (0.9.8.1) unstable; urgency=low [ David Kalnischkies ] diff --git a/po/fr.po b/po/fr.po index d22e96cf2..181735457 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-05-08 18:12+0200\n" "PO-Revision-Date: 2013-04-09 07:58+0200\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -1131,7 +1131,7 @@ msgstr "" " check - Vérifie qu'il n'y a pas de rupture de dépendances\n" " changelog - Télécharge et affiche le journal des modifications\n" " («  changelog ») du paquet indiqué\n" -" download - Télécharge le paquet dinaire dans le répertoire courant\n" +" download - Télécharge le paquet binaire dans le répertoire courant\n" "\n" "Options :\n" " -h Ce texte d'aide\n" -- cgit v1.2.3 From 81199bf040c2070f421ca5f0664700eaad2857d3 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode <jak@debian.org> Date: Thu, 16 May 2013 22:34:04 +0200 Subject: Update changelog to include Vcs-* changes --- debian/changelog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index ad0f75883..9aa4db7e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ apt (0.9.8.2) UNRELEASED; urgency=low [ Programs translations ] * French translation : typo fix. Closes: #677272 + [ Guillem Jover ] + * Update Vcs fields (Closes: #708562) + -- Christian Perrier <bubulle@debian.org> Thu, 16 May 2013 22:28:22 +0200 apt (0.9.8.1) unstable; urgency=low -- cgit v1.2.3 From 7bcb849733d67f60b3a10d423d558ff35bbcd7dc Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@ubuntu.com> Date: Thu, 16 May 2013 22:38:21 +0200 Subject: debian/gbp.conf: add debian-tag key to ensure git-dch works --- debian/gbp.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/gbp.conf b/debian/gbp.conf index 0d48f8317..db22e3e1e 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -3,3 +3,4 @@ prebuild = ./prepare-release pre-export postbuild = ./prepare-release post-build export-dir = ../build-area debian-branch = debian/sid +debian-tag = %(version)s -- cgit v1.2.3 From f431dc624a04b9280ddd5a6a839adc25ad621847 Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Thu, 16 May 2013 23:12:37 +0200 Subject: * buildlib/apti18n.h.in: - fix build failure when building without NLS (closes: #671587) --- buildlib/apti18n.h.in | 1 + debian/changelog | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/buildlib/apti18n.h.in b/buildlib/apti18n.h.in index 6928d626c..a9d48dd97 100644 --- a/buildlib/apti18n.h.in +++ b/buildlib/apti18n.h.in @@ -25,4 +25,5 @@ # define _(x) x # define P_(msg,plural,n) (n == 1 ? msg : plural) # define N_(x) x +# define dgettext(d, m) m #endif diff --git a/debian/changelog b/debian/changelog index 9aa4db7e3..f5be97bd3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,10 @@ apt (0.9.8.2) UNRELEASED; urgency=low [ Guillem Jover ] * Update Vcs fields (Closes: #708562) + + [ Michael Vogt ] + * buildlib/apti18n.h.in: + - fix build failure when building without NLS (closes: #671587) -- Christian Perrier <bubulle@debian.org> Thu, 16 May 2013 22:28:22 +0200 -- cgit v1.2.3 From 5de346684f6777eb9e2ac1a38d687c1bc50f35b0 Mon Sep 17 00:00:00 2001 From: Johan Kiviniemi <devel@johan.kiviniemi.name> Date: Wed, 22 May 2013 21:06:26 +0300 Subject: cmdline/apt-key: Create new keyrings with mode 0644 instead of 0600 --- cmdline/apt-key | 19 +++++++++++++++++++ debian/changelog | 3 +++ 2 files changed, 22 insertions(+) diff --git a/cmdline/apt-key b/cmdline/apt-key index c184e3e75..309c51b13 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -32,6 +32,16 @@ requires_root() { fi } +# gpg defaults to mode 0600 for new keyrings. Create one with 0644 instead. +init_keyring() { + for path; do + if ! [ -e "$path" ]; then + touch -- "$path" + chmod 0644 -- "$path" + fi + done +} + add_keys_with_verify_against_master_keyring() { ADD_KEYRING=$1 MASTER=$2 @@ -198,33 +208,42 @@ fi case "$command" in add) requires_root + init_keyring "$TRUSTEDFILE" $GPG --quiet --batch --import "$1" echo "OK" ;; del|rm|remove) requires_root + init_keyring "$TRUSTEDFILE" $GPG --quiet --batch --delete-key --yes "$1" echo "OK" ;; update) + init_keyring "$TRUSTEDFILE" update ;; net-update) + init_keyring "$TRUSTEDFILE" net_update ;; list) + init_keyring "$TRUSTEDFILE" $GPG --batch --list-keys ;; finger*) + init_keyring "$TRUSTEDFILE" $GPG --batch --fingerprint ;; export) + init_keyring "$TRUSTEDFILE" $GPG --armor --export "$1" ;; exportall) + init_keyring "$TRUSTEDFILE" $GPG --armor --export ;; adv*) + init_keyring "$TRUSTEDFILE" echo "Executing: $GPG $*" $GPG $* ;; diff --git a/debian/changelog b/debian/changelog index f5be97bd3..89da46ed1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,9 @@ apt (0.9.8.2) UNRELEASED; urgency=low * buildlib/apti18n.h.in: - fix build failure when building without NLS (closes: #671587) + [ Johan Kiviniemi ] + * cmdline/apt-key: Create new keyrings with mode 0644 instead of 0600. + -- Christian Perrier <bubulle@debian.org> Thu, 16 May 2013 22:28:22 +0200 apt (0.9.8.1) unstable; urgency=low -- cgit v1.2.3 From ecc46c1c42bb1aa59a0c8f0fb3eb12a5938da6ca Mon Sep 17 00:00:00 2001 From: Johan Kiviniemi <devel@johan.kiviniemi.name> Date: Wed, 22 May 2013 21:14:33 +0300 Subject: cmdline/apt-key: Accept nonexistent --keyring file with adv as well --- cmdline/apt-key | 2 +- debian/changelog | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cmdline/apt-key b/cmdline/apt-key index 309c51b13..2c087acbc 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -163,7 +163,7 @@ if [ "$1" = "--keyring" ]; then #echo "keyfile given" shift TRUSTEDFILE="$1" - if [ -r "$TRUSTEDFILE" ] || [ "$2" = 'add' ]; then + if [ -r "$TRUSTEDFILE" ] || [ "$2" = 'add' ] || [ "$2" = 'adv' ]; then GPG="$GPG --keyring $TRUSTEDFILE --primary-keyring $TRUSTEDFILE" else echo >&2 "Error: The specified keyring »$TRUSTEDFILE« is missing or not readable" diff --git a/debian/changelog b/debian/changelog index 89da46ed1..b3800fc42 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,7 +11,9 @@ apt (0.9.8.2) UNRELEASED; urgency=low - fix build failure when building without NLS (closes: #671587) [ Johan Kiviniemi ] - * cmdline/apt-key: Create new keyrings with mode 0644 instead of 0600. + * cmdline/apt-key: + - Create new keyrings with mode 0644 instead of 0600. + - Accept a nonexistent --keyring file with the adv subcommand as well. -- Christian Perrier <bubulle@debian.org> Thu, 16 May 2013 22:28:22 +0200 -- cgit v1.2.3 From e3b402f40373365e169f30d276e467f708074ffc Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Thu, 6 Jun 2013 18:17:14 +0200 Subject: fix double free (closes: #711045) --- apt-pkg/contrib/fileutl.cc | 7 +++++-- debian/changelog | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index f18e17005..46661887a 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -1424,8 +1424,11 @@ bool FileFd::Seek(unsigned long long To) return _error->Error("Reopen is only implemented for read-only files!"); } #ifdef HAVE_BZ2 - if (d->bz2 != NULL) - BZ2_bzclose(d->bz2); + if (d->bz2 != NULL) + { + BZ2_bzclose(d->bz2); + d->bz2 = NULL; + } #endif if (iFd != -1) close(iFd); diff --git a/debian/changelog b/debian/changelog index f5be97bd3..f0eb0421d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ apt (0.9.8.2) UNRELEASED; urgency=low [ Michael Vogt ] * buildlib/apti18n.h.in: - fix build failure when building without NLS (closes: #671587) + + [ Gregoire Menuel ] + * fix double free (closes: #711045) -- Christian Perrier <bubulle@debian.org> Thu, 16 May 2013 22:28:22 +0200 -- cgit v1.2.3 From 245ba2c306e663fb311b7796fdf13a7ae7073a4d Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Thu, 6 Jun 2013 18:20:35 +0200 Subject: Fix double free (closes: #711045) * Fix double free (closes: #711045) * Fix crash when the "mirror" method does not find any entry (closes: #699303) --- debian/changelog | 6 +++++- methods/mirror.cc | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f0eb0421d..e31070aec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,7 +11,11 @@ apt (0.9.8.2) UNRELEASED; urgency=low - fix build failure when building without NLS (closes: #671587) [ Gregoire Menuel ] - * fix double free (closes: #711045) + * Fix double free (closes: #711045) + + [ Raphael Geissert ] + * Fix crash when the "mirror" method does not find any entry + (closes: #699303) -- Christian Perrier <bubulle@debian.org> Thu, 16 May 2013 22:28:22 +0200 diff --git a/methods/mirror.cc b/methods/mirror.cc index d6c5ba955..854366318 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -311,6 +311,9 @@ bool MirrorMethod::InitMirrors() AllMirrors.push_back(s); } + if (AllMirrors.empty()) { + return _error->Error(_("No entry found in mirror file '%s'"), MirrorFile.c_str()); + } Mirror = AllMirrors[0]; UsedMirror = Mirror; return true; -- cgit v1.2.3 From 064235a63e4ef761ade3921bbf2d8c1f3718b980 Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Thu, 6 Jun 2013 19:15:52 +0200 Subject: prepare release --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e31070aec..450a9c382 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.9.8.2) UNRELEASED; urgency=low +apt (0.9.8.2) unstable; urgency=low [ Programs translations ] * French translation : typo fix. Closes: #677272 @@ -17,7 +17,7 @@ apt (0.9.8.2) UNRELEASED; urgency=low * Fix crash when the "mirror" method does not find any entry (closes: #699303) - -- Christian Perrier <bubulle@debian.org> Thu, 16 May 2013 22:28:22 +0200 + -- Michael Vogt <mvo@debian.org> Thu, 06 Jun 2013 19:15:14 +0200 apt (0.9.8.1) unstable; urgency=low -- cgit v1.2.3 From 4630a6ecd8f0cc21348f432b966e2bcb15f6859d Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sun, 19 May 2013 11:39:44 +0200 Subject: streamline .gitignore further adding some comments, regrouping files and use some patterns to avoid updating the ignore file for new translations or abi changes Git-Dch: Ignore --- .gitignore | 66 ++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 36 insertions(+), 30 deletions(-) diff --git a/.gitignore b/.gitignore index bcdb18914..e66f9df3b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,30 +1,36 @@ -aclocal.m4 -autom4te.cache/ -build/ -buildlib/config.guess -buildlib/config.sub -configure -debian/copyright -doc/de/ -doc/es/ -doc/fr/ -doc/it/ -doc/ja/ -doc/pl/ -doc/pt/ -doc/pt_BR/ -doc/examples/sources.list -marks.bzr -marks.git -debian/*.log -debian/*.substvars -debian/*.debhelper -debian/apt-doc -debian/apt -debian/apt-utils -debian/libapt-pkg4.12 -debian/libapt-inst1.5 -debian/libapt-pkg-dev -debian/libapt-pkg-doc -debian/apt-transport-https -debian/files +# build artifacts +/aclocal.m4 +/autom4te.cache/ +/build/ +/buildlib/config.guess +/buildlib/config.sub +/configure + +# copy of COPYING +/debian/copyright + +# generated files in the process to build all +# apt man pages and other documentation +/doc/*/ +!/doc/examples/ +!/doc/po/ + +# package building artifacts +/debian/*.log +/debian/*.substvars +/debian/*.debhelper +/debian/files +/debian/apt/ +/debian/apt-doc/ +/debian/apt-utils/ +/debian/libapt-pkg*/ +/debian/libapt-inst*/ +/debian/libapt-pkg-dev/ +/debian/libapt-pkg-doc/ +/debian/apt-transport-https/ + +# generated from *.in files +/doc/examples/sources.list +/debian/libapt-pkg*.install +/debian/libapt-inst*.install +/debian/libapt-pkg-dev.install -- cgit v1.2.3 From ac62eb38b0bca7a45835903eb421c19f4f78aca3 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sun, 19 May 2013 15:49:24 +0200 Subject: build the en manpages in subdirectory doc/en Building manpages becames more consistent this way and it is simpler to ignore build artefacts, too. --- .gitignore | 1 + buildlib/po4a_manpage.mak | 12 ++++---- debian/changelog | 7 +++++ debian/rules | 4 +-- doc/en/makefile | 38 +++++++++++++++++++++++++ doc/makefile | 72 +++++++++++++---------------------------------- 6 files changed, 74 insertions(+), 60 deletions(-) create mode 100644 doc/en/makefile diff --git a/.gitignore b/.gitignore index e66f9df3b..3e07e241b 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ /doc/*/ !/doc/examples/ !/doc/po/ +!/doc/en/makefile # package building artifacts /debian/*.log diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak index 09eca0ec2..1e778cf11 100644 --- a/buildlib/po4a_manpage.mak +++ b/buildlib/po4a_manpage.mak @@ -25,6 +25,7 @@ $(LOCAL)-LIST := $(SOURCE) # Install generation hooks manpages: $($(LOCAL)-LIST) +clean: clean/$(LOCAL) veryclean: veryclean/$(LOCAL) apt-verbatim.ent: ../apt-verbatim.ent @@ -37,15 +38,16 @@ manpage-style.xsl: ../manpage-style.xsl $($(LOCAL)-LIST) :: % : %.xml $(STYLESHEET) $(INCLUDES) echo Creating man page $@ $(XSLTPROC) -o $@ $(STYLESHEET) $< || exit 200 # why xsltproc doesn't respect the -o flag here??? - test -f $(subst .$(LC),,$@) || echo FIXME: xsltproc respect the -o flag now, workaround can be removed + test -f $(subst .$(LC),,$@) || echo 'FIXME: xsltproc respects the -o flag now, workaround can be removed' mv -f $(subst .$(LC),,$@) $@ # Clean rule -.PHONY: veryclean/$(LOCAL) +.PHONY: clean/$(LOCAL) veryclean/$(LOCAL) +clean/$(LOCAL): + rm -f $($(@F)-LIST) apt.ent apt-verbatim.ent veryclean/$(LOCAL): - -rm -rf $($(@F)-LIST) apt.ent apt-verbatim.ent apt.$(LC).8 \ - $(addsuffix .xml,$($(@F)-LIST)) \ - offline.$(LC).sgml guide.$(LC).sgml + # we are nuking the directory we are working in as it is auto-generated + rm -rf $(shell readlink -f .) HAVE_PO4A=yes endif diff --git a/debian/changelog b/debian/changelog index aa8553251..1a8604e09 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.9.8.3) UNRELEASED; urgency=low + + [ David Kalnischkies ] + * build the en manpages in subdirectory doc/en + + -- David Kalnischkies <kalnischkies@gmail.com> Sun, 09 Jun 2013 15:06:24 +0200 + apt (0.9.8.2) unstable; urgency=low [ Programs translations ] diff --git a/debian/rules b/debian/rules index 5051dab4f..79a6dbe0c 100755 --- a/debian/rules +++ b/debian/rules @@ -203,7 +203,7 @@ apt: build build-manpages dh_bugfiles -p$@ dh_lintian -p$@ dh_installexamples -p$@ $(BLD)/docs/examples/* - dh_installman -p$@ $(wildcard $(patsubst %,doc/%.[158],$(apt_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt_MANPAGES))) + dh_installman -p$@ $(wildcard $(patsubst %,doc/en/%.[158],$(apt_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt_MANPAGES))) dh_installcron -p$@ dh_installdocs -p$@ dh_installchangelogs -p$@ @@ -253,7 +253,7 @@ apt-utils: build build-manpages dh_installexamples -p$@ # Install the man pages.. - dh_installman -p$@ $(wildcard $(patsubst %,doc/%.[158],$(apt-utils_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt-utils_MANPAGES))) + dh_installman -p$@ $(wildcard $(patsubst %,doc/en/%.[158],$(apt-utils_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt-utils_MANPAGES))) dh_installchangelogs -p$@ dh_strip -p$@ diff --git a/doc/en/makefile b/doc/en/makefile new file mode 100644 index 000000000..a4fb232d4 --- /dev/null +++ b/doc/en/makefile @@ -0,0 +1,38 @@ +# -*- make -*- +BASE=../.. +SUBDIR=doc/en + +# Bring in the default rules +include ../../buildlib/defaults.mak + +# Do not use XMLTO, build the manpages directly with XSLTPROC +ifdef XSLTPROC +# generate a list of accepted man page translations +SOURCE = $(patsubst ../%.xml,%,$(wildcard ../*.?.xml)) +INCLUDES = ../apt.ent ../apt-verbatim.ent +STYLESHEET=../manpage-style.xsl + +LOCAL := manpage-$(firstword $(SOURCE)) +$(LOCAL)-LIST := $(SOURCE) + +# Install generation hooks +manpages: $($(LOCAL)-LIST) apt.8 + +$($(LOCAL)-LIST) :: % : ../%.xml $(STYLESHEET) $(INCLUDES) + echo Creating man page $@ + $(XSLTPROC) -o $@ $(STYLESHEET) $< + +apt.8: ../apt.8 + cp -a ../apt.8 apt.8 + +# Clean rule +.PHONY: clean/$(LOCAL) +veryclean: clean/$(LOCAL) +clean: clean/$(LOCAL) +clean/$(LOCAL): + -rm -rf $($(@F)-LIST) apt.8 +endif + +# Chain to the manpage rule +SOURCE = apt.8 +include $(MANPAGE_H) diff --git a/doc/makefile b/doc/makefile index be8357d80..44a22a597 100644 --- a/doc/makefile +++ b/doc/makefile @@ -1,7 +1,6 @@ # -*- make -*- BASE=.. SUBDIR=doc -SUBDIRS= $(dir $(wildcard */makefile)) # Bring in the default rules include ../buildlib/defaults.mak @@ -13,34 +12,6 @@ include $(DEBIANDOC_H) doc: manpages debiandoc -# Do not use XMLTO, build the manpages directly with XSLTPROC -ifdef XSLTPROC -# generate a list of accepted man page translations -SOURCE = $(patsubst %.xml,%,$(wildcard *.?.xml)) -INCLUDES = apt.ent apt-verbatim.ent -STYLESHEET=manpage-style.xsl - -LOCAL := manpage-$(firstword $(SOURCE)) -$(LOCAL)-LIST := $(SOURCE) - -# Install generation hooks -manpages: $($(LOCAL)-LIST) - -$($(LOCAL)-LIST) :: % : %.xml $(STYLESHEET) $(INCLUDES) - echo Creating man page $@ - $(XSLTPROC) -o $@ $(STYLESHEET) $< - -# Clean rule -.PHONY: veryclean/$(LOCAL) -veryclean: veryclean/$(LOCAL) -veryclean/$(LOCAL): - -rm -rf $($(@F)-LIST) -endif - -# Chain to the manpage rule -SOURCE = apt.8 -include $(MANPAGE_H) - examples/sources.list: examples/sources.list.in apt-verbatim.ent sed -e 's#&stable-codename;#$(shell grep --max-count=1 '^<!ENTITY stable-codename "' apt-verbatim.ent | cut -d'"' -f 2)#g' examples/sources.list.in > examples/sources.list @@ -50,42 +21,43 @@ TO = $(DOC) TARGET = binary include $(COPY_H) -.PHONY: clean clean-subdirs veryclean veryclean-subdirs all binary doc stats +.PHONY: clean clean/subdirs veryclean veryclean/subdirs manpages/subdirs debiandoc/subdirs all binary doc stats -clean: clean-subdirs -veryclean: veryclean-subdirs +clean: clean/subdirs +veryclean: veryclean/subdirs +manpages: manpages/subdirs +debiandoc: debiandoc/subdirs -clean-subdirs: - for dir in $(SUBDIRS); do\ - $(MAKE) -C $$dir clean; \ - done +DOCUMENTATIONPO = $(patsubst %.po,%,$(notdir $(wildcard po/*.po))) +DOCDIRLIST = $(addsuffix /makefile,$(DOCUMENTATIONPO)) -veryclean-subdirs: - for dir in $(SUBDIRS); do\ - rm -rf $$dir; \ +dirs: $(DOCDIRLIST) +$(DOCDIRLIST) :: %/makefile : lang.makefile + test -d $(dir $@) || mkdir $(dir $@) + sed "s#@@LANG@@#$(subst /,,$(dir $@))#" $< > $@ + +debiandoc/subdirs manpages/subdirs clean/subdirs veryclean/subdirs: dirs + for dir in en $(dir $(DOCDIRLIST)); do \ + $(MAKE) -C $$dir $(patsubst %/subdirs,%,$@); \ done stats: for i in po/*.po; do echo -n "$$i: "; msgfmt --output-file=/dev/null --statistics $$i; done ifdef PO4A -DOCUMENTATIONPO = $(patsubst %.po,%,$(notdir $(wildcard po/*.po))) MANPAGEPOLIST = $(addprefix manpages-translation-,$(DOCUMENTATIONPO)) DEBIANDOCPOLIST = $(addprefix debiandoc-translation-,$(DOCUMENTATIONPO)) -MANPAGEDIRLIST = $(addsuffix /makefile,$(DOCUMENTATIONPO)) +.PHONY: update-po po4a $(MANPAGEPOLIST) $(DEBIANDOCPOLIST) $(DOCDIRLIST) -.PHONY: update-po po4a $(MANPAGEPOLIST) $(MANPAGEDIRLIST) - -manpages: $(MANPAGEPOLIST) -debiandoc: $(DEBIANDOCPOLIST) -po4a: $(MANPAGEPOLIST) $(DEBIANDOCPOLIST) +po4a: manpages/subdirs debiandoc/subdirs update-po: po4a --previous --no-backups --force --no-translations \ --package-name='$(PACKAGE)-doc' --package-version='$(PACKAGE_VERSION)' \ --msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf +manpages/subdirs: $(MANPAGEPOLIST) $(MANPAGEPOLIST) :: manpages-translation-% : %/makefile po4a.conf # first line is for apt.8 (see Bug#696923) po4a --previous --no-backups --translate-only $(dir $<)apt.ent \ @@ -100,19 +72,13 @@ $(MANPAGEPOLIST) :: manpages-translation-% : %/makefile po4a.conf $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.8.xml,%.$(subst /,,$(dir $<)).8.xml,$(wildcard *.8.xml))) \ --package-name='$(PACKAGE)-doc' --package-version='$(PACKAGE_VERSION)' \ --msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf - $(MAKE) -C $(dir $<) manpages +debiandoc/subdirs: $(DEBIANDOCPOLIST) $(DEBIANDOCPOLIST) :: debiandoc-translation-% : %/makefile po4a.conf po4a --previous --no-backups --translate-only $(dir $<)apt.ent \ $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.sgml,%.$(subst /,,$(dir $<)).sgml,$(wildcard *.sgml))) \ --package-name='$(PACKAGE)-doc' --package-version='$(PACKAGE_VERSION)' \ --msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf - $(MAKE) -C $(dir $<) debiandoc - -dirs: $(MANPAGEDIRLIST) -$(MANPAGEDIRLIST) :: %/makefile : lang.makefile - test -d $(dir $@) || mkdir $(dir $@) - sed "s#@@LANG@@#$(subst /,,$(dir $@))#" $< > $@ endif ifdef DOXYGEN -- cgit v1.2.3 From 3a61adbba8bfc9ba76d1262e0e8118f78920f9fe Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sun, 19 May 2013 18:53:19 +0200 Subject: remove -ldl from cdrom and -lutil from apt-get linkage Building src:apt shows: dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/apt/usr/lib/apt/methods/cdrom was not linked against libdl.so.2 (it uses none of the library's symbols) dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/apt/usr/bin/apt-get was not linked against libutil.so.1 (it uses none of the library's symbols) --- cmdline/makefile | 2 +- debian/changelog | 2 +- methods/makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmdline/makefile b/cmdline/makefile index f3712232a..460a71240 100644 --- a/cmdline/makefile +++ b/cmdline/makefile @@ -14,7 +14,7 @@ include $(PROGRAM_H) # The apt-get program PROGRAM=apt-get -SLIBS = -lapt-pkg -lutil $(INTLLIBS) +SLIBS = -lapt-pkg $(INTLLIBS) LIB_MAKES = apt-pkg/makefile SOURCE = apt-get.cc acqprogress.cc include $(PROGRAM_H) diff --git a/debian/changelog b/debian/changelog index 1a8604e09..662289fba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ apt (0.9.8.3) UNRELEASED; urgency=low [ David Kalnischkies ] * build the en manpages in subdirectory doc/en + * remove -ldl from cdrom and -lutil from apt-get linkage -- David Kalnischkies <kalnischkies@gmail.com> Sun, 09 Jun 2013 15:06:24 +0200 @@ -24,7 +25,6 @@ apt (0.9.8.2) unstable; urgency=low * Fix crash when the "mirror" method does not find any entry (closes: #699303) - [ Johan Kiviniemi ] * cmdline/apt-key: - Create new keyrings with mode 0644 instead of 0600. diff --git a/methods/makefile b/methods/makefile index a271aff5e..294c55d23 100644 --- a/methods/makefile +++ b/methods/makefile @@ -39,7 +39,7 @@ include $(PROGRAM_H) # The cdrom method PROGRAM=cdrom -SLIBS = -lapt-pkg -ldl $(INTLLIBS) +SLIBS = -lapt-pkg $(INTLLIBS) LIB_MAKES = apt-pkg/makefile SOURCE = cdrom.cc include $(PROGRAM_H) -- cgit v1.2.3 From 2de7157775551185beb3d7cb56e9f9f353e57ab4 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 21 May 2013 00:05:14 +0200 Subject: rewrite pkgOrderList::DepRemove to stop incorrect immediate setting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some squeeze → wheezy upgrades indicate that DepRemove runs amok in complicated setups as it wasn't correctly working with or-groups. Completely rewritten the check is now moving from or-group to or-group instead. The behavior should be the same as the code before, but (hopefully) with less bugs and more comments. Closes: 645713 --- apt-pkg/orderlist.cc | 219 ++++++++++++++++++++++++--------------------------- debian/changelog | 2 + 2 files changed, 105 insertions(+), 116 deletions(-) diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc index 80d8fd490..86d2a9478 100644 --- a/apt-pkg/orderlist.cc +++ b/apt-pkg/orderlist.cc @@ -893,149 +893,136 @@ bool pkgOrderList::DepConfigure(DepIterator D) /*}}}*/ // OrderList::DepRemove - Removal ordering /*{{{*/ // --------------------------------------------------------------------- -/* Removal visits all reverse depends. It considers if the dependency - of the Now state version to see if it is okay with removing this - package. This check should always fail, but is provided for symetery - with the other critical handlers. - - Loops are preprocessed and logged. Removal loops can also be - detected in the critical handler. They are characterized by an - old version of A depending on B but the new version of A conflicting - with B, thus either A or B must break to install. */ -bool pkgOrderList::DepRemove(DepIterator D) +/* Checks all given dependencies if they are broken by the remove of a + package and if so fix it by visiting another provider or or-group + member to ensure that the dependee keeps working which is especially + important for Immediate packages like e.g. those depending on an + awk implementation. If the dependency can't be fixed with another + package this means an upgrade of the package will solve the problem. */ +bool pkgOrderList::DepRemove(DepIterator Broken) { - if (D.Reverse() == false) + if (Broken.Reverse() == false) return true; - for (; D.end() == false; ++D) - if (D->Type == pkgCache::Dep::Depends || D->Type == pkgCache::Dep::PreDepends) + + for (; Broken.end() == false; ++Broken) + { + if (Broken->Type != pkgCache::Dep::Depends && + Broken->Type != pkgCache::Dep::PreDepends) + continue; + + PkgIterator BrokenPkg = Broken.ParentPkg(); + // uninstalled packages can't break via a remove + if (BrokenPkg->CurrentVer == 0) + continue; + + // if its already added, we can't do anything useful + if (IsFlag(BrokenPkg, AddPending) == true || IsFlag(BrokenPkg, Added) == true) + continue; + + // if the dependee is going to be removed, visit it now + if (Cache[BrokenPkg].Delete() == true) + return VisitNode(BrokenPkg, "Remove-Dependee"); + + // The package stays around, so find out how this is possible + for (DepIterator D = BrokenPkg.CurrentVer().DependsList(); D.end() == false;) { - // Duplication elimination, consider the current version only - if (D.ParentPkg().CurrentVer() != D.ParentVer()) + // only important or-groups need fixing + if (D->Type != pkgCache::Dep::Depends && + D->Type != pkgCache::Dep::PreDepends) + { + ++D; continue; + } - /* We wish to see if the dep on the parent package is okay - in the removed (install) state of the target pkg. */ - bool tryFixDeps = false; - if (CheckDep(D) == true) + // Start is the beginning of the or-group, D is the first one after or + DepIterator Start = D; + bool foundBroken = false; + for (bool LastOR = true; D.end() == false && LastOR == true; ++D) { - // We want to catch loops with the code below. - if (IsFlag(D.ParentPkg(),AddPending) == false) - continue; + LastOR = (D->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or; + if (D == Broken) + foundBroken = true; } - else - tryFixDeps = true; - // This is the loop detection - if (IsFlag(D.ParentPkg(),Added) == true || - IsFlag(D.ParentPkg(),AddPending) == true) - { - if (IsFlag(D.ParentPkg(),AddPending) == true) - AddLoop(D); + // this or-group isn't the broken one: keep searching + if (foundBroken == false) continue; + + // iterate over all members of the or-group searching for a ready replacement + bool readyReplacement = false; + for (DepIterator OrMember = Start; OrMember != D && readyReplacement == false; ++OrMember) + { + Version ** Replacements = OrMember.AllTargets(); + for (Version **R = Replacements; *R != 0; ++R) + { + VerIterator Ver(Cache,*R); + // only currently installed packages can be a replacement + PkgIterator RPkg = Ver.ParentPkg(); + if (RPkg.CurrentVer() != Ver) + continue; + + // packages going to be removed can't be a replacement + if (Cache[RPkg].Delete() == true) + continue; + + readyReplacement = true; + break; + } + delete[] Replacements; } - if (tryFixDeps == true) + // something else is ready to take over, do nothing + if (readyReplacement == true) + continue; + + // see if we can visit a replacement + bool visitReplacement = false; + for (DepIterator OrMember = Start; OrMember != D && visitReplacement == false; ++OrMember) { - for (pkgCache::DepIterator F = D.ParentPkg().CurrentVer().DependsList(); - F.end() == false; ++F) + Version ** Replacements = OrMember.AllTargets(); + for (Version **R = Replacements; *R != 0; ++R) { - if (F->Type != pkgCache::Dep::Depends && F->Type != pkgCache::Dep::PreDepends) + VerIterator Ver(Cache,*R); + // consider only versions we plan to install + PkgIterator RPkg = Ver.ParentPkg(); + if (Cache[RPkg].Install() == false || Cache[RPkg].InstallVer != Ver) continue; - // Check the Providers - if (F.TargetPkg()->ProvidesList != 0) - { - pkgCache::PrvIterator Prov = F.TargetPkg().ProvidesList(); - for (; Prov.end() == false; ++Prov) - { - pkgCache::PkgIterator const P = Prov.OwnerPkg(); - if (IsFlag(P, InList) == true && - IsFlag(P, AddPending) == true && - IsFlag(P, Added) == false && - Cache[P].InstallVer == 0) - break; - } - if (Prov.end() == false) - for (pkgCache::PrvIterator Prv = F.TargetPkg().ProvidesList(); - Prv.end() == false; ++Prv) - { - pkgCache::PkgIterator const P = Prv.OwnerPkg(); - if (IsFlag(P, InList) == true && - IsFlag(P, AddPending) == false && - Cache[P].InstallVer != 0 && - VisitNode(P, "Remove-P") == true) - { - Flag(P, Immediate); - tryFixDeps = false; - break; - } - } - if (tryFixDeps == false) - break; - } - // Check for Or groups - if ((F->CompareOp & pkgCache::Dep::Or) != pkgCache::Dep::Or) + // loops are not going to help us, so don't create them + if (IsFlag(RPkg, AddPending) == true) continue; - // Lets see if the package is part of the Or group - pkgCache::DepIterator S = F; - for (; S.end() == false; ++S) + + if (IsMissing(RPkg) == true) + continue; + + visitReplacement = true; + if (IsFlag(BrokenPkg, Immediate) == false) { - if (S.TargetPkg() == D.TargetPkg()) + if (VisitNode(RPkg, "Remove-Rep") == true) break; - if ((S->CompareOp & pkgCache::Dep::Or) != pkgCache::Dep::Or || - CheckDep(S)) // Or group is satisfied by another package - for (;S.end() == false; ++S); } - if (S.end() == true) - continue; - // skip to the end of the or group - for (;S.end() == false && (S->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or; ++S); - ++S; - // The soon to be removed is part of the Or group - // start again in the or group and find something which will serve as replacement - for (; F.end() == false && F != S; ++F) + else { - if (IsFlag(F.TargetPkg(), InList) == true && - IsFlag(F.TargetPkg(), AddPending) == false && - Cache[F.TargetPkg()].InstallVer != 0 && - VisitNode(F.TargetPkg(), "Remove-Target") == true) - { - Flag(F.TargetPkg(), Immediate); - tryFixDeps = false; + Flag(RPkg, Immediate); + if (VisitNode(RPkg, "Remove-ImmRep") == true) break; - } - else if (F.TargetPkg()->ProvidesList != 0) - { - pkgCache::PrvIterator Prv = F.TargetPkg().ProvidesList(); - for (; Prv.end() == false; ++Prv) - { - if (IsFlag(Prv.OwnerPkg(), InList) == true && - IsFlag(Prv.OwnerPkg(), AddPending) == false && - Cache[Prv.OwnerPkg()].InstallVer != 0 && - VisitNode(Prv.OwnerPkg(), "Remove-Owner") == true) - { - Flag(Prv.OwnerPkg(), Immediate); - tryFixDeps = false; - break; - } - } - if (Prv.end() == false) - break; - } } - if (tryFixDeps == false) - break; + visitReplacement = false; } + delete[] Replacements; } - - // Skip over missing files - if (IsMissing(D.ParentPkg()) == true) + if (visitReplacement == true) continue; - - if (VisitNode(D.ParentPkg(), "Remove-Parent") == false) + + // the broken package in current version can't be fixed, so install new version + if (IsMissing(BrokenPkg) == true) + break; + + if (VisitNode(BrokenPkg, "Remove-Upgrade") == false) return false; } - + } + return true; } /*}}}*/ diff --git a/debian/changelog b/debian/changelog index 662289fba..d7c3494ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ apt (0.9.8.3) UNRELEASED; urgency=low [ David Kalnischkies ] * build the en manpages in subdirectory doc/en * remove -ldl from cdrom and -lutil from apt-get linkage + * rewrite pkgOrderList::DepRemove to stop incorrect immediate setting + (Closes: 645713) -- David Kalnischkies <kalnischkies@gmail.com> Sun, 09 Jun 2013 15:06:24 +0200 -- cgit v1.2.3 From 978844db25deb7cd88b053bc2f4685caf2c61a75 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 21 May 2013 17:10:21 +0200 Subject: prefer Essentials over Removals in ordering score Doing Removes early is good to have them out of the way, so they don't break 'Inst' or 'Conf' chains, but scoring them above Essentials means that we end up upgrading (many) less important packages before we handle big stuff like libc6 or debconf which not only fails if those less important packages have unannounced (strict) dependencies, but also leads to having these packages unconfigured for a long time triggering bugs in maintainer scripts for no good reason (#708831). So this commits sets the default value for remove scores to 100, which is below the one for essentials (200) and a lot lower than the previous default value (500). --- apt-pkg/orderlist.cc | 5 ++--- debian/changelog | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc index 86d2a9478..984ae1d10 100644 --- a/apt-pkg/orderlist.cc +++ b/apt-pkg/orderlist.cc @@ -301,9 +301,8 @@ bool pkgOrderList::OrderConfigure() /* Higher scores order earlier */ int pkgOrderList::Score(PkgIterator Pkg) { - static int const ScoreDelete = _config->FindI("OrderList::Score::Delete", 500); - - // Removal is always done first + // Removals should be done after we dealt with essentials + static int const ScoreDelete = _config->FindI("OrderList::Score::Delete", 100); if (Cache[Pkg].Delete() == true) return ScoreDelete; diff --git a/debian/changelog b/debian/changelog index d7c3494ce..f57a8334f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ apt (0.9.8.3) UNRELEASED; urgency=low * remove -ldl from cdrom and -lutil from apt-get linkage * rewrite pkgOrderList::DepRemove to stop incorrect immediate setting (Closes: 645713) + * prefer Essentials over Removals in ordering score -- David Kalnischkies <kalnischkies@gmail.com> Sun, 09 Jun 2013 15:06:24 +0200 -- cgit v1.2.3 From 69335858269845904635c592268cf9519e75c1a9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 21 May 2013 18:06:17 +0200 Subject: fix priority sorting by prefering higher in MarkInstall Used to work until a certain (here unnamed) person came along and used the wrong operator causing low-priority packages to be sorted above high-priority packages while choosing a provider in commit 2b5c35c7bb915dbd46fefd7c79f05364ba22f93b from Nov 2011 --- apt-pkg/depcache.cc | 2 +- debian/changelog | 1 + .../test-prefer-higher-priority-providers | 36 ++++++++++++++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100755 test/integration/test-prefer-higher-priority-providers diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 6a3e9bfc4..5ca0c2ea5 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1004,7 +1004,7 @@ struct CompareProviders { } // higher priority seems like a good idea if (AV->Priority != BV->Priority) - return AV->Priority < BV->Priority; + return AV->Priority > BV->Priority; // prefer native architecture if (strcmp(A.Arch(), B.Arch()) != 0) { diff --git a/debian/changelog b/debian/changelog index f57a8334f..af606453d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ apt (0.9.8.3) UNRELEASED; urgency=low * rewrite pkgOrderList::DepRemove to stop incorrect immediate setting (Closes: 645713) * prefer Essentials over Removals in ordering score + * fix priority sorting by prefering higher in MarkInstall -- David Kalnischkies <kalnischkies@gmail.com> Sun, 09 Jun 2013 15:06:24 +0200 diff --git a/test/integration/test-prefer-higher-priority-providers b/test/integration/test-prefer-higher-priority-providers new file mode 100755 index 000000000..66458bee0 --- /dev/null +++ b/test/integration/test-prefer-higher-priority-providers @@ -0,0 +1,36 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework +setupenvironment +configarchitecture 'native' + +insertpackage 'unstable' 'foo' 'all' '1' 'Provides: stuff' 'important' +insertpackage 'unstable' 'bar' 'all' '1' 'Provides: stuff' 'optional' +insertpackage 'unstable' 'baz' 'all' '1' 'Provides: stuff' 'extra' +insertpackage 'unstable' 'awesome' 'all' '1' 'Depends: stuff' + +setupaptarchive + +testequal 'Reading package lists... +Building dependency tree... +The following extra packages will be installed: + foo +The following NEW packages will be installed: + awesome foo +0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +Inst foo (1 unstable [all]) +Inst awesome (1 unstable [all]) +Conf foo (1 unstable [all]) +Conf awesome (1 unstable [all])' aptget install awesome -s + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + awesome foo +0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +Inst foo (1 unstable [all]) +Inst awesome (1 unstable [all]) +Conf foo (1 unstable [all]) +Conf awesome (1 unstable [all])' aptget install awesome foo -s -- cgit v1.2.3 From 66706285737a895d0baf64c2387c58d5211be4f9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 21 May 2013 21:50:30 +0200 Subject: try all providers in order if uninstallable in MarkInstall --- apt-pkg/depcache.cc | 18 ++++-- debian/changelog | 1 + .../test-prefer-higher-priority-providers | 70 ++++++++++++++++++++++ 3 files changed, 84 insertions(+), 5 deletions(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 5ca0c2ea5..5bed10d95 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1200,16 +1200,23 @@ bool pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, verlist.insert(Cand); } CompareProviders comp(Start); - APT::VersionList::iterator InstVer = std::max_element(verlist.begin(), verlist.end(), comp); - if (InstVer != verlist.end()) - { + do { + APT::VersionList::iterator InstVer = std::max_element(verlist.begin(), verlist.end(), comp); + + if (InstVer == verlist.end()) + break; + pkgCache::PkgIterator InstPkg = InstVer.ParentPkg(); if(DebugAutoInstall == true) std::clog << OutputInDepth(Depth) << "Installing " << InstPkg.Name() << " as " << Start.DepType() << " of " << Pkg.Name() << std::endl; - MarkInstall(InstPkg, true, Depth + 1, false, ForceImportantDeps); + if (MarkInstall(InstPkg, true, Depth + 1, false, ForceImportantDeps) == false) + { + verlist.erase(InstVer); + continue; + } // now check if we should consider it a automatic dependency or not if(InstPkg->CurrentVer == 0 && Pkg->Section != 0 && ConfigValueInSubTree("APT::Never-MarkAuto-Sections", Pkg.Section())) { @@ -1218,7 +1225,8 @@ bool pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, << Start.DepType() << " of pkg in APT::Never-MarkAuto-Sections)" << std::endl; MarkAuto(InstPkg, false); } - } + break; + } while(true); continue; } /* Negative dependencies have no or-group diff --git a/debian/changelog b/debian/changelog index af606453d..b64a57bef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ apt (0.9.8.3) UNRELEASED; urgency=low (Closes: 645713) * prefer Essentials over Removals in ordering score * fix priority sorting by prefering higher in MarkInstall + * try all providers in order if uninstallable in MarkInstall -- David Kalnischkies <kalnischkies@gmail.com> Sun, 09 Jun 2013 15:06:24 +0200 diff --git a/test/integration/test-prefer-higher-priority-providers b/test/integration/test-prefer-higher-priority-providers index 66458bee0..64b901dd0 100755 --- a/test/integration/test-prefer-higher-priority-providers +++ b/test/integration/test-prefer-higher-priority-providers @@ -34,3 +34,73 @@ Inst foo (1 unstable [all]) Inst awesome (1 unstable [all]) Conf foo (1 unstable [all]) Conf awesome (1 unstable [all])' aptget install awesome foo -s + +testequal "Reading package lists... +Building dependency tree... +Package 'bar' is not installed, so not removed +Package 'baz' is not installed, so not removed +The following extra packages will be installed: + foo +The following NEW packages will be installed: + awesome foo +0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +Inst foo (1 unstable [all]) +Inst awesome (1 unstable [all]) +Conf foo (1 unstable [all]) +Conf awesome (1 unstable [all])" aptget install awesome bar- baz- -s + +testequal "Reading package lists... +Building dependency tree... +Package 'foo' is not installed, so not removed +The following extra packages will be installed: + bar +The following NEW packages will be installed: + awesome bar +0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +Inst bar (1 unstable [all]) +Inst awesome (1 unstable [all]) +Conf bar (1 unstable [all]) +Conf awesome (1 unstable [all])" aptget install awesome foo- -s + +testequal "Reading package lists... +Building dependency tree... +Package 'foo' is not installed, so not removed +Package 'baz' is not installed, so not removed +The following extra packages will be installed: + bar +The following NEW packages will be installed: + awesome bar +0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +Inst bar (1 unstable [all]) +Inst awesome (1 unstable [all]) +Conf bar (1 unstable [all]) +Conf awesome (1 unstable [all])" aptget install awesome foo- baz- -s + +testequal "Reading package lists... +Building dependency tree... +Package 'foo' is not installed, so not removed +Package 'bar' is not installed, so not removed +The following extra packages will be installed: + baz +The following NEW packages will be installed: + awesome baz +0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +Inst baz (1 unstable [all]) +Inst awesome (1 unstable [all]) +Conf baz (1 unstable [all]) +Conf awesome (1 unstable [all])" aptget install awesome foo- bar- -s + +testequal "Reading package lists... +Building dependency tree... +Package 'foo' is not installed, so not removed +Package 'bar' is not installed, so not removed +Package 'baz' is not installed, so not removed +Some packages could not be installed. This may mean that you have +requested an impossible situation or if you are using the unstable +distribution that some required packages have not yet been created +or been moved out of Incoming. +The following information may help to resolve the situation: + +The following packages have unmet dependencies: + awesome : Depends: stuff +E: Unable to correct problems, you have held broken packages." aptget install awesome foo- bar- baz- -s -- cgit v1.2.3 From 42d51f333e8ef522fed02cdfc48663488d56c3a3 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Thu, 23 May 2013 12:14:56 +0200 Subject: do unpacks before configures in SmartConfigure MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Splits the big loop over dependencies in SmartConfigure which unpacks and configures dependencies into two loops and reverse their order, so that all dependencies which need to be unpacked are handled first and only after that configures are issued for dependencies. This is needed as otherwise the unpack of a (new) dependency will be issued in between a configure call for two (or more) packages which form a loop, which means the configure calls aren't part of the same dpkg call and therefore dpkg bails out. Such tight loops should really be avoided as they are usually wrong – and in reality the dependencies in libreoffice were greatly simplified thanks to Rene Engelhard so the problem is gone for the benefit of all. Closes: 707578 --- apt-pkg/packagemanager.cc | 113 +++++++++++++-------- debian/changelog | 1 + ...ight-loop-configure-with-unpacking-new-packages | 46 +++++++++ 3 files changed, 115 insertions(+), 45 deletions(-) create mode 100755 test/integration/test-very-tight-loop-configure-with-unpacking-new-packages diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index e2d7dbf2a..b8932753d 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -340,6 +340,7 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth) bool Bad = false, Changed = false; const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 500); unsigned int i=0; + std::list<DepIterator> needConfigure; do { Changed = false; @@ -353,7 +354,7 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth) continue; Bad = true; - // Search for dependencies which are unpacked but aren't configured yet (maybe loops) + // Check for dependencies that have not been unpacked, probably due to loops. for (DepIterator Cur = Start; true; ++Cur) { SPtrArray<Version *> VList = Cur.AllTargets(); @@ -373,51 +374,63 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth) } // Check if the version that is going to be installed will satisfy the dependency - if (Cache[DepPkg].InstallVer != *I) + if (Cache[DepPkg].InstallVer != *I || List->IsNow(DepPkg) == false) continue; - if (List->IsFlag(DepPkg,pkgOrderList::UnPacked)) + if (PkgLoop == true) { - if (List->IsFlag(DepPkg,pkgOrderList::Loop) && PkgLoop) - { - // This dependency has already been dealt with by another SmartConfigure on Pkg - Bad = false; - break; - } - /* Check for a loop to prevent one forming - If A depends on B and B depends on A, SmartConfigure will - just hop between them if this is not checked. Dont remove the - loop flag after finishing however as loop is already set. - This means that there is another SmartConfigure call for this - package and it will remove the loop flag */ + if (Debug) + std::clog << OutputInDepth(Depth) << "Package " << Pkg << " loops in SmartConfigure" << std::endl; + Bad = false; + break; + } + else + { + if (Debug) + clog << OutputInDepth(Depth) << "Unpacking " << DepPkg.FullName() << " to avoid loop " << Cur << endl; if (PkgLoop == false) List->Flag(Pkg,pkgOrderList::Loop); - if (SmartConfigure(DepPkg, Depth + 1) == true) + if (SmartUnPack(DepPkg, true, Depth + 1) == true) { Bad = false; if (List->IsFlag(DepPkg,pkgOrderList::Loop) == false) - Changed = true; + Changed = true; } if (PkgLoop == false) - List->RmFlag(Pkg,pkgOrderList::Loop); - // If SmartConfigure was succesfull, Bad is false, so break + List->RmFlag(Pkg,pkgOrderList::Loop); if (Bad == false) break; } - else if (List->IsFlag(DepPkg,pkgOrderList::Configured)) - { - Bad = false; - break; - } } - if (Cur == End) + + if (Cur == End || Bad == false) break; - } + } if (Bad == false) continue; - // Check for dependencies that have not been unpacked, probably due to loops. + needConfigure.push_back(Start); + } + if (i++ > max_loops) + return _error->Error("Internal error: MaxLoopCount reached in SmartUnPack (1) for %s, aborting", Pkg.FullName().c_str()); + } while (Changed == true); + + Bad = false, Changed = false, i = 0; + do + { + Changed = false; + for (std::list<DepIterator>::iterator D = needConfigure.begin(); D != needConfigure.end(); ++D) + { + // Compute a single dependency element (glob or) + pkgCache::DepIterator Start, End; + D->GlobOr(Start,End); + + if (End->Type != pkgCache::Dep::Depends) + continue; + Bad = true; + + // Search for dependencies which are unpacked but aren't configured yet (maybe loops) for (DepIterator Cur = Start; true; ++Cur) { SPtrArray<Version *> VList = Cur.AllTargets(); @@ -428,44 +441,54 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth) PkgIterator DepPkg = Ver.ParentPkg(); // Check if the version that is going to be installed will satisfy the dependency - if (Cache[DepPkg].InstallVer != *I || List->IsNow(DepPkg) == false) + if (Cache[DepPkg].InstallVer != *I) continue; - if (PkgLoop == true) - { - if (Debug) - std::clog << OutputInDepth(Depth) << "Package " << Pkg << " loops in SmartConfigure" << std::endl; - Bad = false; - break; - } - else + if (List->IsFlag(DepPkg,pkgOrderList::UnPacked)) { - if (Debug) - clog << OutputInDepth(Depth) << "Unpacking " << DepPkg.FullName() << " to avoid loop " << Cur << endl; + if (List->IsFlag(DepPkg,pkgOrderList::Loop) && PkgLoop) + { + // This dependency has already been dealt with by another SmartConfigure on Pkg + Bad = false; + break; + } + /* Check for a loop to prevent one forming + If A depends on B and B depends on A, SmartConfigure will + just hop between them if this is not checked. Dont remove the + loop flag after finishing however as loop is already set. + This means that there is another SmartConfigure call for this + package and it will remove the loop flag */ if (PkgLoop == false) List->Flag(Pkg,pkgOrderList::Loop); - if (SmartUnPack(DepPkg, true, Depth + 1) == true) + if (SmartConfigure(DepPkg, Depth + 1) == true) { Bad = false; if (List->IsFlag(DepPkg,pkgOrderList::Loop) == false) - Changed = true; + Changed = true; } if (PkgLoop == false) - List->RmFlag(Pkg,pkgOrderList::Loop); + List->RmFlag(Pkg,pkgOrderList::Loop); + // If SmartConfigure was succesfull, Bad is false, so break if (Bad == false) break; } + else if (List->IsFlag(DepPkg,pkgOrderList::Configured)) + { + Bad = false; + break; + } } - - if (Cur == End) + if (Cur == End || Bad == false) break; - } + } + + if (Bad == true && Changed == false && Debug == true) std::clog << OutputInDepth(Depth) << "Could not satisfy " << Start << std::endl; } if (i++ > max_loops) - return _error->Error("Internal error: MaxLoopCount reached in SmartUnPack for %s, aborting", Pkg.FullName().c_str()); + return _error->Error("Internal error: MaxLoopCount reached in SmartUnPack (2) for %s, aborting", Pkg.FullName().c_str()); } while (Changed == true); if (Bad) { diff --git a/debian/changelog b/debian/changelog index b64a57bef..8a1194b1b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ apt (0.9.8.3) UNRELEASED; urgency=low * prefer Essentials over Removals in ordering score * fix priority sorting by prefering higher in MarkInstall * try all providers in order if uninstallable in MarkInstall + * do unpacks before configures in SmartConfigure (Closes: #707578) -- David Kalnischkies <kalnischkies@gmail.com> Sun, 09 Jun 2013 15:06:24 +0200 diff --git a/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages b/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages new file mode 100755 index 000000000..7f3b05e59 --- /dev/null +++ b/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages @@ -0,0 +1,46 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework +setupenvironment +configarchitecture 'amd64' + +# the difference between version 3 and 4 is the new package 'ure' which +# we have to unpack before we start configuring parts of the loop +insertinstalledpackage 'libreoffice' 'amd64' '3' 'Depends: libreoffice-core (= 3)' +insertinstalledpackage 'libreoffice-core' 'amd64' '3' 'Depends: libreoffice-common (>= 3)' +insertinstalledpackage 'libreoffice-common' 'all' '3' 'Depends: libreoffice-style +Breaks: libreoffice-core (>= 3+), libreoffice-core (<= 3~), libreoffice-style-galaxy (>= 3+), libreoffice-style-galaxy (<= 3~)' +insertinstalledpackage 'libreoffice-style-galaxy' 'amd64' '3' 'Depends: libreoffice-core +Provides: libreoffice-style' + +buildsimplenativepackage 'libreoffice' 'amd64' '4' 'sid' 'Depends: libreoffice-core (= 4)' +buildsimplenativepackage 'libreoffice-core' 'amd64' '4' 'sid' 'Depends: libreoffice-common (>= 4) +Breaks: libreoffice-common (<< 4), libreoffice-style-galaxy (<< 4)' +buildsimplenativepackage 'libreoffice-common' 'all' '4' 'sid' 'Depends: libreoffice-style, ure +Breaks: libreoffice-core (>= 4+), libreoffice-core (<= 4~), libreoffice-style-galaxy (>= 4+), libreoffice-style-galaxy (<= 4~)' +buildsimplenativepackage 'libreoffice-style-galaxy' 'amd64' '4' 'sid' 'Depends: libreoffice-core +Provides: libreoffice-style' + +buildsimplenativepackage 'ure' 'amd64' '4' 'sid' + +setupaptarchive + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + ure +The following packages will be upgraded: + libreoffice libreoffice-common libreoffice-core libreoffice-style-galaxy +4 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. +Inst libreoffice [3] (4 sid [amd64]) [] +Inst libreoffice-style-galaxy [3] (4 sid [amd64]) [libreoffice-common:amd64 on libreoffice-style-galaxy:amd64] [libreoffice-common:amd64 ] +Inst libreoffice-core [3] (4 sid [amd64]) [libreoffice-core:amd64 on libreoffice-common:amd64] [libreoffice-common:amd64 on libreoffice-core:amd64] [libreoffice-common:amd64 on libreoffice-style-galaxy:amd64] [libreoffice-common:amd64 ] +Inst libreoffice-common [3] (4 sid [all]) [] +Inst ure (4 sid [amd64]) +Conf ure (4 sid [amd64]) +Conf libreoffice-style-galaxy (4 sid [amd64]) +Conf libreoffice-common (4 sid [all]) +Conf libreoffice-core (4 sid [amd64]) +Conf libreoffice (4 sid [amd64])' aptget dist-upgrade -s -- cgit v1.2.3 From f3c736f9b6fdef1d8045846c465d675858eb1471 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 24 May 2013 10:20:38 +0200 Subject: deprecate InstallProtect as a cpu-eating no-op In the past packages were flagged "Protected" so that install/ remove markings where issued before the ProblemResolver. Nowadays, the marking methods check if they are allowed to modify the marking of a package instead, so that markings set by FromUser calls are not overwritten anymore by automatic calls which elimates the need for InstallProtect which just eats CPU now. The method itself is left untouched for now in case frontend needs it still for some wierd usecase, but they should be eliminated. --- apt-pkg/algorithms.cc | 6 ++++-- apt-pkg/algorithms.h | 7 ++++--- cmdline/apt-get.cc | 4 +--- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 6cde4d6cc..d19783983 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -1440,9 +1440,11 @@ bool pkgProblemResolver::ResolveByKeepInternal() return true; } /*}}}*/ -// ProblemResolver::InstallProtect - Install all protected packages /*{{{*/ +// ProblemResolver::InstallProtect - deprecated cpu-eating no-op /*{{{*/ // --------------------------------------------------------------------- -/* This is used to make sure protected packages are installed */ +/* Actions issued with FromUser bit set are protected from further + modification (expect by other calls with FromUser set) nowadays , so we + don't need to reissue actions here, they are already set in stone. */ void pkgProblemResolver::InstallProtect() { pkgDepCache::ActionGroup group(Cache); diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h index aff8a68f2..7f58c8eed 100644 --- a/apt-pkg/algorithms.h +++ b/apt-pkg/algorithms.h @@ -36,6 +36,8 @@ #include <iostream> +#include <apt-pkg/macros.h> + #ifndef APT_8_CLEANER_HEADERS #include <apt-pkg/acquire.h> using std::ostream; @@ -132,9 +134,8 @@ class pkgProblemResolver /*{{{*/ // Try to resolve problems only by using keep bool ResolveByKeep(); - // Install all protected packages - void InstallProtect(); - + __deprecated void InstallProtect(); + pkgProblemResolver(pkgDepCache *Cache); ~pkgProblemResolver(); }; diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 999f2a6a7..85ed80a95 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1962,7 +1962,6 @@ bool DoInstall(CommandLine &CmdL) if (Fix != NULL) { // Call the scored problem resolver - Fix->InstallProtect(); Fix->Resolve(true); delete Fix; } @@ -3123,8 +3122,7 @@ bool DoBuildDep(CommandLine &CmdL) } } } - - Fix.InstallProtect(); + if (Fix.Resolve(true) == false) _error->Discard(); -- cgit v1.2.3 From 991e690a693cf3724b815c1fb358aa033af73c03 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 25 May 2013 19:47:28 +0200 Subject: initialize the whole search array with zero Git-Dch: Ignore --- cmdline/apt-cache.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 0a2c28d23..de263a300 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1247,7 +1247,7 @@ bool Search(CommandLine &CmdL) } ExDescFile *DFList = new ExDescFile[Cache->HeaderP->GroupCount+1]; - memset(DFList,0,sizeof(*DFList)*Cache->HeaderP->GroupCount+1); + memset(DFList, 0, sizeof(*DFList) * (Cache->HeaderP->GroupCount + 1)); // Map versions that we want to write out onto the VerList array. for (pkgCache::GrpIterator G = Cache->GrpBegin(); G.end() == false; ++G) -- cgit v1.2.3 From 8ba17539a3ec33abc283ca382cca6e59876a0f07 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 25 May 2013 19:57:48 +0200 Subject: fix support for multiple patterns in apt-cache search Patterns can appear in the name as well as in the description, they don't have to match all in the name/description only. Closes: 691453 --- cmdline/apt-cache.cc | 79 ++++++++++++++-------- debian/changelog | 6 +- test/integration/framework | 12 +++- .../test-bug-691453-apt-cache-search-multi-pattern | 33 +++++++++ 4 files changed, 94 insertions(+), 36 deletions(-) create mode 100755 test/integration/test-bug-691453-apt-cache-search-multi-pattern diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index de263a300..bda09a5a1 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1203,7 +1203,7 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V) struct ExDescFile { pkgCache::DescFile *Df; - bool NameMatch; + map_ptrloc ID; }; // Search - Perform a search /*{{{*/ @@ -1246,37 +1246,48 @@ bool Search(CommandLine &CmdL) return false; } - ExDescFile *DFList = new ExDescFile[Cache->HeaderP->GroupCount+1]; - memset(DFList, 0, sizeof(*DFList) * (Cache->HeaderP->GroupCount + 1)); + size_t const descCount = Cache->HeaderP->GroupCount + 1; + ExDescFile *DFList = new ExDescFile[descCount]; + memset(DFList,0,sizeof(*DFList) * descCount); + + bool PatternMatch[descCount * NumPatterns]; + memset(PatternMatch,false,sizeof(PatternMatch)); // Map versions that we want to write out onto the VerList array. for (pkgCache::GrpIterator G = Cache->GrpBegin(); G.end() == false; ++G) { - if (DFList[G->ID].NameMatch == true) - continue; - - DFList[G->ID].NameMatch = true; - for (unsigned I = 0; I != NumPatterns; I++) + size_t const PatternOffset = G->ID * NumPatterns; + size_t unmatched = 0, matched = 0; + for (unsigned I = 0; I < NumPatterns; ++I) { - if (regexec(&Patterns[I],G.Name(),0,0,0) == 0) - continue; - DFList[G->ID].NameMatch = false; - break; + if (PatternMatch[PatternOffset + I] == true) + ++matched; + else if (regexec(&Patterns[I],G.Name(),0,0,0) == 0) + PatternMatch[PatternOffset + I] = true; + else + ++unmatched; } - - // Doing names only, drop any that dont match.. - if (NamesOnly == true && DFList[G->ID].NameMatch == false) + + // already dealt with this package? + if (matched == NumPatterns) continue; - + + // Doing names only, drop any that don't match.. + if (NamesOnly == true && unmatched == NumPatterns) + continue; + // Find the proper version to use pkgCache::PkgIterator P = G.FindPreferredPkg(); if (P.end() == true) continue; pkgCache::VerIterator V = Plcy->GetCandidateVer(P); if (V.end() == false) + { DFList[G->ID].Df = V.TranslatedDescription().FileList(); + DFList[G->ID].ID = G->ID; + } - if (DFList[G->ID].NameMatch == false) + if (unmatched == NumPatterns) continue; // Include all the packages that provide matching names too @@ -1288,33 +1299,45 @@ bool Search(CommandLine &CmdL) unsigned long id = Prv.OwnerPkg().Group()->ID; DFList[id].Df = V.TranslatedDescription().FileList(); - DFList[id].NameMatch = true; + DFList[id].ID = id; + + size_t const PrvPatternOffset = id * NumPatterns; + for (unsigned I = 0; I < NumPatterns; ++I) + PatternMatch[PrvPatternOffset + I] = PatternMatch[PatternOffset + I]; } } - + LocalitySort(&DFList->Df,Cache->HeaderP->GroupCount,sizeof(*DFList)); // Create the text record parser pkgRecords Recs(*Cache); // Iterate over all the version records and check them - for (ExDescFile *J = DFList; J->Df != 0; J++) + for (ExDescFile *J = DFList; J->Df != 0; ++J) { pkgRecords::Parser &P = Recs.Lookup(pkgCache::DescFileIterator(*Cache,J->Df)); + size_t const PatternOffset = J->ID * NumPatterns; - if (J->NameMatch == false && NamesOnly == false) + if (NamesOnly == false) { string const LongDesc = P.LongDesc(); - J->NameMatch = true; - for (unsigned I = 0; I != NumPatterns; I++) + for (unsigned I = 0; I < NumPatterns; ++I) { - if (regexec(&Patterns[I],LongDesc.c_str(),0,0,0) == 0) + if (PatternMatch[PatternOffset + I] == true) continue; - J->NameMatch = false; - break; + else if (regexec(&Patterns[I],LongDesc.c_str(),0,0,0) == 0) + PatternMatch[PatternOffset + I] = true; } } - - if (J->NameMatch == true) + + bool matchedAll = true; + for (unsigned I = 0; I < NumPatterns; ++I) + if (PatternMatch[PatternOffset + I] == false) + { + matchedAll = false; + break; + } + + if (matchedAll == true) { if (ShowFull == true) { diff --git a/debian/changelog b/debian/changelog index 8a1194b1b..9f35441f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ apt (0.9.8.3) UNRELEASED; urgency=low * fix priority sorting by prefering higher in MarkInstall * try all providers in order if uninstallable in MarkInstall * do unpacks before configures in SmartConfigure (Closes: #707578) + * fix support for multiple patterns in apt-cache search (Closes: #691453) -- David Kalnischkies <kalnischkies@gmail.com> Sun, 09 Jun 2013 15:06:24 +0200 @@ -31,11 +32,6 @@ apt (0.9.8.2) unstable; urgency=low * Fix crash when the "mirror" method does not find any entry (closes: #699303) - [ Johan Kiviniemi ] - * cmdline/apt-key: - - Create new keyrings with mode 0644 instead of 0600. - - Accept a nonexistent --keyring file with the adv subcommand as well. - -- Michael Vogt <mvo@debian.org> Thu, 06 Jun 2013 19:15:14 +0200 apt (0.9.8.1) unstable; urgency=low diff --git a/test/integration/framework b/test/integration/framework index 31b12e8bf..e3e868d45 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -483,6 +483,7 @@ insertpackage() { local VERSION="$4" local DEPENDENCIES="$5" local PRIORITY="${6:-optional}" + local DESCRIPTION="${7}" local ARCHS="" for arch in $(echo "$ARCH" | sed -e 's#,#\n#g' | sed -e "s#^native\$#$(getarchitecture 'native')#"); do if [ "$arch" = 'all' -o "$arch" = 'none' ]; then @@ -504,11 +505,16 @@ Maintainer: Joe Sixpack <joe@example.org>" >> $FILE echo "Version: $VERSION Filename: pool/main/${NAME}/${NAME}_${VERSION}_${arch}.deb" >> $FILE test -z "$DEPENDENCIES" || echo "$DEPENDENCIES" >> $FILE - echo "Description: an autogenerated dummy ${NAME}=${VERSION}/${RELEASE} + echo -n 'Description: ' >> $FILE + if [ -z "$DESCRIPTION" ]; then + echo "an autogenerated dummy ${NAME}=${VERSION}/${RELEASE} If you find such a package installed on your system, YOU did something horribly wrong! They are autogenerated - und used only by testcases for APT and surf no other propose… -" >> $FILE + und used only by testcases for APT and surf no other propose…" >> $FILE + else + echo "$DESCRIPTION" >> $FILE + fi + echo >> $FILE done done } diff --git a/test/integration/test-bug-691453-apt-cache-search-multi-pattern b/test/integration/test-bug-691453-apt-cache-search-multi-pattern new file mode 100755 index 000000000..0367892fc --- /dev/null +++ b/test/integration/test-bug-691453-apt-cache-search-multi-pattern @@ -0,0 +1,33 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework +setupenvironment +configarchitecture 'native' + +insertpackage 'unstable' 'foobar' 'native' '1' '' '' 'funky tool' +insertpackage 'unstable' 'coolstuff' 'native' '1' '' '' 'funky tool just like foo and bar' +insertpackage 'unstable' 'foo' 'native' '1' '' '' 'tool best used with bar' +insertpackage 'unstable' 'bar' 'native' '1' '' '' 'tool best used with foo' +insertpackage 'unstable' 'baz' 'native' '1' 'Provides: bar' '' 'alternative tool best used with foo' + +setupaptarchive + +# in this special case the following queries should be equal +FOOBAR='foobar - funky tool +coolstuff - funky tool just like foo and bar +foo - tool best used with bar +bar - tool best used with foo +baz - alternative tool best used with foo' + +testequal "$FOOBAR" aptcache search foo +testequal "$FOOBAR" aptcache search bar +testequal "$FOOBAR" aptcache search foo bar + +testequal 'foobar - funky tool +foo - tool best used with bar' aptcache search -n foo +testequal 'foobar - funky tool +bar - tool best used with foo +baz - alternative tool best used with foo' aptcache search -n bar +testequal 'foobar - funky tool' aptcache search -n foo bar -- cgit v1.2.3 From c7873955a3b9419c5de49ee4665a6006b3bf6563 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 25 May 2013 20:18:15 +0200 Subject: make the vprintf like _error->Insert public Git-Dch: Ignore --- apt-pkg/contrib/error.h | 41 +++++++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h index 21c51c1be..7d09b2d4a 100644 --- a/apt-pkg/contrib/error.h +++ b/apt-pkg/contrib/error.h @@ -123,6 +123,25 @@ public: /*{{{*/ bool InsertErrno(MsgType const &type, const char* Function, const char* Description,...) __like_printf(4) __cold; + /** \brief adds an errno message with the given type + * + * args needs to be initialized with va_start and terminated + * with va_end by the caller. msgSize is also an out-parameter + * in case the msgSize was not enough to store the complete message. + * + * \param type of the error message + * \param Function which failed + * \param Description is the format string for args + * \param args list from a printf-like function + * \param errsv is the errno the error is for + * \param msgSize is the size of the char[] used to store message + * \return true if the message was added, false if not - the caller + * should call this method again in that case + */ + bool InsertErrno(MsgType type, const char* Function, + const char* Description, va_list &args, + int const errsv, size_t &msgSize); + /** \brief add an fatal error message to the list * * Most of the stuff we consider as "error" is also "fatal" for @@ -185,6 +204,22 @@ public: /*{{{*/ */ bool Insert(MsgType const &type, const char* Description,...) __like_printf(3) __cold; + /** \brief adds an error message with the given type + * + * args needs to be initialized with va_start and terminated + * with va_end by the caller. msgSize is also an out-parameter + * in case the msgSize was not enough to store the complete message. + * + * \param type of the error message + * \param Description is the format string for args + * \param args list from a printf-like function + * \param msgSize is the size of the char[] used to store message + * \return true if the message was added, false if not - the caller + * should call this method again in that case + */ + bool Insert(MsgType type, const char* Description, + va_list &args, size_t &msgSize) __cold; + /** \brief is an error in the list? * * \return \b true if an error is included in the list, \b false otherwise @@ -305,12 +340,6 @@ private: /*{{{*/ }; std::list<MsgStack> Stacks; - - bool InsertErrno(MsgType type, const char* Function, - const char* Description, va_list &args, - int const errsv, size_t &msgSize); - bool Insert(MsgType type, const char* Description, - va_list &args, size_t &msgSize); /*}}}*/ }; /*}}}*/ -- cgit v1.2.3 From ae635e3cf7559f3455b88a2499e7521d2094c416 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 25 May 2013 20:22:06 +0200 Subject: set Fail flag in FileFd on all errors consistently Previously some errors would set the Fail flag while some didn't without a clear reason as all errors leave a bad FileFd behind, so we use a helper now to ensure that all errors set the flag. --- apt-pkg/contrib/fileutl.cc | 167 +++++++++++++++++++-------------------------- apt-pkg/contrib/fileutl.h | 4 ++ debian/changelog | 1 + 3 files changed, 76 insertions(+), 96 deletions(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 46661887a..4a7299e99 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -861,7 +861,7 @@ bool FileFd::Open(string FileName,unsigned int const Mode,CompressMode Compress, return Open(FileName, ReadOnly, Gzip, Perms); if (Compress == Auto && (Mode & WriteOnly) == WriteOnly) - return _error->Error("Autodetection on %s only works in ReadOnly openmode!", FileName.c_str()); + return FileFdError("Autodetection on %s only works in ReadOnly openmode!", FileName.c_str()); std::vector<APT::Configuration::Compressor> const compressors = APT::Configuration::getCompressors(); std::vector<APT::Configuration::Compressor>::const_iterator compressor = compressors.begin(); @@ -914,17 +914,17 @@ bool FileFd::Open(string FileName,unsigned int const Mode,CompressMode Compress, case Auto: case Extension: // Unreachable - return _error->Error("Opening File %s in None, Auto or Extension should be already handled?!?", FileName.c_str()); + return FileFdError("Opening File %s in None, Auto or Extension should be already handled?!?", FileName.c_str()); } for (; compressor != compressors.end(); ++compressor) if (compressor->Name == name) break; if (compressor == compressors.end()) - return _error->Error("Can't find a configured compressor %s for file %s", name.c_str(), FileName.c_str()); + return FileFdError("Can't find a configured compressor %s for file %s", name.c_str(), FileName.c_str()); } if (compressor == compressors.end()) - return _error->Error("Can't find a match for specified compressor mode for file %s", FileName.c_str()); + return FileFdError("Can't find a match for specified compressor mode for file %s", FileName.c_str()); return Open(FileName, Mode, *compressor, Perms); } bool FileFd::Open(string FileName,unsigned int const Mode,APT::Configuration::Compressor const &compressor, unsigned long const Perms) @@ -933,9 +933,9 @@ bool FileFd::Open(string FileName,unsigned int const Mode,APT::Configuration::Co Flags = AutoClose; if ((Mode & WriteOnly) != WriteOnly && (Mode & (Atomic | Create | Empty | Exclusive)) != 0) - return _error->Error("ReadOnly mode for %s doesn't accept additional flags!", FileName.c_str()); + return FileFdError("ReadOnly mode for %s doesn't accept additional flags!", FileName.c_str()); if ((Mode & ReadWrite) == 0) - return _error->Error("No openmode provided in FileFd::Open for %s", FileName.c_str()); + return FileFdError("No openmode provided in FileFd::Open for %s", FileName.c_str()); if ((Mode & Atomic) == Atomic) { @@ -981,7 +981,7 @@ bool FileFd::Open(string FileName,unsigned int const Mode,APT::Configuration::Co close (iFd); iFd = -1; } - return _error->Errno("open",_("Could not open file %s"), FileName.c_str()); + return FileFdErrno("open",_("Could not open file %s"), FileName.c_str()); } SetCloseExec(iFd,true); @@ -1010,13 +1010,13 @@ bool FileFd::OpenDescriptor(int Fd, unsigned int const Mode, CompressMode Compre case Xz: name = "xz"; break; case Auto: case Extension: - return _error->Error("Opening Fd %d in Auto or Extension compression mode is not supported", Fd); + return FileFdError("Opening Fd %d in Auto or Extension compression mode is not supported", Fd); } for (; compressor != compressors.end(); ++compressor) if (compressor->Name == name) break; if (compressor == compressors.end()) - return _error->Error("Can't find a configured compressor %s for file %s", name.c_str(), FileName.c_str()); + return FileFdError("Can't find a configured compressor %s for file %s", name.c_str(), FileName.c_str()); return OpenDescriptor(Fd, Mode, *compressor, AutoClose); } @@ -1043,7 +1043,7 @@ bool FileFd::OpenDescriptor(int Fd, unsigned int const Mode, APT::Configuration: { if (AutoClose) close (iFd); - return _error->Errno("gzdopen",_("Could not open file descriptor %d"), Fd); + return FileFdErrno("gzdopen",_("Could not open file descriptor %d"), Fd); } return true; } @@ -1105,10 +1105,7 @@ bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::C ExecWait(d->compressor_pid, "FileFdCompressor", true); if ((Mode & ReadWrite) == ReadWrite) - { - Flags |= Fail; - return _error->Error("ReadWrite mode is not supported for file %s", FileName.c_str()); - } + return FileFdError("ReadWrite mode is not supported for file %s", FileName.c_str()); bool const Comp = (Mode & WriteOnly) == WriteOnly; if (Comp == false) @@ -1131,10 +1128,7 @@ bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::C // Create a data pipe int Pipe[2] = {-1,-1}; if (pipe(Pipe) != 0) - { - Flags |= Fail; - return _error->Errno("pipe",_("Failed to create subprocess IPC")); - } + return FileFdErrno("pipe",_("Failed to create subprocess IPC")); for (int J = 0; J != 2; J++) SetCloseExec(Pipe[J],true); @@ -1244,14 +1238,13 @@ bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual) { if (errno == EINTR) continue; - Flags |= Fail; #ifdef HAVE_ZLIB if (d != NULL && d->gz != NULL) { int err; char const * const errmsg = gzerror(d->gz, &err); if (err != Z_ERRNO) - return _error->Error("gzread: %s (%d: %s)", _("Read error"), err, errmsg); + return FileFdError("gzread: %s (%d: %s)", _("Read error"), err, errmsg); } #endif #ifdef HAVE_BZ2 @@ -1260,10 +1253,10 @@ bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual) int err; char const * const errmsg = BZ2_bzerror(d->bz2, &err); if (err != BZ_IO_ERROR) - return _error->Error("BZ2_bzread: %s (%d: %s)", _("Read error"), err, errmsg); + return FileFdError("BZ2_bzread: %s (%d: %s)", _("Read error"), err, errmsg); } #endif - return _error->Errno("read",_("Read error")); + return FileFdErrno("read",_("Read error")); } To = (char *)To + Res; @@ -1284,9 +1277,8 @@ bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual) Flags |= HitEof; return true; } - - Flags |= Fail; - return _error->Error(_("read, still have %llu to read but none left"), Size); + + return FileFdError(_("read, still have %llu to read but none left"), Size); } /*}}}*/ // FileFd::ReadLine - Read a complete line from the file /*{{{*/ @@ -1342,14 +1334,13 @@ bool FileFd::Write(const void *From,unsigned long long Size) continue; if (Res < 0) { - Flags |= Fail; #ifdef HAVE_ZLIB if (d != NULL && d->gz != NULL) { int err; char const * const errmsg = gzerror(d->gz, &err); if (err != Z_ERRNO) - return _error->Error("gzwrite: %s (%d: %s)", _("Write error"), err, errmsg); + return FileFdError("gzwrite: %s (%d: %s)", _("Write error"), err, errmsg); } #endif #ifdef HAVE_BZ2 @@ -1358,10 +1349,10 @@ bool FileFd::Write(const void *From,unsigned long long Size) int err; char const * const errmsg = BZ2_bzerror(d->bz2, &err); if (err != BZ_IO_ERROR) - return _error->Error("BZ2_bzwrite: %s (%d: %s)", _("Write error"), err, errmsg); + return FileFdError("BZ2_bzwrite: %s (%d: %s)", _("Write error"), err, errmsg); } #endif - return _error->Errno("write",_("Write error")); + return FileFdErrno("write",_("Write error")); } From = (char *)From + Res; @@ -1373,9 +1364,8 @@ bool FileFd::Write(const void *From,unsigned long long Size) if (Size == 0) return true; - - Flags |= Fail; - return _error->Error(_("write, still have %llu to write but couldn't"), Size); + + return FileFdError(_("write, still have %llu to write but couldn't"), Size); } bool FileFd::Write(int Fd, const void *From, unsigned long long Size) { @@ -1419,10 +1409,7 @@ bool FileFd::Seek(unsigned long long To) return Skip(To - seekpos); if ((d->openmode & ReadOnly) != ReadOnly) - { - Flags |= Fail; - return _error->Error("Reopen is only implemented for read-only files!"); - } + return FileFdError("Reopen is only implemented for read-only files!"); #ifdef HAVE_BZ2 if (d->bz2 != NULL) { @@ -1443,17 +1430,11 @@ bool FileFd::Seek(unsigned long long To) if (lseek(d->compressed_fd, 0, SEEK_SET) != 0) iFd = d->compressed_fd; if (iFd < 0) - { - Flags |= Fail; - return _error->Error("Reopen is not implemented for pipes opened with FileFd::OpenDescriptor()!"); - } + return FileFdError("Reopen is not implemented for pipes opened with FileFd::OpenDescriptor()!"); } if (OpenInternDescriptor(d->openmode, d->compressor) == false) - { - Flags |= Fail; - return _error->Error("Seek on file %s because it couldn't be reopened", FileName.c_str()); - } + return FileFdError("Seek on file %s because it couldn't be reopened", FileName.c_str()); if (To != 0) return Skip(To); @@ -1469,10 +1450,7 @@ bool FileFd::Seek(unsigned long long To) #endif res = lseek(iFd,To,SEEK_SET); if (res != (signed)To) - { - Flags |= Fail; - return _error->Error("Unable to seek to %llu", To); - } + return FileFdError("Unable to seek to %llu", To); if (d != NULL) d->seekpos = To; @@ -1496,10 +1474,7 @@ bool FileFd::Skip(unsigned long long Over) { unsigned long long toread = std::min((unsigned long long) sizeof(buffer), Over); if (Read(buffer, toread) == false) - { - Flags |= Fail; - return _error->Error("Unable to seek ahead %llu",Over); - } + return FileFdError("Unable to seek ahead %llu",Over); Over -= toread; } return true; @@ -1513,10 +1488,7 @@ bool FileFd::Skip(unsigned long long Over) #endif res = lseek(iFd,Over,SEEK_CUR); if (res < 0) - { - Flags |= Fail; - return _error->Error("Unable to seek ahead %llu",Over); - } + return FileFdError("Unable to seek ahead %llu",Over); if (d != NULL) d->seekpos = res; @@ -1530,17 +1502,11 @@ bool FileFd::Truncate(unsigned long long To) { #if defined HAVE_ZLIB || defined HAVE_BZ2 if (d != NULL && (d->gz != NULL || d->bz2 != NULL)) - { - Flags |= Fail; - return _error->Error("Truncating compressed files is not implemented (%s)", FileName.c_str()); - } + return FileFdError("Truncating compressed files is not implemented (%s)", FileName.c_str()); #endif if (ftruncate(iFd,To) != 0) - { - Flags |= Fail; - return _error->Error("Unable to truncate to %llu",To); - } - + return FileFdError("Unable to truncate to %llu",To); + return true; } /*}}}*/ @@ -1568,10 +1534,7 @@ unsigned long long FileFd::Tell() #endif Res = lseek(iFd,0,SEEK_CUR); if (Res == (off_t)-1) - { - Flags |= Fail; - _error->Errno("lseek","Failed to determine the current file position"); - } + FileFdErrno("lseek","Failed to determine the current file position"); if (d != NULL) d->seekpos = Res; return Res; @@ -1584,10 +1547,7 @@ unsigned long long FileFd::FileSize() { struct stat Buf; if ((d == NULL || d->pipe == false) && fstat(iFd,&Buf) != 0) - { - Flags |= Fail; - return _error->Errno("fstat","Unable to determine the file size"); - } + return FileFdErrno("fstat","Unable to determine the file size"); // for compressor pipes st_size is undefined and at 'best' zero if ((d != NULL && d->pipe == true) || S_ISFIFO(Buf.st_mode)) @@ -1597,10 +1557,7 @@ unsigned long long FileFd::FileSize() if (d != NULL) d->pipe = true; if (stat(FileName.c_str(), &Buf) != 0) - { - Flags |= Fail; - return _error->Errno("stat","Unable to determine the file size"); - } + return FileFdErrno("stat","Unable to determine the file size"); } return Buf.st_size; @@ -1642,16 +1599,10 @@ unsigned long long FileFd::Size() * bits of the file */ // FIXME: Size for gz-files is limited by 32bit… no largefile support if (lseek(iFd, -4, SEEK_END) < 0) - { - Flags |= Fail; - return _error->Errno("lseek","Unable to seek to end of gzipped file"); - } + return FileFdErrno("lseek","Unable to seek to end of gzipped file"); size = 0L; if (read(iFd, &size, 4) != 4) - { - Flags |= Fail; - return _error->Errno("read","Unable to read original size of gzipped file"); - } + return FileFdErrno("read","Unable to read original size of gzipped file"); #ifdef WORDS_BIGENDIAN uint32_t tmp_size = size; @@ -1661,10 +1612,7 @@ unsigned long long FileFd::Size() #endif if (lseek(iFd, oldPos, SEEK_SET) < 0) - { - Flags |= Fail; - return _error->Errno("lseek","Unable to seek in gzipped file"); - } + return FileFdErrno("lseek","Unable to seek in gzipped file"); return size; } @@ -1681,8 +1629,7 @@ time_t FileFd::ModificationTime() struct stat Buf; if ((d == NULL || d->pipe == false) && fstat(iFd,&Buf) != 0) { - Flags |= Fail; - _error->Errno("fstat","Unable to determine the modification time of file %s", FileName.c_str()); + FileFdErrno("fstat","Unable to determine the modification time of file %s", FileName.c_str()); return 0; } @@ -1695,8 +1642,7 @@ time_t FileFd::ModificationTime() d->pipe = true; if (stat(FileName.c_str(), &Buf) != 0) { - Flags |= Fail; - _error->Errno("fstat","Unable to determine the modification time of file %s", FileName.c_str()); + FileFdErrno("fstat","Unable to determine the modification time of file %s", FileName.c_str()); return 0; } } @@ -1752,11 +1698,40 @@ bool FileFd::Close() bool FileFd::Sync() { if (fsync(iFd) != 0) + return FileFdErrno("sync",_("Problem syncing the file")); + return true; +} + /*}}}*/ +// FileFd::FileFdErrno - set Fail and call _error->Errno *{{{*/ +bool FileFd::FileFdErrno(const char *Function, const char *Description,...) +{ + Flags |= Fail; + va_list args; + size_t msgSize = 400; + int const errsv = errno; + while (true) { - Flags |= Fail; - return _error->Errno("sync",_("Problem syncing the file")); + va_start(args,Description); + if (_error->InsertErrno(GlobalError::ERROR, Function, Description, args, errsv, msgSize) == false) + break; + va_end(args); } - return true; + return false; +} + /*}}}*/ +// FileFd::FileFdError - set Fail and call _error->Error *{{{*/ +bool FileFd::FileFdError(const char *Description,...) { + Flags |= Fail; + va_list args; + size_t msgSize = 400; + while (true) + { + va_start(args,Description); + if (_error->Insert(GlobalError::ERROR, Description, args, msgSize) == false) + break; + va_end(args); + } + return false; } /*}}}*/ diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index 426664d3a..3ec01dd9a 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -149,6 +149,10 @@ class FileFd private: FileFdPrivate* d; bool OpenInternDescriptor(unsigned int const Mode, APT::Configuration::Compressor const &compressor); + + // private helpers to set Fail flag and call _error->Error + bool FileFdErrno(const char* Function, const char* Description,...) __like_printf(3) __cold; + bool FileFdError(const char* Description,...) __like_printf(2) __cold; }; bool RunScripts(const char *Cnf); diff --git a/debian/changelog b/debian/changelog index 9f35441f9..056025509 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ apt (0.9.8.3) UNRELEASED; urgency=low * try all providers in order if uninstallable in MarkInstall * do unpacks before configures in SmartConfigure (Closes: #707578) * fix support for multiple patterns in apt-cache search (Closes: #691453) + * set Fail flag in FileFd on all errors consistently -- David Kalnischkies <kalnischkies@gmail.com> Sun, 09 Jun 2013 15:06:24 +0200 -- cgit v1.2.3 From bf35c19b817cc1474b3deabce0b0953c248bad42 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 25 May 2013 20:27:33 +0200 Subject: don't explicitly init ExtractTar InFd with invalid fd The default constructor of the FileFd will kick in anyway, which will know that the Fd is invalid while with this explicit call it must be assumed that the fd is in fact valid, which might generate errors in the future --- apt-inst/contrib/extracttar.cc | 1 - debian/changelog | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc index 806ba796d..49ed5db56 100644 --- a/apt-inst/contrib/extracttar.cc +++ b/apt-inst/contrib/extracttar.cc @@ -63,7 +63,6 @@ ExtractTar::ExtractTar(FileFd &Fd,unsigned long Max,string DecompressionProgram) { GZPid = -1; - InFd = -1; Eof = false; } /*}}}*/ diff --git a/debian/changelog b/debian/changelog index 056025509..a80bac3d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ apt (0.9.8.3) UNRELEASED; urgency=low * do unpacks before configures in SmartConfigure (Closes: #707578) * fix support for multiple patterns in apt-cache search (Closes: #691453) * set Fail flag in FileFd on all errors consistently + * don't explicitly init ExtractTar InFd with invalid fd -- David Kalnischkies <kalnischkies@gmail.com> Sun, 09 Jun 2013 15:06:24 +0200 -- cgit v1.2.3 From f97bb5237489134cb971ce38b93c5d6220341ea8 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 25 May 2013 20:33:15 +0200 Subject: OpenDescriptor should autoclose fd always on error OpenInternDescriptor failures would cause additional errors to be generated by double-closing an fd. Other errors (although these are generated if the method is used incorrectly, so unlikely) didn't close the fd aswell. Closes: 704608 --- apt-pkg/contrib/fileutl.cc | 23 +++++++++++++++++++---- debian/changelog | 1 + 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 4a7299e99..7c3a302e2 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -1010,14 +1010,19 @@ bool FileFd::OpenDescriptor(int Fd, unsigned int const Mode, CompressMode Compre case Xz: name = "xz"; break; case Auto: case Extension: + if (AutoClose == true && Fd != -1) + close(Fd); return FileFdError("Opening Fd %d in Auto or Extension compression mode is not supported", Fd); } for (; compressor != compressors.end(); ++compressor) if (compressor->Name == name) break; if (compressor == compressors.end()) + { + if (AutoClose == true && Fd != -1) + close(Fd); return FileFdError("Can't find a configured compressor %s for file %s", name.c_str(), FileName.c_str()); - + } return OpenDescriptor(Fd, Mode, *compressor, AutoClose); } bool FileFd::OpenDescriptor(int Fd, unsigned int const Mode, APT::Configuration::Compressor const &compressor, bool AutoClose) @@ -1039,11 +1044,21 @@ bool FileFd::OpenDescriptor(int Fd, unsigned int const Mode, APT::Configuration: else iFd = Fd; this->FileName = ""; - if (OpenInternDescriptor(Mode, compressor) == false) + if (Fd == -1 || OpenInternDescriptor(Mode, compressor) == false) { - if (AutoClose) + if (iFd != -1 && ( +#ifdef HAVE_ZLIB + compressor.Name == "gzip" || +#endif +#ifdef HAVE_BZ2 + compressor.Name == "bzip2" || +#endif + AutoClose == true)) + { close (iFd); - return FileFdErrno("gzdopen",_("Could not open file descriptor %d"), Fd); + iFd = -1; + } + return FileFdError(_("Could not open file descriptor %d"), Fd); } return true; } diff --git a/debian/changelog b/debian/changelog index a80bac3d7..42a8e540e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ apt (0.9.8.3) UNRELEASED; urgency=low * fix support for multiple patterns in apt-cache search (Closes: #691453) * set Fail flag in FileFd on all errors consistently * don't explicitly init ExtractTar InFd with invalid fd + * OpenDescriptor should autoclose fd always on error (Closes: #704608) -- David Kalnischkies <kalnischkies@gmail.com> Sun, 09 Jun 2013 15:06:24 +0200 -- cgit v1.2.3 From 8437b7d4a699c8a0bfa6c2c2bff66ffff2e36a22 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 28 May 2013 18:08:32 +0200 Subject: tests: trap-adding can be post- as well as prefix For testcases it might sometimes be handy to add trap-actions before the general cleanup, e.g. if it has set directories read- only which rm doesn't want to remove even with --force applied (its fine with files though) Git-Dch: Ignore --- test/integration/framework | 9 ++++++--- test/integration/test-apt-cdrom | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/test/integration/framework b/test/integration/framework index e3e868d45..7c2aed592 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -125,7 +125,11 @@ exitwithstatus() { } addtrap() { - CURRENTTRAP="$CURRENTTRAP $1" + if [ "$1" = 'prefix' ]; then + CURRENTTRAP="$2 $CURRENTTRAP" + else + CURRENTTRAP="$CURRENTTRAP $1" + fi trap "$CURRENTTRAP exitwithstatus;" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM } @@ -135,8 +139,7 @@ setupenvironment() { msgninfo "Preparing environment for ${CCMD}$(basename $0)${CINFO} in ${TMPWORKINGDIRECTORY}… " BUILDDIRECTORY="${TESTDIRECTORY}/../../build/bin" test -x "${BUILDDIRECTORY}/apt-get" || msgdie "You need to build tree first" - local OLDWORKINGDIRECTORY=$(pwd) - addtrap "cd /; rm -rf $TMPWORKINGDIRECTORY; cd $OLDWORKINGDIRECTORY;" + addtrap "cd /; rm -rf $TMPWORKINGDIRECTORY;" cd $TMPWORKINGDIRECTORY mkdir rootdir aptarchive keys cd rootdir diff --git a/test/integration/test-apt-cdrom b/test/integration/test-apt-cdrom index f1c4fd9d3..3394aa505 100755 --- a/test/integration/test-apt-cdrom +++ b/test/integration/test-apt-cdrom @@ -24,7 +24,7 @@ cat Translation-de | xz --format=lzma > Translation-de.lzma cat Translation-de | xz > Translation-de.xz rm Translation-en Translation-de cd - > /dev/null -addtrap "chmod -R +w $PWD/rootdir/media/cdrom/dists/;" +addtrap 'prefix' "chmod -R +w $PWD/rootdir/media/cdrom/dists/;" chmod -R -w rootdir/media/cdrom/dists aptcdrom add -m -o quiet=1 > apt-cdrom.log 2>&1 -- cgit v1.2.3 From 2842f3e6c42ac6c6512a290064326d55bfa62a40 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 28 May 2013 18:17:55 +0200 Subject: tests: add expected port for cve-2013-105 testcase Git-Dch: Ignore --- test/integration/test-cve-2013-1051-InRelease-parsing | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/test-cve-2013-1051-InRelease-parsing b/test/integration/test-cve-2013-1051-InRelease-parsing index bd68fccf6..853da5ff6 100755 --- a/test/integration/test-cve-2013-1051-InRelease-parsing +++ b/test/integration/test-cve-2013-1051-InRelease-parsing @@ -12,7 +12,7 @@ insertpackage 'stable' 'good-pkg' 'all' '1.0' setupaptarchive changetowebserver -ARCHIVE='http://localhost/' +ARCHIVE='http://localhost:8080/' msgtest 'Initial apt-get update should work with' 'InRelease' aptget update -qq && msgpass || msgfail -- cgit v1.2.3 From 564fcbf93c78deb48fa44a9a63b5602eedfa53a9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 28 May 2013 18:48:28 +0200 Subject: depend on libapt-pkg in the libapt-inst build process MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fixing parallel build in the handcrafted buildsystem is a pain, so its not enabled by default, but its works for me – sometimes Git-Dch: Ignore --- apt-inst/makefile | 1 + buildlib/library.mak | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apt-inst/makefile b/apt-inst/makefile index cfb22741a..da983df5f 100644 --- a/apt-inst/makefile +++ b/apt-inst/makefile @@ -18,6 +18,7 @@ MAJOR=1.5 MINOR=0 SLIBS=$(PTHREADLIB) -lapt-pkg APT_DOMAIN:=libapt-inst$(MAJOR) +LIBRARYDEPENDS=$(LIB)/libapt-pkg.so # Source code for the contributed non-core things SOURCE = contrib/extracttar.cc contrib/arfile.cc diff --git a/buildlib/library.mak b/buildlib/library.mak index 029e87463..ef1306b66 100644 --- a/buildlib/library.mak +++ b/buildlib/library.mak @@ -51,7 +51,7 @@ $(LIB)/lib$(LIBRARY).so: $(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR) ln -sf $(<F) $@ # The binary build rule -$(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR): $($(LOCAL)-HEADERS) $($(LOCAL)-OBJS) +$(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR): $($(LOCAL)-HEADERS) $($(LOCAL)-OBJS) $(LIBRARYDEPENDS) -rm -f $(LIB)/lib$($(@F)-LIBRARY)*.so* 2> /dev/null echo Building shared library $@ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(PICFLAGS) $(LFLAGS) $(LFLAGS_SO)\ @@ -61,7 +61,7 @@ $(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR): $($(LOCAL)-HEADERS) $($(LOCAL)-OBJS) # Compilation rules vpath %.cc $(SUBDIRS) -$(OBJ)/%.opic: %.cc +$(OBJ)/%.opic: %.cc $(LIBRARYDEPENDS) echo Compiling $< to $@ $(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXFLAGS) $(PICFLAGS) -o $@ $< $(DoDep) -- cgit v1.2.3 From 57da1b4bd21aceced30f658993fb811a5232cff7 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 31 May 2013 18:19:09 +0200 Subject: stop building l10n if strings are unchanged The buildsystem tried to build l10n for test applications which never produced the output it expected causing it to try building it all the time. --- buildlib/copy.mak | 2 +- buildlib/podomain.mak | 7 ++++++- doc/makefile | 2 +- po/makefile | 15 +++++++++++---- test/interactive-helper/makefile | 1 + test/libapt/makefile | 1 + 6 files changed, 21 insertions(+), 7 deletions(-) diff --git a/buildlib/copy.mak b/buildlib/copy.mak index e8fe43deb..3ae11a7eb 100644 --- a/buildlib/copy.mak +++ b/buildlib/copy.mak @@ -21,7 +21,7 @@ veryclean: veryclean/$(LOCAL) MKDIRS += $(dir $($(LOCAL)-LIST)) -$($(LOCAL)-LIST) : $(TO)/% : % dirs +$($(LOCAL)-LIST) : $(TO)/% : % echo Installing $< to $(@D) cp $< $(@D) diff --git a/buildlib/podomain.mak b/buildlib/podomain.mak index cca7d55be..265359abc 100644 --- a/buildlib/podomain.mak +++ b/buildlib/podomain.mak @@ -4,6 +4,8 @@ # declared domain of the make file. It also arranges to set the DOMAIN # CPPFLAG for the compilation. +ifneq ($(APT_DOMAIN),none) + MY_DOMAIN := $(PACKAGE) ifdef APT_DOMAIN $($(LOCAL)-OBJS): CPPFLAGS := $(CPPFLAGS) -DAPT_DOMAIN='"$(APT_DOMAIN)"' @@ -13,10 +15,13 @@ endif MKDIRS += $(PO_DOMAINS)/$(MY_DOMAIN) $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: SRC := $(addprefix $(SUBDIR)/,$(SOURCE)) $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: makefile dirs - (echo $(SRC) | xargs -n1 echo) > $@ + (echo $(SRC) | xargs -n1 echo) > $@.tmp + cmp --silent $@.tmp $@ || mv $@.tmp $@ startup binary program clean update-po: $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list veryclean: veryclean/$(LOCAL) veryclean/po/$(LOCAL): LIST := $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list veryclean/po/$(LOCAL): rm -f $(LIST) + +endif diff --git a/doc/makefile b/doc/makefile index 44a22a597..274fbc278 100644 --- a/doc/makefile +++ b/doc/makefile @@ -36,7 +36,7 @@ $(DOCDIRLIST) :: %/makefile : lang.makefile test -d $(dir $@) || mkdir $(dir $@) sed "s#@@LANG@@#$(subst /,,$(dir $@))#" $< > $@ -debiandoc/subdirs manpages/subdirs clean/subdirs veryclean/subdirs: dirs +debiandoc/subdirs manpages/subdirs clean/subdirs veryclean/subdirs: for dir in en $(dir $(DOCDIRLIST)); do \ $(MAKE) -C $$dir $(patsubst %/subdirs,%,$@); \ done diff --git a/po/makefile b/po/makefile index ebf6c06d0..5a3c7fb67 100644 --- a/po/makefile +++ b/po/makefile @@ -30,17 +30,23 @@ GETDOMAIN = $(word 1,$(subst /, ,$(1))) # and produce the .pot file. $(POTFILES) : $(PO)/%.pot : echo "Generating POT file $@" - echo $@ : $(wildcard $(PO)/domains/$*/*.*list) $(addprefix $(BASE)/,$(shell cat $(wildcard $(PO)/domains/$*/*.srclist))) > $@.d + echo $@ : $(wildcard $(PO)/domains/$*/*.*list) $(addprefix $(BASE)/,$(shell cat $(wildcard $(PO)/domains/$*/*.srclist))) > $@.d.tmp + cmp --silent $@.d.tmp $@.d || mv $@.d.tmp $@.d # From sh source - cat $(PO)/domains/$*/*.shlist 2> /dev/null | (cd $(BASE) && xargs -n1 bash --dump-po-strings) > $(PO)/domains/$*/sh.pot + cat $(PO)/domains/$*/*.shlist 2> /dev/null | (cd $(BASE) && xargs -n1 bash --dump-po-strings) > $(PO)/domains/$*/sh.pot.tmp + cmp --silent $(PO)/domains/$*/sh.pot.tmp $(PO)/domains/$*/sh.pot || \ + mv $(PO)/domains/$*/sh.pot.tmp $(PO)/domains/$*/sh.pot # From C/C++ source cat $(PO)/domains/$*/*.srclist > $(PO)/POTFILES_$*.in $(XGETTEXT) --default-domain=$* --directory=$(BASE) \ --add-comments --foreign --keyword=_ --keyword=N_ \ --keyword=P_:1,2 \ - --files-from=$(PO)/POTFILES_$*.in -o $(PO)/domains/$*/c.pot + --files-from=$(PO)/POTFILES_$*.in -o $(PO)/domains/$*/c.pot.tmp + cmp --silent $(PO)/domains/$*/c.pot.tmp $(PO)/domains/$*/c.pot || \ + mv $(PO)/domains/$*/c.pot.tmp $(PO)/domains/$*/c.pot rm -f $(PO)/POTFILES_$*.in - $(MSGCOMM) --omit-header --more-than=0 $(PO)/domains/$*/c.pot $(PO)/domains/$*/sh.pot --output=$@ + $(MSGCOMM) --omit-header --more-than=0 $(PO)/domains/$*/c.pot $(PO)/domains/$*/sh.pot --output=$@.tmp + cmp --silent $@ $@.tmp || mv $@.tmp $@ # copy into the domain dirs to make rosetta happy rm -f $(PO)/domains/$*/*.pot cp $@ $(PO)/domains/$* @@ -93,4 +99,5 @@ ifneq ($(words $(The_DFiles)),0) include $(The_DFiles) endif +# otherwise the output is completely screwed .NOTPARALLEL: diff --git a/test/interactive-helper/makefile b/test/interactive-helper/makefile index 10d1e44ec..fa4f5fecb 100644 --- a/test/interactive-helper/makefile +++ b/test/interactive-helper/makefile @@ -1,6 +1,7 @@ # -*- make -*- BASE=../.. SUBDIR=test/interactive-helper +APT_DOMAIN=none # Bring in the default rules include ../../buildlib/defaults.mak diff --git a/test/libapt/makefile b/test/libapt/makefile index 953e455e0..1b67cba9d 100644 --- a/test/libapt/makefile +++ b/test/libapt/makefile @@ -2,6 +2,7 @@ BASE=../.. SUBDIR=test/libapt BASENAME=_libapt_test +APT_DOMAIN=none # Bring in the default rules include ../../buildlib/defaults.mak -- cgit v1.2.3 From 2128d3fce44da34ecb1f0d784b703807f66b20f9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sun, 9 Jun 2013 18:33:48 +0200 Subject: fail in CopyFile if the FileFds have error flag set Testing for global PendingErrors in users of CopyFile is incorrect in so far as unrelated errors will prevent us from copying perfectly fine files and checking for the validity of the files is just better in CopyFiles as it already checks if files are at least opened. Add also a higher-level error message to the error stack if it fails. --- apt-pkg/contrib/fileutl.cc | 3 ++- apt-pkg/indexcopy.cc | 6 ++---- debian/changelog | 1 + 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 7c3a302e2..0f88923cf 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -184,7 +184,8 @@ bool RunScripts(const char *Cnf) /* The caller is expected to set things so that failure causes erasure */ bool CopyFile(FileFd &From,FileFd &To) { - if (From.IsOpen() == false || To.IsOpen() == false) + if (From.IsOpen() == false || To.IsOpen() == false || + From.Failed() == true || To.Failed() == true) return false; // Buffered copy between fds diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index 0e36b3ded..1d61b974d 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -544,11 +544,9 @@ bool SigVerify::CopyMetaIndex(string CDROM, string CDName, /*{{{*/ FileFd Rel; Target.Open(TargetF,FileFd::WriteAtomic); Rel.Open(prefix + file,FileFd::ReadOnly); - if (_error->PendingError() == true) - return false; if (CopyFile(Rel,Target) == false) - return false; - + return _error->Error("Copying of '%s' for '%s' from '%s' failed", file.c_str(), CDName.c_str(), prefix.c_str()); + return true; } /*}}}*/ diff --git a/debian/changelog b/debian/changelog index 42a8e540e..cde0aba2f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ apt (0.9.8.3) UNRELEASED; urgency=low * set Fail flag in FileFd on all errors consistently * don't explicitly init ExtractTar InFd with invalid fd * OpenDescriptor should autoclose fd always on error (Closes: #704608) + * fail in CopyFile if the FileFds have error flag set -- David Kalnischkies <kalnischkies@gmail.com> Sun, 09 Jun 2013 15:06:24 +0200 -- cgit v1.2.3 From b2ea1a47531266377abe4f12c6f21417ea96eea0 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sun, 9 Jun 2013 18:58:34 +0200 Subject: ensure state-dir exists before coyping cdrom files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We do the same in the acquire system which handles the 'normal' downloads, so do it here as well even though its unlikely anyone will ever notice (beside testcases of course …) --- apt-pkg/cdrom.cc | 8 ++++++++ debian/changelog | 1 + test/integration/framework | 8 +++++--- test/integration/test-apt-cdrom | 2 +- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index 9a9a854bf..a5668a50a 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -829,6 +829,14 @@ bool pkgCdrom::Add(pkgCdromStatus *log) /*{{{*/ log->Update(msg.str()); log->Update(_("Copying package lists..."), STEP_COPY); } + + // check for existence and possibly create state directory for copying + string const listDir = _config->FindDir("Dir::State::lists"); + string const partialListDir = listDir + "partial/"; + if (CreateAPTDirectoryIfNeeded(_config->FindDir("Dir::State"), partialListDir) == false && + CreateAPTDirectoryIfNeeded(listDir, partialListDir) == false) + return _error->Errno("cdrom", _("List directory %spartial is missing."), listDir.c_str()); + // take care of the signatures and copy them if they are ok // (we do this before PackageCopy as it modifies "List" and "SourceList") SigVerify SignVerify; diff --git a/debian/changelog b/debian/changelog index cde0aba2f..7582b4f35 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ apt (0.9.8.3) UNRELEASED; urgency=low * don't explicitly init ExtractTar InFd with invalid fd * OpenDescriptor should autoclose fd always on error (Closes: #704608) * fail in CopyFile if the FileFds have error flag set + * ensure state-dir exists before coyping cdrom files -- David Kalnischkies <kalnischkies@gmail.com> Sun, 09 Jun 2013 15:06:24 +0200 diff --git a/test/integration/framework b/test/integration/framework index 7c2aed592..5c50498a2 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -692,9 +692,11 @@ setupaptarchive() { setupflataptarchive fi signreleasefiles - msgninfo "\tSync APT's cache with the archive… " - aptget update -qq - msgdone "info" + if [ "$1" != '--no-update' ]; then + msgninfo "\tSync APT's cache with the archive… " + aptget update -qq + msgdone "info" + fi } signreleasefiles() { diff --git a/test/integration/test-apt-cdrom b/test/integration/test-apt-cdrom index 3394aa505..6e3533152 100755 --- a/test/integration/test-apt-cdrom +++ b/test/integration/test-apt-cdrom @@ -7,7 +7,7 @@ setupenvironment configarchitecture 'amd64' 'i386' buildsimplenativepackage 'testing' 'amd64,i386' '0.8.15' 'stable' -setupaptarchive +setupaptarchive --no-update changetocdrom 'Debian APT Testdisk 0.8.15' -- cgit v1.2.3 From 8b8cc7bf85ac187bb9333f56c4c2c4dba27d3a7e Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sun, 9 Jun 2013 22:13:20 +0200 Subject: tests: add an interactive 'test' with multiple cdroms Can't be used as a test as is, but shows how to build multiple CD-ROMs for tests and can be used to reproduce debbug #711456. Git-Dch: Ignore --- ...kip-bug-711456-apt-cdrom-multiple-cds-multiarch | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100755 test/integration/skip-bug-711456-apt-cdrom-multiple-cds-multiarch diff --git a/test/integration/skip-bug-711456-apt-cdrom-multiple-cds-multiarch b/test/integration/skip-bug-711456-apt-cdrom-multiple-cds-multiarch new file mode 100755 index 000000000..9e683b5b9 --- /dev/null +++ b/test/integration/skip-bug-711456-apt-cdrom-multiple-cds-multiarch @@ -0,0 +1,47 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework +setupenvironment +configarchitecture 'amd64' 'i386' + +buildsimplenativepackage 'testing' 'amd64,i386' '0.8.15' 'stable' 'Depends: libtest' +buildsimplenativepackage 'libtest' 'amd64,i386' '0.8.15' 'stable' 'Multi-Arch: same' +buildsimplenativepackage 'libtest' 'amd64,i386' '1' 'unstable' 'Multi-Arch: same' + +# needed by the ftparchive.conf +cd aptarchive +ln -s ../incoming pool +createaptftparchiveconfig +cd - >/dev/null +# create an amd64 cdrom +sed -i 's#Architectures .*$#Architectures "amd64 source";#' aptarchive/ftparchive.conf +setupaptarchive --no-update +changetocdrom 'Debian APT Testdisk amd64 0.8.15' +mv rootdir/media/cdrom rootdir/media/cdrom-amd64 +addtrap 'prefix' "chmod -R +w $PWD/rootdir/media/cdrom-amd64/dists/;" +chmod -R -w rootdir/media/cdrom-amd64/dists +ln -s $PWD/rootdir/media/cdrom-amd64 $PWD/rootdir/media/cdrom +aptcdrom add -m -o quiet=1 +rm $PWD/rootdir/media/cdrom +# do it again to create a i386 cdrom +sed -i 's#Architectures .*$#Architectures "i386 source";#' aptarchive/ftparchive.conf +setupaptarchive --no-update +changetocdrom 'Debian APT Testdisk i386 0.8.15' +mv rootdir/media/cdrom rootdir/media/cdrom-i386 +addtrap 'prefix' "chmod -R +w $PWD/rootdir/media/cdrom-i386/dists/;" +chmod -R -w rootdir/media/cdrom-i386/dists +ln -s $PWD/rootdir/media/cdrom-i386 $PWD/rootdir/media/cdrom +aptcdrom add -m -o quiet=1 + +# play with the cdroms +testdpkgnotinstalled testing +aptget install testing -t stable -y #> /dev/null 2>&1 +testdpkginstalled testing + +testdpkgnotinstalled testing:i386 +aptget install testing:i386 -t stable -y #> /dev/null 2>&1 +testdpkginstalled testing:i386 + +aptget dist-upgrade -y -- cgit v1.2.3 From 00612a8c55aab3560966533fe77e4940f902b3b6 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Thu, 13 Jun 2013 13:52:18 +0200 Subject: fix file location for configure-index.gz in apt.conf(5) Closes: #711921 --- debian/changelog | 1 + doc/apt.conf.5.xml | 3 +- doc/po/apt-doc.pot | 279 +++++++++++++++++++------------------ doc/po/de.po | 359 ++++++++++++++++++++++++----------------------- doc/po/es.po | 323 +++++++++++++++++++++---------------------- doc/po/fr.po | 325 ++++++++++++++++++++++--------------------- doc/po/it.po | 399 ++++++++++++++++++++++++++++------------------------- doc/po/ja.po | 320 +++++++++++++++++++++--------------------- doc/po/pl.po | 306 ++++++++++++++++++++-------------------- doc/po/pt.po | 333 ++++++++++++++++++++++---------------------- doc/po/pt_BR.po | 306 ++++++++++++++++++++-------------------- 11 files changed, 1489 insertions(+), 1465 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7582b4f35..23e0a065a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ apt (0.9.8.3) UNRELEASED; urgency=low * OpenDescriptor should autoclose fd always on error (Closes: #704608) * fail in CopyFile if the FileFds have error flag set * ensure state-dir exists before coyping cdrom files + * fix file location for configure-index.gz in apt.conf(5) (Closes: #711921) -- David Kalnischkies <kalnischkies@gmail.com> Sun, 09 Jun 2013 15:06:24 +0200 diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index be1d7ade8..3cf3136d3 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -98,8 +98,7 @@ APT { DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; </programlisting></informalexample> - <para>In general the sample configuration file in - <filename>&docdir;examples/apt.conf</filename> &configureindex; + <para>In general the sample configuration file &configureindex; is a good guide for how it should look.</para> <para>Case is not significant in names of configuration items, so in the diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index d329a1be1..43c184106 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt-doc 0.9.8~20130508\n" +"Project-Id-Version: apt-doc 0.9.8.1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-05-08 18:12+0300\n" +"POT-Creation-Date: 2013-06-13 13:46+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1105,12 +1105,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125 apt.conf.5.xml:1168 apt_preferences.5.xml:698 +#: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125 apt.conf.5.xml:1167 apt_preferences.5.xml:698 msgid "Files" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 apt.conf.5.xml:1174 apt_preferences.5.xml:705 sources.list.5.xml:252 apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607 +#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252 apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607 msgid "See Also" msgstr "" @@ -2332,20 +2332,19 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:101 msgid "" -"In general the sample configuration file in " -"<filename>&docdir;examples/apt.conf</filename> &configureindex; is a good " -"guide for how it should look." +"In general the sample configuration file &configureindex; is a good guide " +"for how it should look." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:105 +#: apt.conf.5.xml:104 msgid "" "Case is not significant in names of configuration items, so in the previous " "example you could use <literal>dpkg::pre-install-pkgs</literal>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:108 +#: apt.conf.5.xml:107 msgid "" "Names for the configuration items are optional if a list is defined as can " "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If " @@ -2355,7 +2354,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:113 +#: apt.conf.5.xml:112 msgid "" "Two special commands are defined: <literal>#include</literal> (which is " "deprecated and not supported by alternative implementations) and " @@ -2367,7 +2366,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:123 +#: apt.conf.5.xml:122 msgid "" "The <literal>#clear</literal> command is the only way to delete a list or a " "complete scope. Reopening a scope (or using the syntax described below with " @@ -2377,7 +2376,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:131 +#: apt.conf.5.xml:130 msgid "" "All of the APT tools take an -o option which allows an arbitrary " "configuration directive to be specified on the command line. The syntax is a " @@ -2389,7 +2388,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:139 +#: apt.conf.5.xml:138 msgid "" "Note that appending items to a list using <literal>::</literal> only works " "for one item per line, and that you should not use it in combination with " @@ -2406,19 +2405,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:154 +#: apt.conf.5.xml:153 msgid "The APT Group" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:155 +#: apt.conf.5.xml:154 msgid "" "This group of options controls general APT behavior as well as holding the " "options for all of the tools." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:160 +#: apt.conf.5.xml:159 msgid "" "System Architecture; sets the architecture to use when fetching files and " "parsing package lists. The internal default is the architecture apt was " @@ -2426,7 +2425,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:167 +#: apt.conf.5.xml:166 msgid "" "All Architectures the system supports. For instance, CPUs implementing the " "<literal>amd64</literal> (also called <literal>x86-64</literal>) " @@ -2440,7 +2439,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:180 +#: apt.conf.5.xml:179 msgid "" "Default release to install packages from if more than one version is " "available. Contains release name, codename or release version. Examples: " @@ -2449,14 +2448,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:186 +#: apt.conf.5.xml:185 msgid "" "Ignore held packages; this global option causes the problem resolver to " "ignore held packages in its decision making." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:191 +#: apt.conf.5.xml:190 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -2465,7 +2464,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:199 +#: apt.conf.5.xml:198 msgid "" "Defaults to on, which will cause APT to install essential and important " "packages as soon as possible in an install/upgrade operation, in order to " @@ -2480,7 +2479,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:211 +#: apt.conf.5.xml:210 msgid "" "The immediate configuration marker is also applied in the potentially " "problematic case of circular dependencies, since a dependency with the " @@ -2497,7 +2496,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:224 +#: apt.conf.5.xml:223 msgid "" "Before a big operation like <literal>dist-upgrade</literal> is run with this " "option disabled you should try to explicitly <literal>install</literal> the " @@ -2508,7 +2507,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:235 +#: apt.conf.5.xml:234 msgid "" "Never enable this option unless you <emphasis>really</emphasis> know what " "you are doing. It permits APT to temporarily remove an essential package to " @@ -2521,7 +2520,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:247 +#: apt.conf.5.xml:246 msgid "" "APT uses since version 0.7.26 a resizable memory mapped cache file to store " "the available information. <literal>Cache-Start</literal> acts as a hint of " @@ -2542,38 +2541,38 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:263 +#: apt.conf.5.xml:262 msgid "Defines which packages are considered essential build dependencies." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:267 +#: apt.conf.5.xml:266 msgid "" "The Get subsection controls the &apt-get; tool; please see its documentation " "for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:272 +#: apt.conf.5.xml:271 msgid "" "The Cache subsection controls the &apt-cache; tool; please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:277 +#: apt.conf.5.xml:276 msgid "" "The CDROM subsection controls the &apt-cdrom; tool; please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:283 +#: apt.conf.5.xml:282 msgid "The Acquire Group" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:284 +#: apt.conf.5.xml:283 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages as well as the various \"acquire methods\" responsible for the " @@ -2581,7 +2580,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:291 +#: apt.conf.5.xml:290 msgid "" "Security related option defaulting to true, as giving a Release file's " "validation an expiration date prevents replay attacks over a long timescale, " @@ -2594,7 +2593,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:304 +#: apt.conf.5.xml:303 msgid "" "Maximum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@ -2606,7 +2605,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:316 +#: apt.conf.5.xml:315 msgid "" "Minimum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@ -2618,7 +2617,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:328 +#: apt.conf.5.xml:327 msgid "" "Try to download deltas called <literal>PDiffs</literal> for indexes (like " "<filename>Packages</filename> files) instead of downloading whole ones. True " @@ -2626,7 +2625,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:331 +#: apt.conf.5.xml:330 msgid "" "Two sub-options to limit the use of PDiffs are also available: " "<literal>FileLimit</literal> can be used to specify a maximum number of " @@ -2638,7 +2637,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:341 +#: apt.conf.5.xml:340 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of " "<literal>host</literal> or <literal>access</literal> which determines how " @@ -2648,21 +2647,21 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:349 +#: apt.conf.5.xml:348 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:354 +#: apt.conf.5.xml:353 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:359 +#: apt.conf.5.xml:358 msgid "" "<literal>http::Proxy</literal> sets the default proxy to use for HTTP " "URIs. It is in the standard form of " @@ -2675,7 +2674,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:367 +#: apt.conf.5.xml:366 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy not to use its cached " @@ -2687,14 +2686,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:377 apt.conf.5.xml:449 +#: apt.conf.5.xml:376 apt.conf.5.xml:448 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method; this value applies to the connection as well as the data timeout." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:380 +#: apt.conf.5.xml:379 msgid "" "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to " "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial " @@ -2706,14 +2705,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:387 +#: apt.conf.5.xml:386 msgid "" "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will " "follow redirects, which is enabled by default." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:390 +#: apt.conf.5.xml:389 msgid "" "The used bandwidth can be limited with " "<literal>Acquire::http::Dl-Limit</literal> which accepts integer values in " @@ -2723,7 +2722,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:395 +#: apt.conf.5.xml:394 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -2731,7 +2730,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:403 +#: apt.conf.5.xml:402 msgid "" "The <literal>Cache-control</literal>, <literal>Timeout</literal>, " "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and " @@ -2742,7 +2741,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:411 +#: apt.conf.5.xml:410 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is the " @@ -2766,7 +2765,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:432 +#: apt.conf.5.xml:431 msgid "" "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. " "It is in the standard form of " @@ -2787,7 +2786,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:452 +#: apt.conf.5.xml:451 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on; it works in nearly every environment. However, " @@ -2797,7 +2796,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:459 +#: apt.conf.5.xml:458 msgid "" "It is possible to proxy FTP over HTTP by setting the " "<envar>ftp_proxy</envar> environment variable to an HTTP URL - see the " @@ -2807,7 +2806,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:464 +#: apt.conf.5.xml:463 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -2817,13 +2816,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:478 +#: apt.conf.5.xml:477 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:473 +#: apt.conf.5.xml:472 msgid "" "For URIs using the <literal>cdrom</literal> method, the only configurable " "option is the mount point, <literal>cdrom::Mount</literal>, which must be " @@ -2836,7 +2835,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:486 +#: apt.conf.5.xml:485 msgid "" "For GPGV URIs the only configurable option is " "<literal>gpgv::Options</literal>, which passes additional parameters to " @@ -2844,7 +2843,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:497 +#: apt.conf.5.xml:496 #, no-wrap msgid "" "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> " @@ -2852,7 +2851,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:492 +#: apt.conf.5.xml:491 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -2864,19 +2863,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:502 +#: apt.conf.5.xml:501 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:505 +#: apt.conf.5.xml:504 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:498 +#: apt.conf.5.xml:497 msgid "" "Also, the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -2894,13 +2893,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:512 +#: apt.conf.5.xml:511 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:507 +#: apt.conf.5.xml:506 msgid "" "Note that the " "<literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be " @@ -2916,7 +2915,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:517 +#: apt.conf.5.xml:516 msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " @@ -2924,7 +2923,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:524 +#: apt.conf.5.xml:523 msgid "" "When downloading <literal>gzip</literal> compressed indexes (Packages, " "Sources, or Translations), keep them gzip compressed locally instead of " @@ -2933,7 +2932,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:532 +#: apt.conf.5.xml:531 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the " @@ -2945,13 +2944,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:549 +#: apt.conf.5.xml:548 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:537 +#: apt.conf.5.xml:536 msgid "" "The default list includes \"environment\" and " "\"en\". \"<literal>environment</literal>\" has a special meaning here: it " @@ -2973,7 +2972,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:550 +#: apt.conf.5.xml:549 msgid "" "Note: To prevent problems resulting from APT being executed in different " "environments (e.g. by different users or by other programs) all Translation " @@ -2983,22 +2982,22 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:559 +#: apt.conf.5.xml:558 msgid "When downloading, force to use only the IPv4 protocol." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:565 +#: apt.conf.5.xml:564 msgid "When downloading, force to use only the IPv6 protocol." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:572 +#: apt.conf.5.xml:571 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:574 +#: apt.conf.5.xml:573 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -3010,7 +3009,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:581 +#: apt.conf.5.xml:580 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -3023,7 +3022,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:590 +#: apt.conf.5.xml:589 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -3033,7 +3032,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:596 +#: apt.conf.5.xml:595 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -3041,7 +3040,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:599 msgid "" "Binary programs are pointed to by " "<literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> specifies " @@ -3053,7 +3052,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:608 +#: apt.conf.5.xml:607 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -3066,7 +3065,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:620 msgid "" "The <literal>Ignore-Files-Silently</literal> list can be used to specify " "which files APT should silently ignore while parsing the files in the " @@ -3077,12 +3076,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:630 +#: apt.conf.5.xml:629 msgid "APT in DSelect" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:632 +#: apt.conf.5.xml:631 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behavior. These are in the <literal>DSelect</literal> " @@ -3090,7 +3089,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:637 +#: apt.conf.5.xml:636 msgid "" "Cache Clean mode; this value may be one of <literal>always</literal>, " "<literal>prompt</literal>, <literal>auto</literal>, " @@ -3104,40 +3103,40 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:651 +#: apt.conf.5.xml:650 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the install phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:656 +#: apt.conf.5.xml:655 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the update phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:661 +#: apt.conf.5.xml:660 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:667 +#: apt.conf.5.xml:666 msgid "How APT calls &dpkg;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:668 +#: apt.conf.5.xml:667 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:673 +#: apt.conf.5.xml:672 msgid "" "This is a list of options to pass to &dpkg;. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -3145,7 +3144,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:679 +#: apt.conf.5.xml:678 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -3154,7 +3153,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:686 +#: apt.conf.5.xml:685 msgid "" "This is a list of shell commands to run before invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -3164,7 +3163,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:692 +#: apt.conf.5.xml:691 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -3175,26 +3174,26 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:700 +#: apt.conf.5.xml:699 msgid "" "APT chdirs to this directory before invoking &dpkg;, the default is " "<filename>/</filename>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:705 +#: apt.conf.5.xml:704 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages; the " "default is to disable signing and produce all binaries." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:710 +#: apt.conf.5.xml:709 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:711 +#: apt.conf.5.xml:710 msgid "" "APT can call &dpkg; in such a way as to let it make aggressive use of " "triggers over multiple calls of &dpkg;. Without further options &dpkg; will " @@ -3209,7 +3208,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:726 +#: apt.conf.5.xml:725 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -3219,7 +3218,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:720 +#: apt.conf.5.xml:719 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -3233,7 +3232,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:733 +#: apt.conf.5.xml:732 msgid "" "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -3246,7 +3245,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:741 +#: apt.conf.5.xml:740 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". The default value is " @@ -3264,7 +3263,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:756 +#: apt.conf.5.xml:755 msgid "" "If this option is set APT will call <command>dpkg --configure " "--pending</command> to let &dpkg; handle all required configurations and " @@ -3276,7 +3275,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:763 +#: apt.conf.5.xml:762 msgid "" "Useful for the <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal>, and " @@ -3287,7 +3286,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:776 +#: apt.conf.5.xml:775 #, no-wrap msgid "" "OrderList::Score {\n" @@ -3299,7 +3298,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:769 +#: apt.conf.5.xml:768 msgid "" "Essential packages (and their dependencies) should be configured immediately " "after unpacking. It is a good idea to do this quite early in the upgrade " @@ -3313,12 +3312,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:789 +#: apt.conf.5.xml:788 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:790 +#: apt.conf.5.xml:789 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by the " @@ -3327,12 +3326,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:798 +#: apt.conf.5.xml:797 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:800 +#: apt.conf.5.xml:799 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -3343,7 +3342,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:811 +#: apt.conf.5.xml:810 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, " @@ -3351,7 +3350,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:819 +#: apt.conf.5.xml:818 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s " @@ -3359,7 +3358,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:828 +#: apt.conf.5.xml:827 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -3369,65 +3368,65 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:836 +#: apt.conf.5.xml:835 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CD-ROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:846 +#: apt.conf.5.xml:845 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:855 +#: apt.conf.5.xml:854 msgid "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:866 +#: apt.conf.5.xml:865 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:877 +#: apt.conf.5.xml:876 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:888 +#: apt.conf.5.xml:887 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:899 +#: apt.conf.5.xml:898 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:910 +#: apt.conf.5.xml:909 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:920 +#: apt.conf.5.xml:919 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:930 +#: apt.conf.5.xml:929 msgid "" "Output each cryptographic hash that is generated by the " "<literal>apt</literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:940 +#: apt.conf.5.xml:939 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -3435,52 +3434,52 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:951 +#: apt.conf.5.xml:950 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:963 +#: apt.conf.5.xml:962 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:973 +#: apt.conf.5.xml:972 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:983 +#: apt.conf.5.xml:982 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:995 +#: apt.conf.5.xml:994 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1006 +#: apt.conf.5.xml:1005 msgid "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1017 +#: apt.conf.5.xml:1016 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1027 +#: apt.conf.5.xml:1026 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial " @@ -3490,7 +3489,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1041 +#: apt.conf.5.xml:1040 msgid "" "Generate debug messages describing which packages are marked as " "keep/install/remove while the ProblemResolver does his work. Each addition " @@ -3508,45 +3507,45 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1062 +#: apt.conf.5.xml:1061 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1073 +#: apt.conf.5.xml:1072 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1084 +#: apt.conf.5.xml:1083 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1096 +#: apt.conf.5.xml:1095 msgid "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1107 +#: apt.conf.5.xml:1106 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1117 +#: apt.conf.5.xml:1116 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1128 +#: apt.conf.5.xml:1127 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -3554,19 +3553,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1140 +#: apt.conf.5.xml:1139 msgid "" "Print information about the vendors read from " "<filename>/etc/apt/vendors.list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:1162 apt_preferences.5.xml:545 sources.list.5.xml:211 apt-ftparchive.1.xml:596 +#: apt.conf.5.xml:1161 apt_preferences.5.xml:545 sources.list.5.xml:211 apt-ftparchive.1.xml:596 msgid "Examples" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1163 +#: apt.conf.5.xml:1162 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -3574,7 +3573,7 @@ msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1175 +#: apt.conf.5.xml:1174 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "" diff --git a/doc/po/de.po b/doc/po/de.po index e4c7420b4..8ecbf4cbf 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 0.9.7\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-02 15:13+0300\n" +"POT-Creation-Date: 2013-06-13 13:46+0300\n" "PO-Revision-Date: 2012-06-25 22:49+0100\n" "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" @@ -763,9 +763,9 @@ msgid "" "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" -"product-version;_amd64.deb</filename>). All packages required by the package" -"(s) specified for installation will also be retrieved and installed. The " -"<filename>/etc/apt/sources.list</filename> file is used to locate the " +"product-version;_amd64.deb</filename>). All packages required by the " +"package(s) specified for installation will also be retrieved and installed. " +"The <filename>/etc/apt/sources.list</filename> file is used to locate the " "desired packages. If a hyphen is appended to the package name (with no " "intervening space), the identified package will be removed if it is " "installed. Similarly a plus sign can be used to designate a package to " @@ -1543,14 +1543,14 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125 -#: apt.conf.5.xml:1168 apt_preferences.5.xml:698 +#: apt.conf.5.xml:1167 apt_preferences.5.xml:698 msgid "Files" msgstr "Dateien" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 #: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 -#: apt.conf.5.xml:1174 apt_preferences.5.xml:705 sources.list.5.xml:252 +#: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 #: apt-ftparchive.1.xml:607 msgid "See Also" @@ -3258,15 +3258,14 @@ msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:101 msgid "" -"In general the sample configuration file in <filename>&docdir;examples/apt." -"conf</filename> &configureindex; is a good guide for how it should look." +"In general the sample configuration file &configureindex; is a good guide " +"for how it should look." msgstr "" -"Im Allgemeinen bietet die Beispielkonfigurationsdatei in <filename>&docdir;" -"examples/apt.conf</filename> &configureindex; eine gute Anleitung, wie dies " -"aussehen könnte." +"Im Allgemeinen bietet die Beispielkonfigurationsdatei &configureindex; eine " +"gute Anleitung, wie dies aussehen könnte." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:105 +#: apt.conf.5.xml:104 msgid "" "Case is not significant in names of configuration items, so in the previous " "example you could use <literal>dpkg::pre-install-pkgs</literal>." @@ -3276,7 +3275,7 @@ msgstr "" "<literal>dpkg::pre-install-pkgs</literal> benutzen." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:108 +#: apt.conf.5.xml:107 msgid "" "Names for the configuration items are optional if a list is defined as can " "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If " @@ -3292,7 +3291,7 @@ msgstr "" "überschreiben, indem Sie der Option erneut einen neuen Wert zuweisen." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:113 +#: apt.conf.5.xml:112 msgid "" "Two special commands are defined: <literal>#include</literal> (which is " "deprecated and not supported by alternative implementations) and " @@ -3312,7 +3311,7 @@ msgstr "" "(Beachten Sie, dass diese Zeilen auch mit einem Schrägstrich enden müssen.)" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:123 +#: apt.conf.5.xml:122 msgid "" "The <literal>#clear</literal> command is the only way to delete a list or a " "complete scope. Reopening a scope (or using the syntax described below with " @@ -3329,7 +3328,7 @@ msgstr "" "nicht außer Kraft gesetzt, sondern nur bereinigt werden." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:131 +#: apt.conf.5.xml:130 msgid "" "All of the APT tools take an -o option which allows an arbitrary " "configuration directive to be specified on the command line. The syntax is a " @@ -3349,7 +3348,7 @@ msgstr "" "Befehlszeile benutzt werden.)" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:139 +#: apt.conf.5.xml:138 msgid "" "Note that appending items to a list using <literal>::</literal> only works " "for one item per line, and that you should not use it in combination with " @@ -3381,12 +3380,12 @@ msgstr "" "beklagt." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:154 +#: apt.conf.5.xml:153 msgid "The APT Group" msgstr "Die APT-Gruppe" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:155 +#: apt.conf.5.xml:154 msgid "" "This group of options controls general APT behavior as well as holding the " "options for all of the tools." @@ -3395,7 +3394,7 @@ msgstr "" "wie es die Optionen für alle Werkzeuge enthält." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:160 +#: apt.conf.5.xml:159 msgid "" "System Architecture; sets the architecture to use when fetching files and " "parsing package lists. The internal default is the architecture apt was " @@ -3406,7 +3405,7 @@ msgstr "" "die Architektur für die APT kompiliert wurde." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:167 +#: apt.conf.5.xml:166 msgid "" "All Architectures the system supports. For instance, CPUs implementing the " "<literal>amd64</literal> (also called <literal>x86-64</literal>) " @@ -3428,7 +3427,7 @@ msgstr "" "print-architectures</command> registriert werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:180 +#: apt.conf.5.xml:179 msgid "" "Default release to install packages from if more than one version is " "available. Contains release name, codename or release version. Examples: " @@ -3441,7 +3440,7 @@ msgstr "" "codename;«, »4.0«, »5.0*«. Siehe auch &apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:186 +#: apt.conf.5.xml:185 msgid "" "Ignore held packages; this global option causes the problem resolver to " "ignore held packages in its decision making." @@ -3450,7 +3449,7 @@ msgstr "" "Problemlöser, gehaltene Pakete beim Treffen von Entscheidungen zu ignorieren." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:191 +#: apt.conf.5.xml:190 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -3465,7 +3464,7 @@ msgstr "" "Möglichkeiten bereitstellt, um sie erneut zu installieren." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:199 +#: apt.conf.5.xml:198 msgid "" "Defaults to on, which will cause APT to install essential and important " "packages as soon as possible in an install/upgrade operation, in order to " @@ -3493,7 +3492,7 @@ msgstr "" "Abhängigkeit von A nicht länger erfüllt wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:211 +#: apt.conf.5.xml:210 msgid "" "The immediate configuration marker is also applied in the potentially " "problematic case of circular dependencies, since a dependency with the " @@ -3523,7 +3522,7 @@ msgstr "" "Stelle verhindern kann." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:224 +#: apt.conf.5.xml:223 msgid "" "Before a big operation like <literal>dist-upgrade</literal> is run with this " "option disabled you should try to explicitly <literal>install</literal> the " @@ -3541,7 +3540,7 @@ msgstr "" "des Upgrade-Prozesses arbeiten können." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:235 +#: apt.conf.5.xml:234 msgid "" "Never enable this option unless you <emphasis>really</emphasis> know what " "you are doing. It permits APT to temporarily remove an essential package to " @@ -3563,7 +3562,7 @@ msgstr "" "davon abhängt, sind." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:247 +#: apt.conf.5.xml:246 msgid "" "APT uses since version 0.7.26 a resizable memory mapped cache file to store " "the available information. <literal>Cache-Start</literal> acts as a hint of " @@ -3600,13 +3599,13 @@ msgstr "" "auf 0 gesetzt ist, kann der Zwischenspeicher nicht automatisch wachsen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:263 +#: apt.conf.5.xml:262 msgid "Defines which packages are considered essential build dependencies." msgstr "" "definiert, welche Pakete als essentielle Bauabhängigkeiten betrachtet werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:267 +#: apt.conf.5.xml:266 msgid "" "The Get subsection controls the &apt-get; tool; please see its documentation " "for more information about the options here." @@ -3616,7 +3615,7 @@ msgstr "" "erhalten." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:272 +#: apt.conf.5.xml:271 msgid "" "The Cache subsection controls the &apt-cache; tool; please see its " "documentation for more information about the options here." @@ -3626,7 +3625,7 @@ msgstr "" "erhalten." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:277 +#: apt.conf.5.xml:276 msgid "" "The CDROM subsection controls the &apt-cdrom; tool; please see its " "documentation for more information about the options here." @@ -3636,12 +3635,12 @@ msgstr "" "erhalten." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:283 +#: apt.conf.5.xml:282 msgid "The Acquire Group" msgstr "Die Erwerbgruppe" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:284 +#: apt.conf.5.xml:283 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages as well as the various \"acquire methods\" responsible for the " @@ -3652,7 +3651,7 @@ msgstr "" "Herunterladen selbst zuständig sind (siehe auch &sources-list;)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:291 +#: apt.conf.5.xml:290 msgid "" "Security related option defaulting to true, as giving a Release file's " "validation an expiration date prevents replay attacks over a long timescale, " @@ -3674,7 +3673,7 @@ msgstr "" "ValidTime</literal> unten benutzt werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:304 +#: apt.conf.5.xml:303 msgid "" "Maximum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@ -3693,7 +3692,7 @@ msgstr "" "Anhängen der Archivbezeichnung an den Optionsnamen vorgenommen werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:316 +#: apt.conf.5.xml:315 msgid "" "Minimum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@ -3713,7 +3712,7 @@ msgstr "" "Optionsnamen vorgenommen werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:328 +#: apt.conf.5.xml:327 msgid "" "Try to download deltas called <literal>PDiffs</literal> for indexes (like " "<filename>Packages</filename> files) instead of downloading whole ones. True " @@ -3724,7 +3723,7 @@ msgstr "" "der kompletten Dateien. Vorgabe ist True." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:331 +#: apt.conf.5.xml:330 msgid "" "Two sub-options to limit the use of PDiffs are also available: " "<literal>FileLimit</literal> can be used to specify a maximum number of " @@ -3742,7 +3741,7 @@ msgstr "" "komplette Datei anstelle der Patche heruntergeladen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:341 +#: apt.conf.5.xml:340 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -3758,7 +3757,7 @@ msgstr "" "URI-Art geöffnet wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:349 +#: apt.conf.5.xml:348 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." @@ -3767,7 +3766,7 @@ msgstr "" "APT fehlgeschlagene Dateien in der angegebenen Zahl erneut versuchen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:354 +#: apt.conf.5.xml:353 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." @@ -3777,7 +3776,7 @@ msgstr "" "kopiert zu werden. True ist die Vorgabe." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:359 +#: apt.conf.5.xml:358 msgid "" "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. " "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</" @@ -3788,15 +3787,15 @@ msgid "" "be used." msgstr "" "<literal>http::Proxy</literal> ist der zu benutzende Standard-HTTP-Proxy. Er " -"wird standardmäßig in der Form <literal>http://[[Anwender][:Passwort]@]" -"Rechner[:Port]/</literal> angegeben. Durch Rechner-Proxies kann außerdem in " -"der Form <literal>http::Proxy::<host></literal> mit dem speziellen " -"Schlüsselwort <literal>DIRECT</literal> angegeben werden, dass keine Proxies " -"benutzt werden. Falls keine der obigen Einstellungen angegeben wurde, wird " -"die Umgebungsvariable <envar>http_proxy</envar> benutzt." +"wird standardmäßig in der Form <literal>http://[[Anwender][:" +"Passwort]@]Rechner[:Port]/</literal> angegeben. Durch Rechner-Proxies kann " +"außerdem in der Form <literal>http::Proxy::<host></literal> mit dem " +"speziellen Schlüsselwort <literal>DIRECT</literal> angegeben werden, dass " +"keine Proxies benutzt werden. Falls keine der obigen Einstellungen angegeben " +"wurde, wird die Umgebungsvariable <envar>http_proxy</envar> benutzt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:367 +#: apt.conf.5.xml:366 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy not to use its cached " @@ -3817,7 +3816,7 @@ msgstr "" "Zwischenspeicher mit (großen) .deb-Dateien verunreinigt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:377 apt.conf.5.xml:449 +#: apt.conf.5.xml:376 apt.conf.5.xml:448 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method; this value applies to the connection as well as the data timeout." @@ -3827,7 +3826,7 @@ msgstr "" "Datenzeitüberschreitungen angewandt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:380 +#: apt.conf.5.xml:379 msgid "" "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to " "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e." @@ -3847,7 +3846,7 @@ msgstr "" "HTTP/1.1-Spezifikation entsprechen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:387 +#: apt.conf.5.xml:386 msgid "" "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will " "follow redirects, which is enabled by default." @@ -3856,7 +3855,7 @@ msgstr "" "folgen wird, was standardmäßig aktiviert ist." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:390 +#: apt.conf.5.xml:389 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobytes. The default value is 0 " @@ -3872,7 +3871,7 @@ msgstr "" "deaktiviert.)" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:395 +#: apt.conf.5.xml:394 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -3884,7 +3883,7 @@ msgstr "" "bekannten Bezeichner verwendet." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:403 +#: apt.conf.5.xml:402 msgid "" "The <literal>Cache-control</literal>, <literal>Timeout</literal>, " "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and " @@ -3901,7 +3900,7 @@ msgstr "" "<literal>Pipeline-Depth</literal> wird noch nicht unterstützt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:411 +#: apt.conf.5.xml:410 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is the " @@ -3942,7 +3941,7 @@ msgstr "" "Rechner ist <literal><host>::SslForceVersion</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:432 +#: apt.conf.5.xml:431 msgid "" "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. " "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</" @@ -3977,7 +3976,7 @@ msgstr "" "literal> und <literal>$(SITE_PORT)</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:452 +#: apt.conf.5.xml:451 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on; it works in nearly every environment. However, " @@ -3994,7 +3993,7 @@ msgstr "" "Musterkonfigurationsdatei)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:459 +#: apt.conf.5.xml:458 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to an HTTP URL - see the discussion of the http " @@ -4008,7 +4007,7 @@ msgstr "" "Effizienz nicht empfohlen FTP über HTTP zu benutzen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:464 +#: apt.conf.5.xml:463 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -4024,13 +4023,13 @@ msgstr "" "Server RFC2428 unterstützen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:478 +#: apt.conf.5.xml:477 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "/cdrom/::Mount \"foo\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:473 +#: apt.conf.5.xml:472 msgid "" "For URIs using the <literal>cdrom</literal> method, the only configurable " "option is the mount point, <literal>cdrom::Mount</literal>, which must be " @@ -4052,7 +4051,7 @@ msgstr "" "Aushängebefehle können per UMount angegeben werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:486 +#: apt.conf.5.xml:485 msgid "" "For GPGV URIs the only configurable option is <literal>gpgv::Options</" "literal>, which passes additional parameters to gpgv." @@ -4061,13 +4060,13 @@ msgstr "" "literal>, um zusätzliche Parameter an Gpgv weiterzuleiten." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:497 +#: apt.conf.5.xml:496 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "Acquire::CompressionTypes::<replaceable>Dateierweiterung</replaceable> \"<replaceable>Methodenname</replaceable>\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:492 +#: apt.conf.5.xml:491 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -4087,19 +4086,19 @@ msgstr "" "\"synopsis\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:502 +#: apt.conf.5.xml:501 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "Acquire::CompressionTypes::Order:: \"gz\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:505 +#: apt.conf.5.xml:504 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:498 +#: apt.conf.5.xml:497 msgid "" "Also, the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -4131,13 +4130,13 @@ msgstr "" "explizit zur Liste hinzuzufügen, da es automatisch hinzufügt wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:512 +#: apt.conf.5.xml:511 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:507 +#: apt.conf.5.xml:506 msgid "" "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></" "literal> will be checked at run time. If this option has been set, the " @@ -4163,7 +4162,7 @@ msgstr "" "nicht überschreiben, es wird diesen Typ nur vor die Liste setzen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:517 +#: apt.conf.5.xml:516 msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " @@ -4175,7 +4174,7 @@ msgstr "" "dies meist nur für lokale Spiegel benutzt werden kann." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:524 +#: apt.conf.5.xml:523 msgid "" "When downloading <literal>gzip</literal> compressed indexes (Packages, " "Sources, or Translations), keep them gzip compressed locally instead of " @@ -4189,7 +4188,7 @@ msgstr "" "False." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:532 +#: apt.conf.5.xml:531 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the description-" @@ -4209,13 +4208,13 @@ msgstr "" "langen Sprachcodes selten." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:549 +#: apt.conf.5.xml:548 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:537 +#: apt.conf.5.xml:536 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: it will be " @@ -4256,7 +4255,7 @@ msgstr "" "\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:550 +#: apt.conf.5.xml:549 msgid "" "Note: To prevent problems resulting from APT being executed in different " "environments (e.g. by different users or by other programs) all Translation " @@ -4270,22 +4269,22 @@ msgstr "" "Liste hinzugefügt (nach einem impliziten »<literal>none</literal>«)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:559 +#: apt.conf.5.xml:558 msgid "When downloading, force to use only the IPv4 protocol." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:565 +#: apt.conf.5.xml:564 msgid "When downloading, force to use only the IPv6 protocol." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:572 +#: apt.conf.5.xml:571 msgid "Directories" msgstr "Verzeichnisse" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:574 +#: apt.conf.5.xml:573 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -4305,7 +4304,7 @@ msgstr "" "nicht mit <filename>/</filename> oder <filename>./</filename> beginnen." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:581 +#: apt.conf.5.xml:580 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -4328,7 +4327,7 @@ msgstr "" "Standardverzeichnis in <literal>Dir::Cache</literal> enthalten." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:590 +#: apt.conf.5.xml:589 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -4343,7 +4342,7 @@ msgstr "" "Konfigurationsdatei erfolgt)." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:596 +#: apt.conf.5.xml:595 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -4355,7 +4354,7 @@ msgstr "" "geladen." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:599 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -4373,7 +4372,7 @@ msgstr "" "Programms an." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:608 +#: apt.conf.5.xml:607 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -4393,7 +4392,7 @@ msgstr "" "<filename>/tmp/staging/var/lib/dpkg/status</filename> nachgesehen." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:620 msgid "" "The <literal>Ignore-Files-Silently</literal> list can be used to specify " "which files APT should silently ignore while parsing the files in the " @@ -4411,12 +4410,12 @@ msgstr "" "diese Muster verwandt werden." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:630 +#: apt.conf.5.xml:629 msgid "APT in DSelect" msgstr "APT in DSelect" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:632 +#: apt.conf.5.xml:631 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behavior. These are in the <literal>DSelect</literal> " @@ -4427,7 +4426,7 @@ msgstr "" "<literal>DSelect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:637 +#: apt.conf.5.xml:636 msgid "" "Cache Clean mode; this value may be one of <literal>always</literal>, " "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</" @@ -4450,7 +4449,7 @@ msgstr "" "vor dem Herunterladen neuer Pakete durch." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:651 +#: apt.conf.5.xml:650 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the install phase." @@ -4459,7 +4458,7 @@ msgstr "" "übermittelt, wenn es für die Installationsphase durchlaufen wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:656 +#: apt.conf.5.xml:655 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the update phase." @@ -4468,7 +4467,7 @@ msgstr "" "übermittelt, wenn es für die Aktualisierungsphase durchlaufen wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:661 +#: apt.conf.5.xml:660 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@ -4477,12 +4476,12 @@ msgstr "" "nachfragen, um fortzufahren. Vorgabe ist es, nur bei Fehlern nachzufragen." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:667 +#: apt.conf.5.xml:666 msgid "How APT calls &dpkg;" msgstr "Wie APT &dpkg; aufruft" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:668 +#: apt.conf.5.xml:667 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@ -4491,7 +4490,7 @@ msgstr "" "stehen im Abschnitt <literal>DPkg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:673 +#: apt.conf.5.xml:672 msgid "" "This is a list of options to pass to &dpkg;. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -4502,7 +4501,7 @@ msgstr "" "jedes Listenelement wird als einzelnes Argument an &dpkg; übermittelt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:679 +#: apt.conf.5.xml:678 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -4516,7 +4515,7 @@ msgstr "" "APT abgebrochen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:686 +#: apt.conf.5.xml:685 msgid "" "This is a list of shell commands to run before invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -4532,7 +4531,7 @@ msgstr "" "die es installieren wird, auf der Standardeingabe übergeben, einen pro Zeile." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:692 +#: apt.conf.5.xml:691 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -4548,7 +4547,7 @@ msgstr "" "literal> gegeben wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:700 +#: apt.conf.5.xml:699 msgid "" "APT chdirs to this directory before invoking &dpkg;, the default is " "<filename>/</filename>." @@ -4557,7 +4556,7 @@ msgstr "" "die Vorgabe ist <filename>/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:705 +#: apt.conf.5.xml:704 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages; the " "default is to disable signing and produce all binaries." @@ -4567,12 +4566,12 @@ msgstr "" "Programme werden erstellt." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:710 +#: apt.conf.5.xml:709 msgid "dpkg trigger usage (and related options)" msgstr "Dpkd-Trigger-Benutzung (und zugehörige Optionen)" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:711 +#: apt.conf.5.xml:710 msgid "" "APT can call &dpkg; in such a way as to let it make aggressive use of " "triggers over multiple calls of &dpkg;. Without further options &dpkg; will " @@ -4599,7 +4598,7 @@ msgstr "" "Pakete konfiguriert werden." #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:726 +#: apt.conf.5.xml:725 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -4613,7 +4612,7 @@ msgstr "" "DPkg::TriggersPending \"true\";" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:720 +#: apt.conf.5.xml:719 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -4638,7 +4637,7 @@ msgstr "" "Optionenkombination wäre <placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:733 +#: apt.conf.5.xml:732 msgid "" "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -4661,7 +4660,7 @@ msgstr "" "anhängen." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:741 +#: apt.conf.5.xml:740 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". The default value is \"<literal>all</literal>" @@ -4691,7 +4690,7 @@ msgstr "" "enden könnte und möglicherweise nicht mehr startbar ist." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:756 +#: apt.conf.5.xml:755 msgid "" "If this option is set APT will call <command>dpkg --configure --pending</" "command> to let &dpkg; handle all required configurations and triggers. This " @@ -4710,7 +4709,7 @@ msgstr "" "deaktivieren." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:763 +#: apt.conf.5.xml:762 msgid "" "Useful for the <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal>, and " @@ -4726,7 +4725,7 @@ msgstr "" "benötigt werden." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:776 +#: apt.conf.5.xml:775 #, no-wrap msgid "" "OrderList::Score {\n" @@ -4744,7 +4743,7 @@ msgstr "" "};" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:769 +#: apt.conf.5.xml:768 msgid "" "Essential packages (and their dependencies) should be configured immediately " "after unpacking. It is a good idea to do this quite early in the upgrade " @@ -4768,12 +4767,12 @@ msgstr "" "mit ihren Vorgabewerten. <placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:789 +#: apt.conf.5.xml:788 msgid "Periodic and Archives options" msgstr "Periodische- und Archivoptionen" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:790 +#: apt.conf.5.xml:789 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by the " @@ -4787,12 +4786,12 @@ msgstr "" "Dokumentation dieser Optionen zu erhalten." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:798 +#: apt.conf.5.xml:797 msgid "Debug options" msgstr "Fehlersuchoptionen" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:800 +#: apt.conf.5.xml:799 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -4810,7 +4809,7 @@ msgstr "" "könnten es sein:" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:811 +#: apt.conf.5.xml:810 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -4821,7 +4820,7 @@ msgstr "" "getroffenen Entscheidungen ein." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:819 +#: apt.conf.5.xml:818 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -4832,7 +4831,7 @@ msgstr "" "<literal>apt-get -s install</literal>) als nicht root-Anwender auszuführen." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:828 +#: apt.conf.5.xml:827 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -4844,7 +4843,7 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:836 +#: apt.conf.5.xml:835 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CD-ROM IDs." @@ -4853,12 +4852,12 @@ msgstr "" "Daten in CD-ROM-IDs aus." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:846 +#: apt.conf.5.xml:845 msgid "A full list of debugging options to apt follows." msgstr "Eine vollständige Liste der Fehlersuchoptionen von APT folgt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:855 +#: apt.conf.5.xml:854 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" @@ -4866,28 +4865,28 @@ msgstr "" "literal>-Quellen beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:866 +#: apt.conf.5.xml:865 msgid "Print information related to downloading packages using FTP." msgstr "" "gibt Informationen aus, die sich auf das Herunterladen von Paketen per FTP " "beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:877 +#: apt.conf.5.xml:876 msgid "Print information related to downloading packages using HTTP." msgstr "" "gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTP " "beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:888 +#: apt.conf.5.xml:887 msgid "Print information related to downloading packages using HTTPS." msgstr "" "gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTPS " "beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:899 +#: apt.conf.5.xml:898 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@ -4896,7 +4895,7 @@ msgstr "" "mittels <literal>gpg</literal> beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:910 +#: apt.conf.5.xml:909 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." @@ -4905,13 +4904,13 @@ msgstr "" "CD-ROMs gespeichert sind." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:920 +#: apt.conf.5.xml:919 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" "beschreibt den Prozess der Auflösung von Bauabhängigkeiten in &apt-get;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:930 +#: apt.conf.5.xml:929 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." @@ -4920,7 +4919,7 @@ msgstr "" "Bibliotheken generiert wurde." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:940 +#: apt.conf.5.xml:939 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -4931,7 +4930,7 @@ msgstr "" "ID für eine CD-ROM generiert wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:951 +#: apt.conf.5.xml:950 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." @@ -4941,14 +4940,14 @@ msgstr "" "gleichen Zeit laufen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:963 +#: apt.conf.5.xml:962 msgid "Log when items are added to or removed from the global download queue." msgstr "" "protokolliert, wenn Elemente aus der globalen Warteschlange zum " "Herunterladen hinzugefügt oder entfernt werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:973 +#: apt.conf.5.xml:972 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." @@ -4957,7 +4956,7 @@ msgstr "" "und kryptografischen Signaturen von heruntergeladenen Dateien beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:983 +#: apt.conf.5.xml:982 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." @@ -4966,7 +4965,7 @@ msgstr "" "Diffs und Fehler, die die Paketindexlisten-Diffs betreffen, aus." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:995 +#: apt.conf.5.xml:994 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." @@ -4976,7 +4975,7 @@ msgstr "" "werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1006 +#: apt.conf.5.xml:1005 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" @@ -4984,7 +4983,7 @@ msgstr "" "durchführen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1017 +#: apt.conf.5.xml:1016 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." @@ -4994,7 +4993,7 @@ msgstr "" "beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1027 +#: apt.conf.5.xml:1026 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -5010,7 +5009,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1041 +#: apt.conf.5.xml:1040 msgid "" "Generate debug messages describing which packages are marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -5032,18 +5031,18 @@ msgstr "" "auslösen. Sie werden nach zwei eingerückten Leerzeichen unter dem " "Originaleintrag angezeigt. Jede Zeile hat das Format <literal>MarkKeep</" "literal>, <literal>MarkDelete</literal> oder <literal>MarkInstall</literal> " -"gefolgt von <literal>Paketname <a.b.c -> d.e.f | x.y.z> (Abschnitt)" -"</literal> wobei <literal>a.b.c</literal> die aktuelle Version des Paketes " -"ist, <literal>d.e.f</literal> die Version ist, die zur Installation " -"vorgesehen ist und <literal>x.y.z</literal> eine neuere Version ist, die " -"aber nicht zur Installation vorgesehen ist (aufgrund einer niedrigen Pinning-" -"Bewertung). Die letzten beiden können weggelassen werden, wenn es keine gibt " -"oder wenn sie die gleiche Version haben, wie die, die installiert ist. " -"<literal>section</literal> ist der Name des Abschnitts, in dem das Paket " -"erscheint." +"gefolgt von <literal>Paketname <a.b.c -> d.e.f | x.y.z> " +"(Abschnitt)</literal> wobei <literal>a.b.c</literal> die aktuelle Version " +"des Paketes ist, <literal>d.e.f</literal> die Version ist, die zur " +"Installation vorgesehen ist und <literal>x.y.z</literal> eine neuere Version " +"ist, die aber nicht zur Installation vorgesehen ist (aufgrund einer " +"niedrigen Pinning-Bewertung). Die letzten beiden können weggelassen werden, " +"wenn es keine gibt oder wenn sie die gleiche Version haben, wie die, die " +"installiert ist. <literal>section</literal> ist der Name des Abschnitts, in " +"dem das Paket erscheint." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1062 +#: apt.conf.5.xml:1061 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." @@ -5053,7 +5052,7 @@ msgstr "" "sind, aus." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1073 +#: apt.conf.5.xml:1072 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." @@ -5062,7 +5061,7 @@ msgstr "" "und alle während deren Auswertung gefundenen Fehler aus." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1084 +#: apt.conf.5.xml:1083 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." @@ -5072,7 +5071,7 @@ msgstr "" "soll." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1096 +#: apt.conf.5.xml:1095 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" @@ -5080,12 +5079,12 @@ msgstr "" "von &dpkg; ausgeführt werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1107 +#: apt.conf.5.xml:1106 msgid "Output the priority of each package list on startup." msgstr "gibt die Priorität jeder Paketliste beim Start aus." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1117 +#: apt.conf.5.xml:1116 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." @@ -5095,7 +5094,7 @@ msgstr "" "aufgetreten ist)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1128 +#: apt.conf.5.xml:1127 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -5107,7 +5106,7 @@ msgstr "" "Marker</literal> beschrieben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1140 +#: apt.conf.5.xml:1139 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@ -5116,13 +5115,13 @@ msgstr "" "filename> gelesenen Anbieter aus." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:1162 apt_preferences.5.xml:545 sources.list.5.xml:211 +#: apt.conf.5.xml:1161 apt_preferences.5.xml:545 sources.list.5.xml:211 #: apt-ftparchive.1.xml:596 msgid "Examples" msgstr "Beispiele" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1163 +#: apt.conf.5.xml:1162 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -5132,7 +5131,7 @@ msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1175 +#: apt.conf.5.xml:1174 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." @@ -6285,9 +6284,9 @@ msgid "" "id=\"0\"/>" msgstr "" "Mit einer geeigneten &sources-list;-Datei und der obigen Einstellungsdatei " -"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die neuste" -"(n) <literal>stable</literal>-Version(en) durchzuführen. <placeholder type=" -"\"programlisting\" id=\"0\"/>" +"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die " +"neuste(n) <literal>stable</literal>-Version(en) durchzuführen. <placeholder " +"type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt_preferences.5.xml:584 @@ -6368,9 +6367,9 @@ msgid "" "id=\"0\"/>" msgstr "" "Mit einer geeigneten &sources-list;-Datei und der obigen Einstellungsdatei " -"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die neuste" -"(n) <literal>testing</literal>-Version(en) durchzuführen. <placeholder type=" -"\"programlisting\" id=\"0\"/>" +"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die " +"neuste(n) <literal>testing</literal>-Version(en) durchzuführen. <placeholder " +"type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt_preferences.5.xml:633 @@ -6473,8 +6472,8 @@ msgid "" "<placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" "Mit einer geeigneten &sources-list;-Datei und der obigen Einstellungsdatei " -"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die letzte" -"(n) Version(en) im Release mit Codenamen <literal>&testing-codename;</" +"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die " +"letzte(n) Version(en) im Release mit Codenamen <literal>&testing-codename;</" "literal> durchzuführen. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> @@ -6642,13 +6641,13 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:92 msgid "" -"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)" -"</literal> which expands to the Debian architecture (such as <literal>amd64</" -"literal> or <literal>armel</literal>) used on the system. This permits " -"architecture-independent <filename>sources.list</filename> files to be used. " -"In general this is only of interest when specifying an exact path, " -"<literal>APT</literal> will automatically generate a URI with the current " -"architecture otherwise." +"<literal>distribution</literal> may also contain a variable, <literal>" +"$(ARCH)</literal> which expands to the Debian architecture (such as " +"<literal>amd64</literal> or <literal>armel</literal>) used on the system. " +"This permits architecture-independent <filename>sources.list</filename> " +"files to be used. In general this is only of interest when specifying an " +"exact path, <literal>APT</literal> will automatically generate a URI with " +"the current architecture otherwise." msgstr "" "<literal>distribution</literal> könnte außerdem eine Variable, <literal>" "$(ARCH)</literal>, enthalten, die zur Debian-Architektur (wie " @@ -8167,9 +8166,9 @@ msgstr "BESCHREIBUNG" #: apt.8:31 msgid "" "APT is a management system for software packages. For normal day to day " -"package management there are several frontends available, such as B<aptitude>" -"(8) for the command line or B<synaptic>(8) for the X Window System. Some " -"options are only implemented in B<apt-get>(8) though." +"package management there are several frontends available, such as " +"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " +"System. Some options are only implemented in B<apt-get>(8) though." msgstr "" "APT ist ein Verwaltungssystem für Softwarepakete. Für normale alltägliche " "Paketverwaltung sind mehrere Oberflächen, wie B<aptitude>(8) für die " @@ -8754,9 +8753,9 @@ msgstr "" "Bevor sie beginnen, <prgn>dselect</prgn> zu benutzen, ist es notwendig, die " "Verfügbarkeitsliste zu aktualisieren, indem sie aus dem Menü [E]rneuern " "auswählen. Dies ist eine Obermenge von <tt>apt-get update</tt>, das " -"<prgn>dselect</prgn> heruntergeladene Informationen zur Verfügung stellt. [E]" -"rneuern muss auch dann durchgeführt werden, wenn vorher <tt>apt-get update</" -"tt> ausgeführt wurde." +"<prgn>dselect</prgn> heruntergeladene Informationen zur Verfügung stellt. " +"[E]rneuern muss auch dann durchgeführt werden, wenn vorher <tt>apt-get " +"update</tt> ausgeführt wurde." #. type: <p></p> #: guide.sgml:253 diff --git a/doc/po/es.po b/doc/po/es.po index ade98d9cb..38b2645ea 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -38,7 +38,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-02 15:13+0300\n" +"POT-Creation-Date: 2013-06-13 13:46+0300\n" "PO-Revision-Date: 2012-07-14 12:21+0200\n" "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n" "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n" @@ -848,9 +848,9 @@ msgid "" "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" -"product-version;_amd64.deb</filename>). All packages required by the package" -"(s) specified for installation will also be retrieved and installed. The " -"<filename>/etc/apt/sources.list</filename> file is used to locate the " +"product-version;_amd64.deb</filename>). All packages required by the " +"package(s) specified for installation will also be retrieved and installed. " +"The <filename>/etc/apt/sources.list</filename> file is used to locate the " "desired packages. If a hyphen is appended to the package name (with no " "intervening space), the identified package will be removed if it is " "installed. Similarly a plus sign can be used to designate a package to " @@ -1619,14 +1619,14 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125 -#: apt.conf.5.xml:1168 apt_preferences.5.xml:698 +#: apt.conf.5.xml:1167 apt_preferences.5.xml:698 msgid "Files" msgstr "Ficheros" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 #: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 -#: apt.conf.5.xml:1174 apt_preferences.5.xml:705 sources.list.5.xml:252 +#: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 #: apt-ftparchive.1.xml:607 msgid "See Also" @@ -3319,15 +3319,14 @@ msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:101 msgid "" -"In general the sample configuration file in <filename>&docdir;examples/apt." -"conf</filename> &configureindex; is a good guide for how it should look." +"In general the sample configuration file &configureindex; is a good guide " +"for how it should look." msgstr "" -"En general, el fichero de configuración de ejemplo <filename>&docdir;" -"examples/apt.conf</filename> &configureindex; es una buena guía para " -"entender su aspecto." +"En general, el fichero de configuración de ejemplo &configureindex; es una " +"buena guía para entender su aspecto." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:105 +#: apt.conf.5.xml:104 msgid "" "Case is not significant in names of configuration items, so in the previous " "example you could use <literal>dpkg::pre-install-pkgs</literal>." @@ -3337,7 +3336,7 @@ msgstr "" "<literal>dpkg::pre-install-pkgs</literal>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:108 +#: apt.conf.5.xml:107 msgid "" "Names for the configuration items are optional if a list is defined as can " "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If " @@ -3352,7 +3351,7 @@ msgstr "" "cualquier otra opción reasignando un nuevo valor a la opción." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:113 +#: apt.conf.5.xml:112 msgid "" "Two special commands are defined: <literal>#include</literal> (which is " "deprecated and not supported by alternative implementations) and " @@ -3372,7 +3371,7 @@ msgstr "" "acabar con punto y coma)." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:123 +#: apt.conf.5.xml:122 msgid "" "The <literal>#clear</literal> command is the only way to delete a list or a " "complete scope. Reopening a scope (or using the syntax described below with " @@ -3388,7 +3387,7 @@ msgstr "" "los ámbitos no se pueden redefinir, sólo eliminar." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:131 +#: apt.conf.5.xml:130 msgid "" "All of the APT tools take an -o option which allows an arbitrary " "configuration directive to be specified on the command line. The syntax is a " @@ -3407,7 +3406,7 @@ msgstr "" "sintaxis de ámbitos en la línea de órdenes)." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:139 +#: apt.conf.5.xml:138 msgid "" "Note that appending items to a list using <literal>::</literal> only works " "for one item per line, and that you should not use it in combination with " @@ -3437,12 +3436,12 @@ msgstr "" "declaraciones ahora que APT no muestra fallos de forma explícita." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:154 +#: apt.conf.5.xml:153 msgid "The APT Group" msgstr "El grupo APT" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:155 +#: apt.conf.5.xml:154 msgid "" "This group of options controls general APT behavior as well as holding the " "options for all of the tools." @@ -3451,7 +3450,7 @@ msgstr "" "mantiene las opciones para todas las herramientas." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:160 +#: apt.conf.5.xml:159 msgid "" "System Architecture; sets the architecture to use when fetching files and " "parsing package lists. The internal default is the architecture apt was " @@ -3462,7 +3461,7 @@ msgstr "" "arquitectura para la que apt se compiló." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:167 +#: apt.conf.5.xml:166 msgid "" "All Architectures the system supports. For instance, CPUs implementing the " "<literal>amd64</literal> (also called <literal>x86-64</literal>) " @@ -3484,7 +3483,7 @@ msgstr "" "add-architecture</command>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:180 +#: apt.conf.5.xml:179 msgid "" "Default release to install packages from if more than one version is " "available. Contains release name, codename or release version. Examples: " @@ -3498,7 +3497,7 @@ msgstr "" "«5.0*». Consulte también &apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:186 +#: apt.conf.5.xml:185 msgid "" "Ignore held packages; this global option causes the problem resolver to " "ignore held packages in its decision making." @@ -3507,7 +3506,7 @@ msgstr "" "problemas ignore los paquetes retenidos en la toma de decisiones." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:191 +#: apt.conf.5.xml:190 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -3521,7 +3520,7 @@ msgstr "" "mecanismo directo para reinstalarlos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:199 +#: apt.conf.5.xml:198 msgid "" "Defaults to on, which will cause APT to install essential and important " "packages as soon as possible in an install/upgrade operation, in order to " @@ -3548,7 +3547,7 @@ msgstr "" "del paquete A, ya que no se satisface la dependencia sobre éste." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:211 +#: apt.conf.5.xml:210 msgid "" "The immediate configuration marker is also applied in the potentially " "problematic case of circular dependencies, since a dependency with the " @@ -3577,7 +3576,7 @@ msgstr "" "anteriormente." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:224 +#: apt.conf.5.xml:223 msgid "" "Before a big operation like <literal>dist-upgrade</literal> is run with this " "option disabled you should try to explicitly <literal>install</literal> the " @@ -3594,7 +3593,7 @@ msgstr "" "para que así pueden mejorar y corregir el proceso de actualización." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:235 +#: apt.conf.5.xml:234 msgid "" "Never enable this option unless you <emphasis>really</emphasis> know what " "you are doing. It permits APT to temporarily remove an essential package to " @@ -3615,7 +3614,7 @@ msgstr "" "sobre la que estos paquetes dependen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:247 +#: apt.conf.5.xml:246 msgid "" "APT uses since version 0.7.26 a resizable memory mapped cache file to store " "the available information. <literal>Cache-Start</literal> acts as a hint of " @@ -3652,14 +3651,14 @@ msgstr "" "desactiva el crecimiento automático de la caché." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:263 +#: apt.conf.5.xml:262 msgid "Defines which packages are considered essential build dependencies." msgstr "" "Define los paquetes que se consideran dependencias de construcción " "esenciales." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:267 +#: apt.conf.5.xml:266 msgid "" "The Get subsection controls the &apt-get; tool; please see its documentation " "for more information about the options here." @@ -3668,7 +3667,7 @@ msgstr "" "documentación para más información sobre esta opción." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:272 +#: apt.conf.5.xml:271 msgid "" "The Cache subsection controls the &apt-cache; tool; please see its " "documentation for more information about the options here." @@ -3677,7 +3676,7 @@ msgstr "" "documentación para más información sobre esta opción." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:277 +#: apt.conf.5.xml:276 msgid "" "The CDROM subsection controls the &apt-cdrom; tool; please see its " "documentation for more information about the options here." @@ -3686,12 +3685,12 @@ msgstr "" "documentación para más información sobre esta opción." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:283 +#: apt.conf.5.xml:282 msgid "The Acquire Group" msgstr "El grupo Acquire" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:284 +#: apt.conf.5.xml:283 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages as well as the various \"acquire methods\" responsible for the " @@ -3702,7 +3701,7 @@ msgstr "" "sí mismo (consulte también &sources-list;)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:291 +#: apt.conf.5.xml:290 msgid "" "Security related option defaulting to true, as giving a Release file's " "validation an expiration date prevents replay attacks over a long timescale, " @@ -3723,7 +3722,7 @@ msgstr "" "utilizar la opción <literal>Max-ValidTime</literal> a continuación." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:304 +#: apt.conf.5.xml:303 msgid "" "Maximum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@ -3742,7 +3741,7 @@ msgstr "" "se pueden realizar añadiendo la etiqueta del archivo al nombre de opción." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:316 +#: apt.conf.5.xml:315 msgid "" "Minimum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@ -3762,7 +3761,7 @@ msgstr "" "y deben utilizar añadiendo la etiqueta del archivo al nombre de opción." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:328 +#: apt.conf.5.xml:327 msgid "" "Try to download deltas called <literal>PDiffs</literal> for indexes (like " "<filename>Packages</filename> files) instead of downloading whole ones. True " @@ -3773,7 +3772,7 @@ msgstr "" "enteros. Su valor predeterminado es «true»." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:331 +#: apt.conf.5.xml:330 msgid "" "Two sub-options to limit the use of PDiffs are also available: " "<literal>FileLimit</literal> can be used to specify a maximum number of " @@ -3791,7 +3790,7 @@ msgstr "" "parches." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:341 +#: apt.conf.5.xml:340 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -3806,7 +3805,7 @@ msgstr "" "se abrirá una conexión por cada tipo de URI." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:349 +#: apt.conf.5.xml:348 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." @@ -3815,7 +3814,7 @@ msgstr "" "intentar obtener los ficheros fallidos el número de veces proporcionado." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:354 +#: apt.conf.5.xml:353 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." @@ -3825,7 +3824,7 @@ msgstr "" "«true» de forma predeterminada." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:359 +#: apt.conf.5.xml:358 msgid "" "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. " "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</" @@ -3845,7 +3844,7 @@ msgstr "" "opciones anteriores." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:367 +#: apt.conf.5.xml:366 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy not to use its cached " @@ -3864,7 +3863,7 @@ msgstr "" "impedir que el proxy contamine la caché con ficheros «.deb» (de gran tamaño)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:377 apt.conf.5.xml:449 +#: apt.conf.5.xml:376 apt.conf.5.xml:448 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method; this value applies to the connection as well as the data timeout." @@ -3874,7 +3873,7 @@ msgstr "" "y a la recepción de datos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:380 +#: apt.conf.5.xml:379 msgid "" "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to " "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e." @@ -3894,7 +3893,7 @@ msgstr "" "cumplir la especificación HTTP/1.1." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:387 +#: apt.conf.5.xml:386 msgid "" "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will " "follow redirects, which is enabled by default." @@ -3903,7 +3902,7 @@ msgstr "" "redirección; activado por omisión." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:390 +#: apt.conf.5.xml:389 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobytes. The default value is 0 " @@ -3918,7 +3917,7 @@ msgstr "" "implícitamente la descarga simultánea desde varios servidores)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:395 +#: apt.conf.5.xml:394 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -3929,7 +3928,7 @@ msgstr "" "permiten el acceso para clientes que usan un identificador conocido." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:403 +#: apt.conf.5.xml:402 msgid "" "The <literal>Cache-control</literal>, <literal>Timeout</literal>, " "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and " @@ -3946,7 +3945,7 @@ msgstr "" "<literal>Pipeline-Depth</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:411 +#: apt.conf.5.xml:410 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is the " @@ -3986,7 +3985,7 @@ msgstr "" "SslForceVersion</literal> es la opción correspondiente para cada servidor." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:432 +#: apt.conf.5.xml:431 msgid "" "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. " "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</" @@ -4019,7 +4018,7 @@ msgstr "" "<literal>$(SITE)</literal> y <literal>$(SITE_PORT)</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:452 +#: apt.conf.5.xml:451 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on; it works in nearly every environment. However, " @@ -4036,7 +4035,7 @@ msgstr "" "ejemplos)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:459 +#: apt.conf.5.xml:458 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to an HTTP URL - see the discussion of the http " @@ -4050,7 +4049,7 @@ msgstr "" "a su poca eficiencia." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:464 +#: apt.conf.5.xml:463 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -4066,13 +4065,13 @@ msgstr "" "compatibles con la RFC 2428." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:478 +#: apt.conf.5.xml:477 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "/cdrom/::Mount \"algo\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:473 +#: apt.conf.5.xml:472 msgid "" "For URIs using the <literal>cdrom</literal> method, the only configurable " "option is the mount point, <literal>cdrom::Mount</literal>, which must be " @@ -4094,7 +4093,7 @@ msgstr "" "especificar órdenes para desmontar mediante UMount." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:486 +#: apt.conf.5.xml:485 msgid "" "For GPGV URIs the only configurable option is <literal>gpgv::Options</" "literal>, which passes additional parameters to gpgv." @@ -4103,13 +4102,13 @@ msgstr "" "Options</literal>, que introduce parámetros adicionales a gpgv." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:497 +#: apt.conf.5.xml:496 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "Acquire::CompressionTypes::<replaceable>extensión-del-fichero</replaceable> \"<replaceable>nombre-del-método</replaceable>\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:492 +#: apt.conf.5.xml:491 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -4129,19 +4128,19 @@ msgstr "" "\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:502 +#: apt.conf.5.xml:501 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "Acquire::CompressionTypes::Order:: \"gz\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:505 +#: apt.conf.5.xml:504 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:498 +#: apt.conf.5.xml:497 msgid "" "Also, the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -4173,13 +4172,13 @@ msgstr "" "explícita ya que se añadirá de forma automática." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:512 +#: apt.conf.5.xml:511 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:507 +#: apt.conf.5.xml:506 msgid "" "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></" "literal> will be checked at run time. If this option has been set, the " @@ -4204,7 +4203,7 @@ msgstr "" "omite la lista definida, simplemente prefija la lista con este tipo." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:517 +#: apt.conf.5.xml:516 msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " @@ -4216,7 +4215,7 @@ msgstr "" "así que habitualmente esto solo sirve con réplicas locales." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:524 +#: apt.conf.5.xml:523 msgid "" "When downloading <literal>gzip</literal> compressed indexes (Packages, " "Sources, or Translations), keep them gzip compressed locally instead of " @@ -4230,7 +4229,7 @@ msgstr "" "paquetes locales. El valor predeterminado es «false»." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:532 +#: apt.conf.5.xml:531 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the description-" @@ -4249,13 +4248,13 @@ msgstr "" "idioma (especialmente para los códigos de idioma largos)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:549 +#: apt.conf.5.xml:548 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; }" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:537 +#: apt.conf.5.xml:536 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: it will be " @@ -4294,7 +4293,7 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:550 +#: apt.conf.5.xml:549 msgid "" "Note: To prevent problems resulting from APT being executed in different " "environments (e.g. by different users or by other programs) all Translation " @@ -4308,22 +4307,22 @@ msgstr "" "implícito)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:559 +#: apt.conf.5.xml:558 msgid "When downloading, force to use only the IPv4 protocol." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:565 +#: apt.conf.5.xml:564 msgid "When downloading, force to use only the IPv6 protocol." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:572 +#: apt.conf.5.xml:571 msgid "Directories" msgstr "Directorios" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:574 +#: apt.conf.5.xml:573 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -4344,7 +4343,7 @@ msgstr "" "filename> ó <filename>./</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:581 +#: apt.conf.5.xml:580 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -4366,7 +4365,7 @@ msgstr "" "directorio predeterminado está en <literal>Dir::Cache</literal>" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:590 +#: apt.conf.5.xml:589 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -4382,7 +4381,7 @@ msgstr "" "<envar>APT_CONFIG</envar>)." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:596 +#: apt.conf.5.xml:595 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -4393,7 +4392,7 @@ msgstr "" "Al finalizar este proceso carga el fichero de configuración principal." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:599 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -4410,7 +4409,7 @@ msgstr "" "literal> especifican la ubicación de sus respectivos programas." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:608 +#: apt.conf.5.xml:607 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -4431,7 +4430,7 @@ msgstr "" "staging/var/lib/dpkg/status</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:620 msgid "" "The <literal>Ignore-Files-Silently</literal> list can be used to specify " "which files APT should silently ignore while parsing the files in the " @@ -4449,12 +4448,12 @@ msgstr "" "de expresiones regulares." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:630 +#: apt.conf.5.xml:629 msgid "APT in DSelect" msgstr "APT con DSelect" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:632 +#: apt.conf.5.xml:631 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behavior. These are in the <literal>DSelect</literal> " @@ -4465,7 +4464,7 @@ msgstr "" "encuentran en la sección <literal>DSelect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:637 +#: apt.conf.5.xml:636 msgid "" "Cache Clean mode; this value may be one of <literal>always</literal>, " "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</" @@ -4487,7 +4486,7 @@ msgstr "" "realiza esta acción antes de descargar paquetes nuevos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:651 +#: apt.conf.5.xml:650 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the install phase." @@ -4496,7 +4495,7 @@ msgstr "" "la línea de ordenes al ejecutar la fase de instalación." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:656 +#: apt.conf.5.xml:655 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the update phase." @@ -4505,7 +4504,7 @@ msgstr "" "la línea de ordenes al ejecutar la fase de actualización." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:661 +#: apt.conf.5.xml:660 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@ -4515,12 +4514,12 @@ msgstr "" "preguntará en caso de error." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:667 +#: apt.conf.5.xml:666 msgid "How APT calls &dpkg;" msgstr "Invocación de APT a dpkg" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:668 +#: apt.conf.5.xml:667 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@ -4529,7 +4528,7 @@ msgstr "" "se encuentran en la sección <literal>DPkg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:673 +#: apt.conf.5.xml:672 msgid "" "This is a list of options to pass to &dpkg;. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -4540,7 +4539,7 @@ msgstr "" "introduce a &dpkg; como un sólo argumento." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:679 +#: apt.conf.5.xml:678 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -4553,7 +4552,7 @@ msgstr "" "sh</filename>; en caso de fallo, APT cancela la acción." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:686 +#: apt.conf.5.xml:685 msgid "" "This is a list of shell commands to run before invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -4569,7 +4568,7 @@ msgstr "" "la entrada estándar." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:692 +#: apt.conf.5.xml:691 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -4585,7 +4584,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:700 +#: apt.conf.5.xml:699 msgid "" "APT chdirs to this directory before invoking &dpkg;, the default is " "<filename>/</filename>." @@ -4594,7 +4593,7 @@ msgstr "" "predeterminado es <filename>/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:705 +#: apt.conf.5.xml:704 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages; the " "default is to disable signing and produce all binaries." @@ -4604,12 +4603,12 @@ msgstr "" "paquetes y a producir todos los binarios." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:710 +#: apt.conf.5.xml:709 msgid "dpkg trigger usage (and related options)" msgstr "Uso del disparador de dpkg (y de las opciones relacionadas)" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:711 +#: apt.conf.5.xml:710 msgid "" "APT can call &dpkg; in such a way as to let it make aggressive use of " "triggers over multiple calls of &dpkg;. Without further options &dpkg; will " @@ -4636,7 +4635,7 @@ msgstr "" "tiempo (o más) durante la configuración de todos los paquetes." #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:726 +#: apt.conf.5.xml:725 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -4650,7 +4649,7 @@ msgstr "" "DPkg::TriggersPending \"true\";" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:720 +#: apt.conf.5.xml:719 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -4674,7 +4673,7 @@ msgstr "" "type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:733 +#: apt.conf.5.xml:732 msgid "" "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -4697,7 +4696,7 @@ msgstr "" "eliminación." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:741 +#: apt.conf.5.xml:740 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". The default value is \"<literal>all</literal>" @@ -4727,7 +4726,7 @@ msgstr "" "imposibilidad de arrancar el sistema. " #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:756 +#: apt.conf.5.xml:755 msgid "" "If this option is set APT will call <command>dpkg --configure --pending</" "command> to let &dpkg; handle all required configurations and triggers. This " @@ -4745,7 +4744,7 @@ msgstr "" "desactivar esta opción en todas las ejecuciones menos la última." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:763 +#: apt.conf.5.xml:762 msgid "" "Useful for the <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal>, and " @@ -4761,7 +4760,7 @@ msgstr "" "los disparadores necesarios para configurar este paquete." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:776 +#: apt.conf.5.xml:775 #, no-wrap msgid "" "OrderList::Score {\n" @@ -4779,7 +4778,7 @@ msgstr "" "};" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:769 +#: apt.conf.5.xml:768 msgid "" "Essential packages (and their dependencies) should be configured immediately " "after unpacking. It is a good idea to do this quite early in the upgrade " @@ -4804,12 +4803,12 @@ msgstr "" "<placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:789 +#: apt.conf.5.xml:788 msgid "Periodic and Archives options" msgstr "Las opciones «Periodic» y «Archives»" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:790 +#: apt.conf.5.xml:789 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by the " @@ -4823,12 +4822,12 @@ msgstr "" "documentación de estas opciones." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:798 +#: apt.conf.5.xml:797 msgid "Debug options" msgstr "Opciones de depuración" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:800 +#: apt.conf.5.xml:799 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -4845,7 +4844,7 @@ msgstr "" "para un usuario normal, aunque unas cuantas sí son:" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:811 +#: apt.conf.5.xml:810 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -4856,7 +4855,7 @@ msgstr "" "purge</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:819 +#: apt.conf.5.xml:818 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -4867,7 +4866,7 @@ msgstr "" "<literal>apt-get -s install</literal>) como un usuario normal." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:828 +#: apt.conf.5.xml:827 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -4879,7 +4878,7 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:836 +#: apt.conf.5.xml:835 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CD-ROM IDs." @@ -4888,14 +4887,14 @@ msgstr "" "statfs en los identificadores de los discos ópticos." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:846 +#: apt.conf.5.xml:845 msgid "A full list of debugging options to apt follows." msgstr "" "A continuación, se muestra la lista completa de las opciones de depuración " "de apt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:855 +#: apt.conf.5.xml:854 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" @@ -4903,26 +4902,26 @@ msgstr "" "<literal>cdrom://</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:866 +#: apt.conf.5.xml:865 msgid "Print information related to downloading packages using FTP." msgstr "" "Muestra la información relacionada con la descarga de paquetes mediante FTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:877 +#: apt.conf.5.xml:876 msgid "Print information related to downloading packages using HTTP." msgstr "" "Muestra la información relacionada con la descarga de paquetes mediante HTTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:888 +#: apt.conf.5.xml:887 msgid "Print information related to downloading packages using HTTPS." msgstr "" "Muestra la información relacionada con la descarga de paquetes mediante " "HTTPS." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:899 +#: apt.conf.5.xml:898 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@ -4931,7 +4930,7 @@ msgstr "" "criptográficas mediante <literal>gpg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:910 +#: apt.conf.5.xml:909 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." @@ -4940,14 +4939,14 @@ msgstr "" "paquetes almacenadas en CD-ROM." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:920 +#: apt.conf.5.xml:919 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" "Describe el proceso de resolución de dependencias de compilación en &apt-" "get;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:930 +#: apt.conf.5.xml:929 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." @@ -4956,7 +4955,7 @@ msgstr "" "<literal>apt</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:940 +#: apt.conf.5.xml:939 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -4967,7 +4966,7 @@ msgstr "" "identificador de un CD-ROM." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:951 +#: apt.conf.5.xml:950 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." @@ -4977,14 +4976,14 @@ msgstr "" "a la vez." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:963 +#: apt.conf.5.xml:962 msgid "Log when items are added to or removed from the global download queue." msgstr "" "Registra los elementos que se añaden o se borran de la cola de descarga " "global." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:973 +#: apt.conf.5.xml:972 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." @@ -4994,7 +4993,7 @@ msgstr "" "ficheros descargados." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:983 +#: apt.conf.5.xml:982 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." @@ -5003,7 +5002,7 @@ msgstr "" "lista de índices de paquetes, y los errores relacionados con éstos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:995 +#: apt.conf.5.xml:994 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." @@ -5013,7 +5012,7 @@ msgstr "" "índices completos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1006 +#: apt.conf.5.xml:1005 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" @@ -5021,7 +5020,7 @@ msgstr "" "descargas." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1017 +#: apt.conf.5.xml:1016 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." @@ -5030,7 +5029,7 @@ msgstr "" "de los paquetes y con la eliminación de los paquetes sin usar." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1027 +#: apt.conf.5.xml:1026 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -5046,7 +5045,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1041 +#: apt.conf.5.xml:1040 msgid "" "Generate debug messages describing which packages are marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -5077,7 +5076,7 @@ msgstr "" "la sección en la que aparece el paquete." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1062 +#: apt.conf.5.xml:1061 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." @@ -5086,7 +5085,7 @@ msgstr "" "invocó, con los argumentos separados por un espacio." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1073 +#: apt.conf.5.xml:1072 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." @@ -5095,7 +5094,7 @@ msgstr "" "estado y cualquier error encontrado durante el análisis." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1084 +#: apt.conf.5.xml:1083 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." @@ -5104,7 +5103,7 @@ msgstr "" "literal> debería entregar los paquetes a &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1096 +#: apt.conf.5.xml:1095 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" @@ -5112,12 +5111,12 @@ msgstr "" "&dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1107 +#: apt.conf.5.xml:1106 msgid "Output the priority of each package list on startup." msgstr "Muestra la prioridad de cada lista de paquetes al iniciarse." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1117 +#: apt.conf.5.xml:1116 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." @@ -5126,7 +5125,7 @@ msgstr "" "lo que ocurre cuando se encuentra un problema de dependencias complejo)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1128 +#: apt.conf.5.xml:1127 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -5137,7 +5136,7 @@ msgstr "" "misma que la descrita en <literal>Debug::pkgDepCache::Marker</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1140 +#: apt.conf.5.xml:1139 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@ -5146,13 +5145,13 @@ msgstr "" "vendors.list</filename>." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:1162 apt_preferences.5.xml:545 sources.list.5.xml:211 +#: apt.conf.5.xml:1161 apt_preferences.5.xml:545 sources.list.5.xml:211 #: apt-ftparchive.1.xml:596 msgid "Examples" msgstr "Ejemplos" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1163 +#: apt.conf.5.xml:1162 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -5162,7 +5161,7 @@ msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1175 +#: apt.conf.5.xml:1174 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." @@ -6665,18 +6664,18 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:92 msgid "" -"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)" -"</literal> which expands to the Debian architecture (such as <literal>amd64</" -"literal> or <literal>armel</literal>) used on the system. This permits " -"architecture-independent <filename>sources.list</filename> files to be used. " -"In general this is only of interest when specifying an exact path, " -"<literal>APT</literal> will automatically generate a URI with the current " -"architecture otherwise." -msgstr "" -"<literal>distribución</literal> puede contener una variable, <literal>$(ARCH)" -"</literal>, que se expandirá a la arquitectura de Debian usada en el sistema " -"(por ejemplo, <literal>amd64</literal> o <literal>armel</literal>). Esto " -"permite que los ficheros <filename>sources.list</filename> sean " +"<literal>distribution</literal> may also contain a variable, <literal>" +"$(ARCH)</literal> which expands to the Debian architecture (such as " +"<literal>amd64</literal> or <literal>armel</literal>) used on the system. " +"This permits architecture-independent <filename>sources.list</filename> " +"files to be used. In general this is only of interest when specifying an " +"exact path, <literal>APT</literal> will automatically generate a URI with " +"the current architecture otherwise." +msgstr "" +"<literal>distribución</literal> puede contener una variable, <literal>" +"$(ARCH)</literal>, que se expandirá a la arquitectura de Debian usada en el " +"sistema (por ejemplo, <literal>amd64</literal> o <literal>armel</literal>). " +"Esto permite que los ficheros <filename>sources.list</filename> sean " "independientes de la arquitectura. En general, esta característica sólo es " "de interés si se especifica una ruta completa, de lo contrario <literal>APT</" "literal> generará automáticamente una URI con la arquitectura actual del " @@ -8180,9 +8179,9 @@ msgstr "DESCRIPCIÓN" #: apt.8:31 msgid "" "APT is a management system for software packages. For normal day to day " -"package management there are several frontends available, such as B<aptitude>" -"(8) for the command line or B<synaptic>(8) for the X Window System. Some " -"options are only implemented in B<apt-get>(8) though." +"package management there are several frontends available, such as " +"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " +"System. Some options are only implemented in B<apt-get>(8) though." msgstr "" "APT es un sistema de gestión de paquetes de software. Dispone de varias " "interfaces para la gestión de paquetes normal del día a día, tales como " @@ -8752,9 +8751,9 @@ msgid "" "<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</" "tt> has been run before." msgstr "" -"Es necesario actualizar la lista disponible mediante el elemento de menú [A]" -"ctualizar antes de iniciar <prgn>dselect</prgn>. Éste es un superconjunto de " -"<tt>apt-get update</tt> que permite a <prgn>dselect</prgn> disponer de la " +"Es necesario actualizar la lista disponible mediante el elemento de menú " +"[A]ctualizar antes de iniciar <prgn>dselect</prgn>. Éste es un superconjunto " +"de <tt>apt-get update</tt> que permite a <prgn>dselect</prgn> disponer de la " "información obtenida. Debe ejecutar [A]ctualizar aunque haya ejecutado " "<tt>apt-get update</tt> con anterioridad." diff --git a/doc/po/fr.po b/doc/po/fr.po index 54f666372..c2f4b6d83 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-05-08 18:12+0300\n" +"POT-Creation-Date: 2013-06-13 13:46+0300\n" "PO-Revision-Date: 2013-04-09 07:56+0200\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -760,9 +760,9 @@ msgid "" "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" -"product-version;_amd64.deb</filename>). All packages required by the package" -"(s) specified for installation will also be retrieved and installed. The " -"<filename>/etc/apt/sources.list</filename> file is used to locate the " +"product-version;_amd64.deb</filename>). All packages required by the " +"package(s) specified for installation will also be retrieved and installed. " +"The <filename>/etc/apt/sources.list</filename> file is used to locate the " "desired packages. If a hyphen is appended to the package name (with no " "intervening space), the identified package will be removed if it is " "installed. Similarly a plus sign can be used to designate a package to " @@ -824,10 +824,10 @@ msgstr "" "déjà installés sans mettre à jour les autres paquets du système. À la " "différence de la commande « upgrade » qui installera la dernière version " "disponible de tous les paquets installés au moment de son exécution, " -"« install » n'installera la nouvelle version que pour le(s) paquet(s) indiqué" -"(s). Il suffit de fournir le nom du(des) paquet(s) à mettre à jour et si une " -"nouvelle version est disponible, cette version (et ses dépendances, comme " -"décrit plus haut) sera récupérée et installée." +"« install » n'installera la nouvelle version que pour le(s) paquet(s) " +"indiqué(s). Il suffit de fournir le nom du(des) paquet(s) à mettre à jour et " +"si une nouvelle version est disponible, cette version (et ses dépendances, " +"comme décrit plus haut) sera récupérée et installée." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:137 @@ -1538,14 +1538,14 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125 -#: apt.conf.5.xml:1168 apt_preferences.5.xml:698 +#: apt.conf.5.xml:1167 apt_preferences.5.xml:698 msgid "Files" msgstr "Fichiers" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 #: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 -#: apt.conf.5.xml:1174 apt_preferences.5.xml:705 sources.list.5.xml:252 +#: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 #: apt-ftparchive.1.xml:607 msgid "See Also" @@ -3248,15 +3248,14 @@ msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:101 msgid "" -"In general the sample configuration file in <filename>&docdir;examples/apt." -"conf</filename> &configureindex; is a good guide for how it should look." +"In general the sample configuration file &configureindex; is a good guide " +"for how it should look." msgstr "" -"Les modèles <filename>&docdir;examples/apt.conf</filename> et " -"&configureindex; montrent à quoi devrait ressembler le fichier de " -"configuration." +"Les modèles &configureindex; montrent à quoi devrait ressembler le fichier " +"de configuration." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:105 +#: apt.conf.5.xml:104 msgid "" "Case is not significant in names of configuration items, so in the previous " "example you could use <literal>dpkg::pre-install-pkgs</literal>." @@ -3266,7 +3265,7 @@ msgstr "" "<literal>dpkg::pre-install-pkgs</literal>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:108 +#: apt.conf.5.xml:107 msgid "" "Names for the configuration items are optional if a list is defined as can " "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If " @@ -3282,7 +3281,7 @@ msgstr "" "réaffectant une valeur." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:113 +#: apt.conf.5.xml:112 msgid "" "Two special commands are defined: <literal>#include</literal> (which is " "deprecated and not supported by alternative implementations) and " @@ -3302,7 +3301,7 @@ msgstr "" "également se terminer avec un point-virgule." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:123 +#: apt.conf.5.xml:122 msgid "" "The <literal>#clear</literal> command is the only way to delete a list or a " "complete scope. Reopening a scope (or using the syntax described below with " @@ -3318,7 +3317,7 @@ msgstr "" "peuvent être remplacés mais seulement effacés." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:131 +#: apt.conf.5.xml:130 msgid "" "All of the APT tools take an -o option which allows an arbitrary " "configuration directive to be specified on the command line. The syntax is a " @@ -3337,7 +3336,7 @@ msgstr "" "champ d'action (« scope ») ne peut pas être indiquée à la ligne de commande." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:139 +#: apt.conf.5.xml:138 msgid "" "Note that appending items to a list using <literal>::</literal> only works " "for one item per line, and that you should not use it in combination with " @@ -3369,12 +3368,12 @@ msgstr "" "explicitement." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:154 +#: apt.conf.5.xml:153 msgid "The APT Group" msgstr "Le groupe APT" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:155 +#: apt.conf.5.xml:154 msgid "" "This group of options controls general APT behavior as well as holding the " "options for all of the tools." @@ -3383,7 +3382,7 @@ msgstr "" "également des options communes à tous les outils." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:160 +#: apt.conf.5.xml:159 msgid "" "System Architecture; sets the architecture to use when fetching files and " "parsing package lists. The internal default is the architecture apt was " @@ -3394,7 +3393,7 @@ msgstr "" "valeur interne par défaut est l'architecture pour laquelle APT a été compilé." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:167 +#: apt.conf.5.xml:166 msgid "" "All Architectures the system supports. For instance, CPUs implementing the " "<literal>amd64</literal> (also called <literal>x86-64</literal>) " @@ -3416,7 +3415,7 @@ msgstr "" "sont enregistrées avec <command>dpkg --add-architecture</command>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:180 +#: apt.conf.5.xml:179 msgid "" "Default release to install packages from if more than one version is " "available. Contains release name, codename or release version. Examples: " @@ -3430,7 +3429,7 @@ msgstr "" "&apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:186 +#: apt.conf.5.xml:185 msgid "" "Ignore held packages; this global option causes the problem resolver to " "ignore held packages in its decision making." @@ -3440,7 +3439,7 @@ msgstr "" "décision." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:191 +#: apt.conf.5.xml:190 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -3454,7 +3453,7 @@ msgstr "" "direct pour les réinstaller." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:199 +#: apt.conf.5.xml:198 msgid "" "Defaults to on, which will cause APT to install essential and important " "packages as soon as possible in an install/upgrade operation, in order to " @@ -3481,7 +3480,7 @@ msgstr "" "dépendances ne sont pas satisfaites." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:211 +#: apt.conf.5.xml:210 msgid "" "The immediate configuration marker is also applied in the potentially " "problematic case of circular dependencies, since a dependency with the " @@ -3510,7 +3509,7 @@ msgstr "" "le seul qu'elle permet d'éviter." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:224 +#: apt.conf.5.xml:223 msgid "" "Before a big operation like <literal>dist-upgrade</literal> is run with this " "option disabled you should try to explicitly <literal>install</literal> the " @@ -3528,7 +3527,7 @@ msgstr "" "corriger les processus de mise à jour." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:235 +#: apt.conf.5.xml:234 msgid "" "Never enable this option unless you <emphasis>really</emphasis> know what " "you are doing. It permits APT to temporarily remove an essential package to " @@ -3550,7 +3549,7 @@ msgstr "" "tous les paquets dont ces paquets dépendent." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:247 +#: apt.conf.5.xml:246 msgid "" "APT uses since version 0.7.26 a resizable memory mapped cache file to store " "the available information. <literal>Cache-Start</literal> acts as a hint of " @@ -3590,14 +3589,14 @@ msgstr "" "l'augmentation automatique de la taille du cache est désactivée." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:263 +#: apt.conf.5.xml:262 msgid "Defines which packages are considered essential build dependencies." msgstr "" "Cette option définit les paquets qui sont considérés comme faisant partie " "des dépendances essentielles pour la construction de paquets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:267 +#: apt.conf.5.xml:266 msgid "" "The Get subsection controls the &apt-get; tool; please see its documentation " "for more information about the options here." @@ -3607,7 +3606,7 @@ msgstr "" "question." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:272 +#: apt.conf.5.xml:271 msgid "" "The Cache subsection controls the &apt-cache; tool; please see its " "documentation for more information about the options here." @@ -3617,7 +3616,7 @@ msgstr "" "options en question." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:277 +#: apt.conf.5.xml:276 msgid "" "The CDROM subsection controls the &apt-cdrom; tool; please see its " "documentation for more information about the options here." @@ -3627,12 +3626,12 @@ msgstr "" "options en question." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:283 +#: apt.conf.5.xml:282 msgid "The Acquire Group" msgstr "Le groupe Acquire" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:284 +#: apt.conf.5.xml:283 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages as well as the various \"acquire methods\" responsible for the " @@ -3643,7 +3642,7 @@ msgstr "" "effectuent ce téléchargement (voir aussi &sources-list;)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:291 +#: apt.conf.5.xml:290 msgid "" "Security related option defaulting to true, as giving a Release file's " "validation an expiration date prevents replay attacks over a long timescale, " @@ -3664,7 +3663,7 @@ msgstr "" "alors utilisée." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:304 +#: apt.conf.5.xml:303 msgid "" "Maximum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@ -3683,7 +3682,7 @@ msgstr "" "l'option." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:316 +#: apt.conf.5.xml:315 msgid "" "Minimum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@ -3703,7 +3702,7 @@ msgstr "" "nom de l'option." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:328 +#: apt.conf.5.xml:327 msgid "" "Try to download deltas called <literal>PDiffs</literal> for indexes (like " "<filename>Packages</filename> files) instead of downloading whole ones. True " @@ -3714,7 +3713,7 @@ msgstr "" "filename>), plutôt que de les télécharger entièrement. Par défaut à « true »." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:331 +#: apt.conf.5.xml:330 msgid "" "Two sub-options to limit the use of PDiffs are also available: " "<literal>FileLimit</literal> can be used to specify a maximum number of " @@ -3733,7 +3732,7 @@ msgstr "" "fichiers de différences." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:341 +#: apt.conf.5.xml:340 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -3749,7 +3748,7 @@ msgstr "" "initiée." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:349 +#: apt.conf.5.xml:348 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." @@ -3759,7 +3758,7 @@ msgstr "" "échoué." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:354 +#: apt.conf.5.xml:353 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." @@ -3769,7 +3768,7 @@ msgstr "" "archives de sources au lieu de les copier. Par défaut à « true »." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:359 +#: apt.conf.5.xml:358 msgid "" "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. " "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</" @@ -3790,7 +3789,7 @@ msgstr "" "options de mandataire HTTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:367 +#: apt.conf.5.xml:366 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy not to use its cached " @@ -3810,7 +3809,7 @@ msgstr "" "fichiers .deb très grands." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:377 apt.conf.5.xml:449 +#: apt.conf.5.xml:376 apt.conf.5.xml:448 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method; this value applies to the connection as well as the data timeout." @@ -3820,7 +3819,7 @@ msgstr "" "connexion qu'aux données." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:380 +#: apt.conf.5.xml:379 msgid "" "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to " "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e." @@ -3840,7 +3839,7 @@ msgstr "" "qui ne respectent pas la norme HTTP/1.1." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:387 +#: apt.conf.5.xml:386 msgid "" "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will " "follow redirects, which is enabled by default." @@ -3849,7 +3848,7 @@ msgstr "" "suive les redirections. Ce réglage est activé par défaut." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:390 +#: apt.conf.5.xml:389 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobytes. The default value is 0 " @@ -3864,7 +3863,7 @@ msgstr "" "implicitement le téléchargement simultané depuis plusieurs serveurs." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:395 +#: apt.conf.5.xml:394 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -3876,7 +3875,7 @@ msgstr "" "n'autorisent l'accès qu'aux client s'identifiant de manière spécifique.." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:403 +#: apt.conf.5.xml:402 msgid "" "The <literal>Cache-control</literal>, <literal>Timeout</literal>, " "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and " @@ -3893,7 +3892,7 @@ msgstr "" "literal> n'est pas encore gérée." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:411 +#: apt.conf.5.xml:410 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is the " @@ -3926,7 +3925,7 @@ msgstr "" "<literal>TLSv1</literal> ou <literal>SSLv3</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:432 +#: apt.conf.5.xml:431 msgid "" "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. " "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</" @@ -3962,7 +3961,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:452 +#: apt.conf.5.xml:451 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on; it works in nearly every environment. However, " @@ -3979,7 +3978,7 @@ msgstr "" "modèle de fichier de configuration)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:459 +#: apt.conf.5.xml:458 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to an HTTP URL - see the discussion of the http " @@ -3994,7 +3993,7 @@ msgstr "" "efficacité de cette méthode." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:464 +#: apt.conf.5.xml:463 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -4010,13 +4009,13 @@ msgstr "" "des serveurs FTP ne suivent pas la RFC 2428." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:478 +#: apt.conf.5.xml:477 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "/cdrom/::Mount \"foo\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:473 +#: apt.conf.5.xml:472 msgid "" "For URIs using the <literal>cdrom</literal> method, the only configurable " "option is the mount point, <literal>cdrom::Mount</literal>, which must be " @@ -4039,7 +4038,7 @@ msgstr "" "<literal>UMount</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:486 +#: apt.conf.5.xml:485 msgid "" "For GPGV URIs the only configurable option is <literal>gpgv::Options</" "literal>, which passes additional parameters to gpgv." @@ -4048,13 +4047,13 @@ msgstr "" "permet de passer des paramètres à gpgv" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:497 +#: apt.conf.5.xml:496 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "Acquire::CompressionTypes::<replaceable>ExtensionFichier</replaceable> \"<replaceable>NomMethode</replaceable>\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:492 +#: apt.conf.5.xml:491 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -4074,19 +4073,19 @@ msgstr "" "type=\"synopsis\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:502 +#: apt.conf.5.xml:501 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "Acquire::CompressionTypes::Order:: \"gz\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:505 +#: apt.conf.5.xml:504 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:498 +#: apt.conf.5.xml:497 msgid "" "Also, the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -4118,13 +4117,13 @@ msgstr "" "<literal>bz2</literal> à liste car il sera ajouté automatiquement." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:512 +#: apt.conf.5.xml:511 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:507 +#: apt.conf.5.xml:506 msgid "" "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></" "literal> will be checked at run time. If this option has been set, the " @@ -4151,7 +4150,7 @@ msgstr "" "question." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:517 +#: apt.conf.5.xml:516 msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " @@ -4163,7 +4162,7 @@ msgstr "" "surtout destiné aux miroirs locaux." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:524 +#: apt.conf.5.xml:523 msgid "" "When downloading <literal>gzip</literal> compressed indexes (Packages, " "Sources, or Translations), keep them gzip compressed locally instead of " @@ -4178,7 +4177,7 @@ msgstr "" "(« False »)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:532 +#: apt.conf.5.xml:531 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the description-" @@ -4198,13 +4197,13 @@ msgstr "" "langues étant particulièrement rares." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:549 +#: apt.conf.5.xml:548 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "Acquire::Languages { \"environment\"; \"fr\"; \"en\"; \"none\"; \"de\"; };" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:537 +#: apt.conf.5.xml:536 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: it will be " @@ -4244,7 +4243,7 @@ msgstr "" "alors « de, fr, en ». <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:550 +#: apt.conf.5.xml:549 msgid "" "Note: To prevent problems resulting from APT being executed in different " "environments (e.g. by different users or by other programs) all Translation " @@ -4258,22 +4257,22 @@ msgstr "" "(après un « <literal>none</literal> » implicite)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:559 +#: apt.conf.5.xml:558 msgid "When downloading, force to use only the IPv4 protocol." msgstr "Utilisation imposée du protocole IPv4 lors des téléchargements." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:565 +#: apt.conf.5.xml:564 msgid "When downloading, force to use only the IPv6 protocol." msgstr "Utilisation imposée du protocole IPv6 lors des téléchargements." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:572 +#: apt.conf.5.xml:571 msgid "Directories" msgstr "Les répertoires" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:574 +#: apt.conf.5.xml:573 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -4293,7 +4292,7 @@ msgstr "" "<filename>./</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:581 +#: apt.conf.5.xml:580 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -4316,7 +4315,7 @@ msgstr "" "Cache</literal>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:590 +#: apt.conf.5.xml:589 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -4331,7 +4330,7 @@ msgstr "" "fichier de configuration indiqué par la variable <envar>APT_CONFIG</envar>)." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:596 +#: apt.conf.5.xml:595 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -4342,7 +4341,7 @@ msgstr "" "configuration est chargé." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:599 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -4360,7 +4359,7 @@ msgstr "" "programmes correspondants." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:608 +#: apt.conf.5.xml:607 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -4382,7 +4381,7 @@ msgstr "" "staging/var/lib/dpkg/status</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:620 msgid "" "The <literal>Ignore-Files-Silently</literal> list can be used to specify " "which files APT should silently ignore while parsing the files in the " @@ -4400,12 +4399,12 @@ msgstr "" "est possible d'utiliser la syntaxe des expressions rationnelles." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:630 +#: apt.conf.5.xml:629 msgid "APT in DSelect" msgstr "APT et DSelect" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:632 +#: apt.conf.5.xml:631 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behavior. These are in the <literal>DSelect</literal> " @@ -4416,7 +4415,7 @@ msgstr "" "<literal>DSelect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:637 +#: apt.conf.5.xml:636 msgid "" "Cache Clean mode; this value may be one of <literal>always</literal>, " "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</" @@ -4439,7 +4438,7 @@ msgstr "" "avant de récupérer de nouveaux paquets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:651 +#: apt.conf.5.xml:650 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the install phase." @@ -4448,7 +4447,7 @@ msgstr "" "&apt-get; lors de la phase d'installation." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:656 +#: apt.conf.5.xml:655 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the update phase." @@ -4457,7 +4456,7 @@ msgstr "" "&apt-get; lors de la phase de mise à jour." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:661 +#: apt.conf.5.xml:660 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@ -4467,12 +4466,12 @@ msgstr "" "d'erreur que l'on propose à l'utilisateur d'intervenir." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:667 +#: apt.conf.5.xml:666 msgid "How APT calls &dpkg;" msgstr "Méthode d'appel de &dpkg; par APT" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:668 +#: apt.conf.5.xml:667 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@ -4481,7 +4480,7 @@ msgstr "" "&dpkg; : elles figurent dans la section <literal>DPkg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:673 +#: apt.conf.5.xml:672 msgid "" "This is a list of options to pass to &dpkg;. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -4492,7 +4491,7 @@ msgstr "" "est passé comme un seul paramètre à &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:679 +#: apt.conf.5.xml:678 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -4505,7 +4504,7 @@ msgstr "" "<filename>/bin/sh</filename> : APT s'arrête dès que l'une d'elles échoue." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:686 +#: apt.conf.5.xml:685 msgid "" "This is a list of shell commands to run before invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -4521,7 +4520,7 @@ msgstr "" "qu'il va installer, à raison d'un par ligne." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:692 +#: apt.conf.5.xml:691 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -4537,7 +4536,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:700 +#: apt.conf.5.xml:699 msgid "" "APT chdirs to this directory before invoking &dpkg;, the default is " "<filename>/</filename>." @@ -4546,7 +4545,7 @@ msgstr "" "le répertoire <filename>/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:705 +#: apt.conf.5.xml:704 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages; the " "default is to disable signing and produce all binaries." @@ -4556,14 +4555,14 @@ msgstr "" "créés." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:710 +#: apt.conf.5.xml:709 msgid "dpkg trigger usage (and related options)" msgstr "" "utilisation des actions différées (« triggers ») de dpkg (et options " "associées)" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:711 +#: apt.conf.5.xml:710 msgid "" "APT can call &dpkg; in such a way as to let it make aggressive use of " "triggers over multiple calls of &dpkg;. Without further options &dpkg; will " @@ -4590,7 +4589,7 @@ msgstr "" "pendant la configuration des paquets." #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:726 +#: apt.conf.5.xml:725 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -4604,7 +4603,7 @@ msgstr "" "DPkg::TriggersPending \"true\";" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:720 +#: apt.conf.5.xml:719 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -4628,7 +4627,7 @@ msgstr "" "<placeholder type=\"literallayout\" id=\"0\"/>." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:733 +#: apt.conf.5.xml:732 msgid "" "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -4651,7 +4650,7 @@ msgstr "" "options « unpack » et « remove »." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:741 +#: apt.conf.5.xml:740 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". The default value is \"<literal>all</literal>" @@ -4681,7 +4680,7 @@ msgstr "" "configuré et donc éventuellement non amorçable." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:756 +#: apt.conf.5.xml:755 msgid "" "If this option is set APT will call <command>dpkg --configure --pending</" "command> to let &dpkg; handle all required configurations and triggers. This " @@ -4700,7 +4699,7 @@ msgstr "" "peut conserver l'option active." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:763 +#: apt.conf.5.xml:762 msgid "" "Useful for the <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal>, and " @@ -4718,7 +4717,7 @@ msgstr "" "celles concernant le paquet en cours de traitement." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:776 +#: apt.conf.5.xml:775 #, no-wrap msgid "" "OrderList::Score {\n" @@ -4736,7 +4735,7 @@ msgstr "" "};" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:769 +#: apt.conf.5.xml:768 msgid "" "Essential packages (and their dependencies) should be configured immediately " "after unpacking. It is a good idea to do this quite early in the upgrade " @@ -4762,12 +4761,12 @@ msgstr "" "id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:789 +#: apt.conf.5.xml:788 msgid "Periodic and Archives options" msgstr "Options « Periodic » et « Archive »" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:790 +#: apt.conf.5.xml:789 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by the " @@ -4779,12 +4778,12 @@ msgstr "" "script <literal>/etc/cron.daily/apt</literal>, lancé quotidiennement." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:798 +#: apt.conf.5.xml:797 msgid "Debug options" msgstr "Les options de débogage" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:800 +#: apt.conf.5.xml:799 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -4802,7 +4801,7 @@ msgstr "" "peuvent tout de même être utiles :" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:811 +#: apt.conf.5.xml:810 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -4813,7 +4812,7 @@ msgstr "" "upgrade, upgrade, install, remove et purge</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:819 +#: apt.conf.5.xml:818 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -4825,7 +4824,7 @@ msgstr "" "superutilisateur." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:828 +#: apt.conf.5.xml:827 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -4837,7 +4836,7 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:836 +#: apt.conf.5.xml:835 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CD-ROM IDs." @@ -4846,12 +4845,12 @@ msgstr "" "type statfs dans les identifiants de CD." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:846 +#: apt.conf.5.xml:845 msgid "A full list of debugging options to apt follows." msgstr "Liste complète des options de débogage de APT :" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:855 +#: apt.conf.5.xml:854 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" @@ -4859,24 +4858,24 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:866 +#: apt.conf.5.xml:865 msgid "Print information related to downloading packages using FTP." msgstr "" "Affiche les informations concernant le téléchargement de paquets par FTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:877 +#: apt.conf.5.xml:876 msgid "Print information related to downloading packages using HTTP." msgstr "" "Affiche les informations concernant le téléchargement de paquets par HTTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:888 +#: apt.conf.5.xml:887 msgid "Print information related to downloading packages using HTTPS." msgstr "Print information related to downloading packages using HTTPS." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:899 +#: apt.conf.5.xml:898 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@ -4885,7 +4884,7 @@ msgstr "" "cryptographiques avec <literal>gpg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:910 +#: apt.conf.5.xml:909 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." @@ -4894,14 +4893,14 @@ msgstr "" "stockées sur CD." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:920 +#: apt.conf.5.xml:919 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" "Décrit le processus de résolution des dépendances pour la construction de " "paquets source ( « build-dependencies » ) par &apt-get;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:930 +#: apt.conf.5.xml:929 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." @@ -4910,7 +4909,7 @@ msgstr "" "librairies d'<literal>apt</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:940 +#: apt.conf.5.xml:939 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -4921,7 +4920,7 @@ msgstr "" "utilisés sur le système de fichier du CD." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:951 +#: apt.conf.5.xml:950 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." @@ -4931,14 +4930,14 @@ msgstr "" "temps." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:963 +#: apt.conf.5.xml:962 msgid "Log when items are added to or removed from the global download queue." msgstr "" "Trace les ajouts et suppressions d'éléments de la queue globale de " "téléchargement." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:973 +#: apt.conf.5.xml:972 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." @@ -4948,7 +4947,7 @@ msgstr "" "éventuelles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:983 +#: apt.conf.5.xml:982 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." @@ -4958,7 +4957,7 @@ msgstr "" "éventuelles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:995 +#: apt.conf.5.xml:994 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." @@ -4968,7 +4967,7 @@ msgstr "" "place des fichiers complets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1006 +#: apt.conf.5.xml:1005 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" @@ -4976,7 +4975,7 @@ msgstr "" "effectivement des téléchargements." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1017 +#: apt.conf.5.xml:1016 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." @@ -4985,7 +4984,7 @@ msgstr "" "automatiquement, et la suppression des paquets inutiles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1027 +#: apt.conf.5.xml:1026 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -5000,7 +4999,7 @@ msgstr "" "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1041 +#: apt.conf.5.xml:1040 msgid "" "Generate debug messages describing which packages are marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -5036,7 +5035,7 @@ msgstr "" "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1062 +#: apt.conf.5.xml:1061 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." @@ -5045,7 +5044,7 @@ msgstr "" "paramètres sont séparés par des espaces." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1073 +#: apt.conf.5.xml:1072 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." @@ -5055,7 +5054,7 @@ msgstr "" "fichier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1084 +#: apt.conf.5.xml:1083 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." @@ -5064,18 +5063,18 @@ msgstr "" "<literal>apt</literal> passe les paquets à &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1096 +#: apt.conf.5.xml:1095 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "Affiche le détail des opérations liées à l'invocation de &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1107 +#: apt.conf.5.xml:1106 msgid "Output the priority of each package list on startup." msgstr "Affiche, au lancement, la priorité de chaque liste de paquets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1117 +#: apt.conf.5.xml:1116 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." @@ -5084,7 +5083,7 @@ msgstr "" "concerne que les cas où un problème de dépendances complexe se présente)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1128 +#: apt.conf.5.xml:1127 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -5095,7 +5094,7 @@ msgstr "" "est décrite dans <literal>Debug::pkgDepCache::Marker</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1140 +#: apt.conf.5.xml:1139 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@ -5104,13 +5103,13 @@ msgstr "" "list</filename>." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:1162 apt_preferences.5.xml:545 sources.list.5.xml:211 +#: apt.conf.5.xml:1161 apt_preferences.5.xml:545 sources.list.5.xml:211 #: apt-ftparchive.1.xml:596 msgid "Examples" msgstr "Exemples" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1163 +#: apt.conf.5.xml:1162 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -5120,7 +5119,7 @@ msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1175 +#: apt.conf.5.xml:1174 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." @@ -6613,13 +6612,13 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:92 msgid "" -"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)" -"</literal> which expands to the Debian architecture (such as <literal>amd64</" -"literal> or <literal>armel</literal>) used on the system. This permits " -"architecture-independent <filename>sources.list</filename> files to be used. " -"In general this is only of interest when specifying an exact path, " -"<literal>APT</literal> will automatically generate a URI with the current " -"architecture otherwise." +"<literal>distribution</literal> may also contain a variable, <literal>" +"$(ARCH)</literal> which expands to the Debian architecture (such as " +"<literal>amd64</literal> or <literal>armel</literal>) used on the system. " +"This permits architecture-independent <filename>sources.list</filename> " +"files to be used. In general this is only of interest when specifying an " +"exact path, <literal>APT</literal> will automatically generate a URI with " +"the current architecture otherwise." msgstr "" "<literal>distribution</literal> peut aussi contenir une variable <literal>" "$(ARCH)</literal>, qui sera remplacée par l'architecture Debian (comme " @@ -8123,9 +8122,9 @@ msgstr "DESCRIPTION" #: apt.8:31 msgid "" "APT is a management system for software packages. For normal day to day " -"package management there are several frontends available, such as B<aptitude>" -"(8) for the command line or B<synaptic>(8) for the X Window System. Some " -"options are only implemented in B<apt-get>(8) though." +"package management there are several frontends available, such as " +"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " +"System. Some options are only implemented in B<apt-get>(8) though." msgstr "" "APT est un système de gestion de paquets logiciels. Pour la gestion au " "quotidien des paquets, il existe plusieurs frontaux comme B<aptitude>(9) en " @@ -8739,11 +8738,11 @@ msgid "" "[R]emove commands have no meaning, the [I]nstall command performs both of " "them together." msgstr "" -"Une fois cela effectué, vous pouvez poursuivre et utiliser l'option « [S]" -"électionner » pour choisir les paquets à installer puis « [I]nstaller » pour " -"les installer. Lorsque la méthode APT est utilisée, les options « [C]" -"onfigurer » et « [R]etirer » ne sont pas utilisées, car « [I]nstaller » fait " -"l'ensemble des opérations." +"Une fois cela effectué, vous pouvez poursuivre et utiliser l'option " +"« [S]électionner » pour choisir les paquets à installer puis « [I]nstaller » " +"pour les installer. Lorsque la méthode APT est utilisée, les options " +"« [C]onfigurer » et « [R]etirer » ne sont pas utilisées, car « [I]nstaller » " +"fait l'ensemble des opérations." #. type: <p></p> #: guide.sgml:258 diff --git a/doc/po/it.po b/doc/po/it.po index 230f85b07..df144e2b7 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-04-02 15:13+0300\n" +"POT-Creation-Date: 2013-06-13 13:46+0300\n" "PO-Revision-Date: 2012-12-23 18:04+0200\n" "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n" "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n" @@ -812,9 +812,9 @@ msgid "" "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" -"product-version;_amd64.deb</filename>). All packages required by the package" -"(s) specified for installation will also be retrieved and installed. The " -"<filename>/etc/apt/sources.list</filename> file is used to locate the " +"product-version;_amd64.deb</filename>). All packages required by the " +"package(s) specified for installation will also be retrieved and installed. " +"The <filename>/etc/apt/sources.list</filename> file is used to locate the " "desired packages. If a hyphen is appended to the package name (with no " "intervening space), the identified package will be removed if it is " "installed. Similarly a plus sign can be used to designate a package to " @@ -1582,14 +1582,14 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125 -#: apt.conf.5.xml:1168 apt_preferences.5.xml:698 +#: apt.conf.5.xml:1167 apt_preferences.5.xml:698 msgid "Files" msgstr "File" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 #: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 -#: apt.conf.5.xml:1174 apt_preferences.5.xml:705 sources.list.5.xml:252 +#: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 #: apt-ftparchive.1.xml:607 msgid "See Also" @@ -3283,19 +3283,17 @@ msgstr "" msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" -# apt.conf è un file e &configureindex è un altro: configure-index.gz #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:101 msgid "" -"In general the sample configuration file in <filename>&docdir;examples/apt." -"conf</filename> &configureindex; is a good guide for how it should look." +"In general the sample configuration file &configureindex; is a good guide " +"for how it should look." msgstr "" -"In generale i file di configurazione d'esempio in <filename>&docdir;examples/" -"apt.conf</filename> e &configureindex; sono una buona guida su come debba " -"essere un file di configurazione." +"In generale i file di configurazione d'esempio &configureindex; sono una " +"buona guida su come debba essere un file di configurazione." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:105 +#: apt.conf.5.xml:104 msgid "" "Case is not significant in names of configuration items, so in the previous " "example you could use <literal>dpkg::pre-install-pkgs</literal>." @@ -3305,7 +3303,7 @@ msgstr "" "<literal>dpkg::pre-install-pkgs</literal>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:108 +#: apt.conf.5.xml:107 msgid "" "Names for the configuration items are optional if a list is defined as can " "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If " @@ -3320,7 +3318,7 @@ msgstr "" "sovrascrivere l'opzione come per ogni altra, assegnandole un nuovo valore." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:113 +#: apt.conf.5.xml:112 msgid "" "Two special commands are defined: <literal>#include</literal> (which is " "deprecated and not supported by alternative implementations) and " @@ -3340,7 +3338,7 @@ msgstr "" "queste righe devono terminare con un punto e virgola.)" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:123 +#: apt.conf.5.xml:122 msgid "" "The <literal>#clear</literal> command is the only way to delete a list or a " "complete scope. Reopening a scope (or using the syntax described below with " @@ -3356,7 +3354,7 @@ msgstr "" "ambiti non possono essere sovrascritti, solo cancellati." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:131 +#: apt.conf.5.xml:130 msgid "" "All of the APT tools take an -o option which allows an arbitrary " "configuration directive to be specified on the command line. The syntax is a " @@ -3376,7 +3374,7 @@ msgstr "" "di comando.)" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:139 +#: apt.conf.5.xml:138 msgid "" "Note that appending items to a list using <literal>::</literal> only works " "for one item per line, and that you should not use it in combination with " @@ -3406,12 +3404,12 @@ msgstr "" "ora, quando APT ancora non si lamenta esplicitamente." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:154 +#: apt.conf.5.xml:153 msgid "The APT Group" msgstr "Il gruppo APT" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:155 +#: apt.conf.5.xml:154 msgid "" "This group of options controls general APT behavior as well as holding the " "options for all of the tools." @@ -3420,7 +3418,7 @@ msgstr "" "contenere le opzioni per tutti gli strumenti." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:160 +#: apt.conf.5.xml:159 msgid "" "System Architecture; sets the architecture to use when fetching files and " "parsing package lists. The internal default is the architecture apt was " @@ -3431,7 +3429,7 @@ msgstr "" "predefinito interno è l'architettura per la quale apt è stato compilato." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:167 +#: apt.conf.5.xml:166 msgid "" "All Architectures the system supports. For instance, CPUs implementing the " "<literal>amd64</literal> (also called <literal>x86-64</literal>) " @@ -3453,7 +3451,7 @@ msgstr "" "quando sono registrate con <command>dpkg --add-architecture</command>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:180 +#: apt.conf.5.xml:179 msgid "" "Default release to install packages from if more than one version is " "available. Contains release name, codename or release version. Examples: " @@ -3467,7 +3465,7 @@ msgstr "" "preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:186 +#: apt.conf.5.xml:185 msgid "" "Ignore held packages; this global option causes the problem resolver to " "ignore held packages in its decision making." @@ -3476,7 +3474,7 @@ msgstr "" "di problemi ignori i pacchetti bloccati nel suo processo decisionale." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:191 +#: apt.conf.5.xml:190 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -3490,7 +3488,7 @@ msgstr "" "reinstallarli." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:199 +#: apt.conf.5.xml:198 msgid "" "Defaults to on, which will cause APT to install essential and important " "packages as soon as possible in an install/upgrade operation, in order to " @@ -3517,7 +3515,7 @@ msgstr "" "che dipende da A, dato che la dipendenza da A non è più soddisfatta." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:211 +#: apt.conf.5.xml:210 msgid "" "The immediate configuration marker is also applied in the potentially " "problematic case of circular dependencies, since a dependency with the " @@ -3547,7 +3545,7 @@ msgstr "" "l'unico problema che può aiutare a prevenire." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:224 +#: apt.conf.5.xml:223 msgid "" "Before a big operation like <literal>dist-upgrade</literal> is run with this " "option disabled you should try to explicitly <literal>install</literal> the " @@ -3565,7 +3563,7 @@ msgstr "" "il processo di aggiornamento." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:235 +#: apt.conf.5.xml:234 msgid "" "Never enable this option unless you <emphasis>really</emphasis> know what " "you are doing. It permits APT to temporarily remove an essential package to " @@ -3586,7 +3584,7 @@ msgstr "" "<command>dash</command> o qualsiasi altro da cui dipendono tali pacchetti." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:247 +#: apt.conf.5.xml:246 msgid "" "APT uses since version 0.7.26 a resizable memory mapped cache file to store " "the available information. <literal>Cache-Start</literal> acts as a hint of " @@ -3624,14 +3622,14 @@ msgstr "" "della cache è disabilitata." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:263 +#: apt.conf.5.xml:262 msgid "Defines which packages are considered essential build dependencies." msgstr "" "Definisce quali pacchetti sono considerati dipendenze di compilazione " "essenziali." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:267 +#: apt.conf.5.xml:266 msgid "" "The Get subsection controls the &apt-get; tool; please see its documentation " "for more information about the options here." @@ -3640,7 +3638,7 @@ msgstr "" "documentazione per maggiori informazioni su queste opzioni." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:272 +#: apt.conf.5.xml:271 msgid "" "The Cache subsection controls the &apt-cache; tool; please see its " "documentation for more information about the options here." @@ -3649,7 +3647,7 @@ msgstr "" "documentazione per maggiori informazioni su queste opzioni." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:277 +#: apt.conf.5.xml:276 msgid "" "The CDROM subsection controls the &apt-cdrom; tool; please see its " "documentation for more information about the options here." @@ -3658,12 +3656,12 @@ msgstr "" "documentazione per maggiori informazioni su queste opzioni." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:283 +#: apt.conf.5.xml:282 msgid "The Acquire Group" msgstr "Il gruppo Acquire" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:284 +#: apt.conf.5.xml:283 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages as well as the various \"acquire methods\" responsible for the " @@ -3674,7 +3672,7 @@ msgstr "" "scaricamento stesso (vedere anche &sources-list;)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:291 +#: apt.conf.5.xml:290 msgid "" "Security related option defaulting to true, as giving a Release file's " "validation an expiration date prevents replay attacks over a long timescale, " @@ -3696,7 +3694,7 @@ msgstr "" "ValidTime</literal> seguente." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:304 +#: apt.conf.5.xml:303 msgid "" "Maximum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@ -3716,7 +3714,7 @@ msgstr "" "dell'archivio in fondo al nome dell'opzione." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:316 +#: apt.conf.5.xml:315 msgid "" "Minimum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@ -3736,7 +3734,7 @@ msgstr "" "archivio aggiungendo l'etichetta dell'archivio in fondo al nome dell'opzione." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:328 +#: apt.conf.5.xml:327 msgid "" "Try to download deltas called <literal>PDiffs</literal> for indexes (like " "<filename>Packages</filename> files) instead of downloading whole ones. True " @@ -3747,7 +3745,7 @@ msgstr "" "interamente i nuovi. Attiva in modo predefinito." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:331 +#: apt.conf.5.xml:330 msgid "" "Two sub-options to limit the use of PDiffs are also available: " "<literal>FileLimit</literal> can be used to specify a maximum number of " @@ -3765,7 +3763,7 @@ msgstr "" "completo invece delle patch." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:341 +#: apt.conf.5.xml:340 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -3780,7 +3778,7 @@ msgstr "" "literal> significa che viene aperta una connessione per ogni tipo di URI." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:349 +#: apt.conf.5.xml:348 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." @@ -3790,7 +3788,7 @@ msgstr "" "ha avuto successo." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:354 +#: apt.conf.5.xml:353 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." @@ -3801,7 +3799,7 @@ msgstr "" "vero." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:359 +#: apt.conf.5.xml:358 msgid "" "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. " "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</" @@ -3820,7 +3818,7 @@ msgstr "" "la variabile d'ambiente <envar>http_proxy</envar>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:367 +#: apt.conf.5.xml:366 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy not to use its cached " @@ -3840,7 +3838,7 @@ msgstr "" "file .deb." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:377 apt.conf.5.xml:449 +#: apt.conf.5.xml:376 apt.conf.5.xml:448 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method; this value applies to the connection as well as the data timeout." @@ -3850,7 +3848,7 @@ msgstr "" "quello per i dati." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:380 +#: apt.conf.5.xml:379 msgid "" "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to " "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e." @@ -3870,7 +3868,7 @@ msgstr "" "con la specifica HTTP/1.1." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:387 +#: apt.conf.5.xml:386 msgid "" "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will " "follow redirects, which is enabled by default." @@ -3879,7 +3877,7 @@ msgstr "" "meno le ridirezioni che sono abilitate in modo predefinito." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:390 +#: apt.conf.5.xml:389 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobytes. The default value is 0 " @@ -3894,7 +3892,7 @@ msgstr "" "scaricamento da più server contemporaneamente)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:395 +#: apt.conf.5.xml:394 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -3906,7 +3904,7 @@ msgstr "" "conosciuto." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:403 +#: apt.conf.5.xml:402 msgid "" "The <literal>Cache-control</literal>, <literal>Timeout</literal>, " "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and " @@ -3923,7 +3921,7 @@ msgstr "" "<literal>Pipeline-Depth</literal> non è ancora supportata." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:411 +#: apt.conf.5.xml:410 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is the " @@ -3964,7 +3962,7 @@ msgstr "" "literal> è la corrispondente opzione specifica per ciascun host." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:432 +#: apt.conf.5.xml:431 msgid "" "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. " "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</" @@ -3998,7 +3996,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:452 +#: apt.conf.5.xml:451 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on; it works in nearly every environment. However, " @@ -4014,7 +4012,7 @@ msgstr "" "uno specifico host (vedere il file di configurazione d'esempio)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:459 +#: apt.conf.5.xml:458 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to an HTTP URL - see the discussion of the http " @@ -4028,7 +4026,7 @@ msgstr "" "a causa della sua bassa efficienza." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:464 +#: apt.conf.5.xml:463 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -4044,13 +4042,13 @@ msgstr "" "parte dei server FTP non supporta la RFC 2428." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:478 +#: apt.conf.5.xml:477 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "/cdrom/::Mount \"pippo\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:473 +#: apt.conf.5.xml:472 msgid "" "For URIs using the <literal>cdrom</literal> method, the only configurable " "option is the mount point, <literal>cdrom::Mount</literal>, which must be " @@ -4072,7 +4070,7 @@ msgstr "" "comandi per lo smontaggio possono essere specificati usando UMount." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:486 +#: apt.conf.5.xml:485 msgid "" "For GPGV URIs the only configurable option is <literal>gpgv::Options</" "literal>, which passes additional parameters to gpgv." @@ -4081,13 +4079,13 @@ msgstr "" "literal>, che passa parametri aggiuntivi a gpgv." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:497 +#: apt.conf.5.xml:496 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "Acquire::CompressionTypes::<replaceable>EstensioneFile</replaceable> \"<replaceable>NomeMetodo</replaceable>\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:492 +#: apt.conf.5.xml:491 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -4106,19 +4104,19 @@ msgstr "" "metodo usato. La sintassi è: <placeholder type=\"synopsis\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:502 +#: apt.conf.5.xml:501 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "Acquire::CompressionTypes::Order:: \"gz\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:505 +#: apt.conf.5.xml:504 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:498 +#: apt.conf.5.xml:497 msgid "" "Also, the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -4149,13 +4147,13 @@ msgstr "" "all'elenco, dato che verrà aggiunto automaticamente." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:512 +#: apt.conf.5.xml:511 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:507 +#: apt.conf.5.xml:506 msgid "" "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></" "literal> will be checked at run time. If this option has been set, the " @@ -4181,7 +4179,7 @@ msgstr "" "definito; aggiunge solamente il tipo indicato all'inizio dell'elenco." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:517 +#: apt.conf.5.xml:516 msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " @@ -4193,7 +4191,7 @@ msgstr "" "soprattutto per i mirror locali." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:524 +#: apt.conf.5.xml:523 msgid "" "When downloading <literal>gzip</literal> compressed indexes (Packages, " "Sources, or Translations), keep them gzip compressed locally instead of " @@ -4207,7 +4205,7 @@ msgstr "" "modo predefinito è disabilitato." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:532 +#: apt.conf.5.xml:531 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the description-" @@ -4226,13 +4224,13 @@ msgstr "" "codici di lingua lunghi sono particolarmente rari." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:549 +#: apt.conf.5.xml:548 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "Acquire::Languages { \"environment\"; \"it\"; \"en\"; \"none\"; \"fr\"; };" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:537 +#: apt.conf.5.xml:536 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: it will be " @@ -4271,7 +4269,7 @@ msgstr "" "<placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:550 +#: apt.conf.5.xml:549 msgid "" "Note: To prevent problems resulting from APT being executed in different " "environments (e.g. by different users or by other programs) all Translation " @@ -4285,22 +4283,22 @@ msgstr "" "implicito)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:559 +#: apt.conf.5.xml:558 msgid "When downloading, force to use only the IPv4 protocol." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:565 +#: apt.conf.5.xml:564 msgid "When downloading, force to use only the IPv6 protocol." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:572 +#: apt.conf.5.xml:571 msgid "Directories" msgstr "Directory" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:574 +#: apt.conf.5.xml:573 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -4320,7 +4318,7 @@ msgstr "" "<filename>/</filename> o <filename>./</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:581 +#: apt.conf.5.xml:580 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -4342,7 +4340,7 @@ msgstr "" "la directory predefinita è contenuta in <literal>Dir::Cache</literal>" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:590 +#: apt.conf.5.xml:589 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -4357,7 +4355,7 @@ msgstr "" "configurazione specificato da <envar>APT_CONFIG</envar>)." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:596 +#: apt.conf.5.xml:595 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -4368,7 +4366,7 @@ msgstr "" "termine viene caricato il file di configurazione principale." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:599 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -4385,7 +4383,7 @@ msgstr "" "specificano la posizione dei rispettivi programmi." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:608 +#: apt.conf.5.xml:607 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -4406,7 +4404,7 @@ msgstr "" "staging/var/lib/dpkg/status</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:620 msgid "" "The <literal>Ignore-Files-Silently</literal> list can be used to specify " "which files APT should silently ignore while parsing the files in the " @@ -4424,12 +4422,12 @@ msgstr "" "questi modelli possono usare una sintassi con espressioni regolari." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:630 +#: apt.conf.5.xml:629 msgid "APT in DSelect" msgstr "APT in DSelect" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:632 +#: apt.conf.5.xml:631 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behavior. These are in the <literal>DSelect</literal> " @@ -4440,7 +4438,7 @@ msgstr "" "sezione <literal>DSelect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:637 +#: apt.conf.5.xml:636 msgid "" "Cache Clean mode; this value may be one of <literal>always</literal>, " "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</" @@ -4462,7 +4460,7 @@ msgstr "" "scaricare i nuovi pacchetti." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:651 +#: apt.conf.5.xml:650 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the install phase." @@ -4472,7 +4470,7 @@ msgstr "" "installazione." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:656 +#: apt.conf.5.xml:655 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the update phase." @@ -4482,7 +4480,7 @@ msgstr "" "aggiornamento." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:661 +#: apt.conf.5.xml:660 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@ -4492,12 +4490,12 @@ msgstr "" "solo in caso di errore." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:667 +#: apt.conf.5.xml:666 msgid "How APT calls &dpkg;" msgstr "Come APT invoca &dpkg;" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:668 +#: apt.conf.5.xml:667 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@ -4506,7 +4504,7 @@ msgstr "" "&dpkg;; sono nella sezione <literal>DPkg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:673 +#: apt.conf.5.xml:672 msgid "" "This is a list of options to pass to &dpkg;. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -4517,7 +4515,7 @@ msgstr "" "passata a &dpkg; come un singolo argomento." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:679 +#: apt.conf.5.xml:678 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -4530,7 +4528,7 @@ msgstr "" "bin/sh</filename>; se qualcuno dei comandi fallisce APT terminerà annullando." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:686 +#: apt.conf.5.xml:685 msgid "" "This is a list of shell commands to run before invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -4546,7 +4544,7 @@ msgstr "" "uno per riga, sullo standard input." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:692 +#: apt.conf.5.xml:691 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -4562,7 +4560,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:700 +#: apt.conf.5.xml:699 msgid "" "APT chdirs to this directory before invoking &dpkg;, the default is " "<filename>/</filename>." @@ -4571,7 +4569,7 @@ msgstr "" "valore predefinito è <filename>/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:705 +#: apt.conf.5.xml:704 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages; the " "default is to disable signing and produce all binaries." @@ -4581,12 +4579,12 @@ msgstr "" "binari." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:710 +#: apt.conf.5.xml:709 msgid "dpkg trigger usage (and related options)" msgstr "Uso dei trigger di dpkg (e relative opzioni)" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:711 +#: apt.conf.5.xml:710 msgid "" "APT can call &dpkg; in such a way as to let it make aggressive use of " "triggers over multiple calls of &dpkg;. Without further options &dpkg; will " @@ -4614,7 +4612,7 @@ msgstr "" "pacchetti." #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:726 +#: apt.conf.5.xml:725 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -4628,7 +4626,7 @@ msgstr "" "DPkg::TriggersPending \"true\";" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:720 +#: apt.conf.5.xml:719 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -4652,7 +4650,7 @@ msgstr "" "\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:733 +#: apt.conf.5.xml:732 msgid "" "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -4674,7 +4672,7 @@ msgstr "" "questa opzione anche alle chiamate per lo spacchettamento e la rimozione." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:741 +#: apt.conf.5.xml:740 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". The default value is \"<literal>all</literal>" @@ -4704,7 +4702,7 @@ msgstr "" "potrebbe finire in uno stato non configurato e potenzialmente non avviabile." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:756 +#: apt.conf.5.xml:755 msgid "" "If this option is set APT will call <command>dpkg --configure --pending</" "command> to let &dpkg; handle all required configurations and triggers. This " @@ -4722,7 +4720,7 @@ msgstr "" "si può disattivare questa opzione in tutte le esecuzioni tranne l'ultima." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:763 +#: apt.conf.5.xml:762 msgid "" "Useful for the <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal>, and " @@ -4738,7 +4736,7 @@ msgstr "" "necessari per configurare il pacchetto in questione." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:776 +#: apt.conf.5.xml:775 #, no-wrap msgid "" "OrderList::Score {\n" @@ -4756,7 +4754,7 @@ msgstr "" "};" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:769 +#: apt.conf.5.xml:768 msgid "" "Essential packages (and their dependencies) should be configured immediately " "after unpacking. It is a good idea to do this quite early in the upgrade " @@ -4781,12 +4779,12 @@ msgstr "" "con i loro valori predefiniti. <placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:789 +#: apt.conf.5.xml:788 msgid "Periodic and Archives options" msgstr "Opzioni Periodic e Archives" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:790 +#: apt.conf.5.xml:789 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by the " @@ -4800,12 +4798,12 @@ msgstr "" "all'inizio dello script." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:798 +#: apt.conf.5.xml:797 msgid "Debug options" msgstr "Opzioni di debug" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:800 +#: apt.conf.5.xml:799 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -4823,7 +4821,7 @@ msgstr "" "esserlo:" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:811 +#: apt.conf.5.xml:810 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -4834,7 +4832,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:819 +#: apt.conf.5.xml:818 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -4845,7 +4843,7 @@ msgstr "" "install</literal>) come utente non root." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:828 +#: apt.conf.5.xml:827 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -4857,7 +4855,7 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:836 +#: apt.conf.5.xml:835 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CD-ROM IDs." @@ -4866,37 +4864,37 @@ msgstr "" "negli ID dei CD-ROM." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:846 +#: apt.conf.5.xml:845 msgid "A full list of debugging options to apt follows." msgstr "Segue un elenco completo delle opzioni di debug per apt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:855 +#: apt.conf.5.xml:854 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" "Stampa informazioni relative all'accesso a fonti <literal>cdrom://</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:866 +#: apt.conf.5.xml:865 msgid "Print information related to downloading packages using FTP." msgstr "" "Stampa informazioni relative allo scaricamento dei pacchetti usando FTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:877 +#: apt.conf.5.xml:876 msgid "Print information related to downloading packages using HTTP." msgstr "" "Stampa informazioni relative allo scaricamento dei pacchetti usando HTTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:888 +#: apt.conf.5.xml:887 msgid "Print information related to downloading packages using HTTPS." msgstr "" "Stampa informazioni relative allo scaricamento dei pacchetti usando HTTPS." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:899 +#: apt.conf.5.xml:898 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@ -4905,7 +4903,7 @@ msgstr "" "usando <literal>gpg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:910 +#: apt.conf.5.xml:909 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." @@ -4914,14 +4912,14 @@ msgstr "" "pacchetti memorizzati su CD-ROM." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:920 +#: apt.conf.5.xml:919 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" "Descrive il processo di risoluzione delle dipendenze di compilazione in &apt-" "get;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:930 +#: apt.conf.5.xml:929 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." @@ -4930,7 +4928,7 @@ msgstr "" "<literal>apt</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:940 +#: apt.conf.5.xml:939 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -4941,7 +4939,7 @@ msgstr "" "system del CD-ROM." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:951 +#: apt.conf.5.xml:950 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." @@ -4951,14 +4949,14 @@ msgstr "" "contemporaneamente." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:963 +#: apt.conf.5.xml:962 msgid "Log when items are added to or removed from the global download queue." msgstr "" "Registra nel log quando vengono aggiunte o rimosse voci dalla coda globale " "degli scaricamenti." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:973 +#: apt.conf.5.xml:972 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." @@ -4967,7 +4965,7 @@ msgstr "" "codici di controllo e delle firme di cifratura dei file scaricati." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:983 +#: apt.conf.5.xml:982 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." @@ -4977,7 +4975,7 @@ msgstr "" "diff." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:995 +#: apt.conf.5.xml:994 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." @@ -4987,7 +4985,7 @@ msgstr "" "invece degli indici completi." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1006 +#: apt.conf.5.xml:1005 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" @@ -4995,7 +4993,7 @@ msgstr "" "realmente gli scaricamenti." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1017 +#: apt.conf.5.xml:1016 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." @@ -5004,7 +5002,7 @@ msgstr "" "installato dei pacchetti e alla rimozione dei pacchetti non utilizzati." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1027 +#: apt.conf.5.xml:1026 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -5020,7 +5018,7 @@ msgstr "" "pkgProblemResolver</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1041 +#: apt.conf.5.xml:1040 msgid "" "Generate debug messages describing which packages are marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -5052,7 +5050,7 @@ msgstr "" "sezione in cui compare il pacchetto." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1062 +#: apt.conf.5.xml:1061 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." @@ -5061,7 +5059,7 @@ msgstr "" "gli argomenti separati da un singolo carattere di spazio." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1073 +#: apt.conf.5.xml:1072 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." @@ -5070,7 +5068,7 @@ msgstr "" "di stato ed ogni errore incontrato durante la sua analisi." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1084 +#: apt.conf.5.xml:1083 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." @@ -5079,7 +5077,7 @@ msgstr "" "literal> deve passare i pacchetti a &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1096 +#: apt.conf.5.xml:1095 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" @@ -5087,12 +5085,12 @@ msgstr "" "nell'invocazione di &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1107 +#: apt.conf.5.xml:1106 msgid "Output the priority of each package list on startup." msgstr "Produce in output la priorità di ogni elenco di pacchetti all'avvio." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1117 +#: apt.conf.5.xml:1116 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." @@ -5102,7 +5100,7 @@ msgstr "" "dipendenze)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1128 +#: apt.conf.5.xml:1127 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -5113,7 +5111,7 @@ msgstr "" "la stessa descritta in <literal>Debug::pkgDepCache::Marker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1140 +#: apt.conf.5.xml:1139 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@ -5122,13 +5120,13 @@ msgstr "" "filename>." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:1162 apt_preferences.5.xml:545 sources.list.5.xml:211 +#: apt.conf.5.xml:1161 apt_preferences.5.xml:545 sources.list.5.xml:211 #: apt-ftparchive.1.xml:596 msgid "Examples" msgstr "Esempi" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1163 +#: apt.conf.5.xml:1162 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -5138,7 +5136,7 @@ msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1175 +#: apt.conf.5.xml:1174 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." @@ -6649,13 +6647,13 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:92 msgid "" -"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)" -"</literal> which expands to the Debian architecture (such as <literal>amd64</" -"literal> or <literal>armel</literal>) used on the system. This permits " -"architecture-independent <filename>sources.list</filename> files to be used. " -"In general this is only of interest when specifying an exact path, " -"<literal>APT</literal> will automatically generate a URI with the current " -"architecture otherwise." +"<literal>distribution</literal> may also contain a variable, <literal>" +"$(ARCH)</literal> which expands to the Debian architecture (such as " +"<literal>amd64</literal> or <literal>armel</literal>) used on the system. " +"This permits architecture-independent <filename>sources.list</filename> " +"files to be used. In general this is only of interest when specifying an " +"exact path, <literal>APT</literal> will automatically generate a URI with " +"the current architecture otherwise." msgstr "" "<literal>distribuzione</literal> può anche contenere una variabile <literal>" "$(ARCH)</literal> che viene espansa nell'architettura Debian (come " @@ -8150,9 +8148,9 @@ msgstr "DESCRIZIONE" #: apt.8:31 msgid "" "APT is a management system for software packages. For normal day to day " -"package management there are several frontends available, such as B<aptitude>" -"(8) for the command line or B<synaptic>(8) for the X Window System. Some " -"options are only implemented in B<apt-get>(8) though." +"package management there are several frontends available, such as " +"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " +"System. Some options are only implemented in B<apt-get>(8) though." msgstr "" "APT è un sistema di gestione per i pacchetti software. Per la normale " "gestione quotidiana dei pacchetti sono disponibili diverse interfacce, quali " @@ -8206,8 +8204,8 @@ msgid "" "B<reportbug>(1) command." msgstr "" "Vedere E<lt>http://bugs.debian.org/aptE<gt>. Per segnalare un bug in B<apt>, " -"vedere I</usr/share/doc/debian/bug-reporting.txt> o il comando B<reportbug>" -"(1)." +"vedere I</usr/share/doc/debian/bug-reporting.txt> o il comando " +"B<reportbug>(1)." #. type: SH #: apt.8:51 @@ -10126,7 +10124,8 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco." #~ " <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n" #~ " <contrib></contrib>\n" #~ " </author>\n" -#~ " <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>\n" +#~ " <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></" +#~ "copyright>\n" #~ " <date>28 October 2008</date>\n" #~ " <productname>Linux</productname>\n" #~ msgstr "" @@ -10138,7 +10137,8 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco." #~ " <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n" #~ " <contrib></contrib>\n" #~ " </author>\n" -#~ " <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>\n" +#~ " <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></" +#~ "copyright>\n" #~ " <date>28 ottobre 2008</date>\n" #~ " <productname>Linux</productname>\n" @@ -10224,7 +10224,8 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco." #~ "<!-- Boiler plate Bug reporting section -->\n" #~ "<!ENTITY manbugs \"\n" #~ " <refsect1><title>Bugs\n" -#~ " APT bug page. \n" +#~ " APT bug page. \n" #~ " If you wish to report a bug in APT, please see\n" #~ " /usr/share/doc/debian/bug-reporting.txt or the\n" #~ " &reportbug; command.\n" @@ -10235,7 +10236,8 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco." #~ "\n" #~ "Bachi\n" -#~ " Pagina dei bachi di APT. \n" +#~ " Pagina dei bachi di " +#~ "APT. \n" #~ " Per segnalare un baco in APT, vedere\n" #~ " /usr/share/doc/debian/bug-reporting.txt o il\n" #~ " comando &reportbug;.\n" @@ -10247,7 +10249,8 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco." #~ " \n" #~ " \n" #~ " \n" -#~ " Configuration File; Specify a configuration file to use. \n" +#~ " Configuration File; Specify a configuration file to " +#~ "use. \n" #~ " The program will read the default configuration file and then this \n" #~ " configuration file. See &apt-conf; for syntax information. \n" #~ " \n" @@ -10257,36 +10260,49 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco." #~ " \n" #~ " \n" #~ " \n" -#~ " File di configurazione; Specifica un file di configurazione da usare. \n" -#~ " Il programma leggerà il file di configurazione predefinito e poi questo \n" -#~ " file di configurazione. Vedere &apt-conf; per informazioni sulla sintassi. \n" +#~ " File di configurazione; Specifica un file di " +#~ "configurazione da usare. \n" +#~ " Il programma leggerà il file di configurazione predefinito e poi " +#~ "questo \n" +#~ " file di configurazione. Vedere &apt-conf; per informazioni sulla " +#~ "sintassi. \n" #~ " \n" #~ " \n" #~ " \n" #~ msgid "" -#~ " &cachedir;/archives/partial/\n" +#~ " &cachedir;/archives/partial/\n" #~ " Storage area for package files in transit.\n" -#~ " Configuration Item: Dir::Cache::Archives (implicit partial). \n" +#~ " Configuration Item: Dir::Cache::Archives " +#~ "(implicit partial). \n" #~ " \n" #~ "\">\n" #~ msgstr "" -#~ " &cachedir;/archives/partial/\n" -#~ " Area di memorizzazione per i file dei pacchetti in transito.\n" -#~ " Voce di configurazione: Dir::Cache::Archives (partial implicito). \n" +#~ " &cachedir;/archives/partial/\n" +#~ " Area di memorizzazione per i file dei pacchetti in " +#~ "transito.\n" +#~ " Voce di configurazione: Dir::Cache::Archives " +#~ "(partial implicito). \n" #~ " \n" #~ "\">\n" #~ msgid "" -#~ " &statedir;/lists/partial/\n" +#~ " &statedir;/lists/partial/\n" #~ " Storage area for state information in transit.\n" -#~ " Configuration Item: Dir::State::Lists (implicit partial).\n" +#~ " Configuration Item: Dir::State::Lists (implicit " +#~ "partial).\n" #~ " \n" #~ "\">\n" #~ msgstr "" -#~ " &statedir;/lists/partial/\n" -#~ " Area di archiviazione per le informazioni di stato in transito.\n" -#~ " Voce di configurazione: Dir::State::Lists (partial implicito).\n" +#~ " &statedir;/lists/partial/\n" +#~ " Area di archiviazione per le informazioni di stato " +#~ "in transito.\n" +#~ " Voce di configurazione: Dir::State::Lists " +#~ "(partial implicito).\n" #~ " \n" #~ "\">\n" @@ -10294,17 +10310,24 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco." #~ msgstr "" #~ msgid "" -#~ "\n" #~ "john@doe.org in 2009,\n" -#~ " 2010 and Daniela Acme daniela@acme.us in 2010 together with the\n" -#~ " Debian Dummy l10n Team debian-l10n-dummy@lists.debian.org.\n" +#~ " The english translation was done by John Doe john@doe.org in 2009,\n" +#~ " 2010 and Daniela Acme daniela@acme.us in 2010 " +#~ "together with the\n" +#~ " Debian Dummy l10n Team debian-l10n-dummy@lists.debian.org.\n" #~ "\">\n" #~ msgstr "" -#~ "\n" #~ "\n" #~ msgid "" -#~ "\n" #~ "\n" #~ msgstr "" -#~ "\n" +#~ "" + << "" << std::endl + << "

Index of " << dir << "

" << std::endl + << "" << std::endl; + if (dir != ".") + listing << ""; + for (int i = 0; i < counter; ++i) { + struct stat fs; + std::string filename(dir); + filename.append("/").append(namelist[i]->d_name); + stat(filename.c_str(), &fs); + if (S_ISDIR(fs.st_mode)) + { + listing << "" + << "" + << ""; + } + else + { + listing << "" + << "" + << ""; + } + listing << "" << std::endl; + } + listing << "
#NameSizeLast-Modified
dParent Directory--
dd_name << "/\">" << namelist[i]->d_name << "-
fd_name << "\">" << namelist[i]->d_name << "" << SizeToStr(fs.st_size) << "B" << TimeRFC1123(fs.st_mtime) << "
" << std::endl; + + std::string response(listing.str()); + addDataHeaders(headers, response); + sendHead(client, 200, headers); + if (content == true) + sendData(client, response); +} + /*}}}*/ bool parseFirstLine(int const client, std::string const &request, /*{{{*/ std::string &filename, bool &sendContent, bool &closeConnection) @@ -326,6 +440,13 @@ int main(int const argc, const char * argv[]) if (sendContent == true) sendFile(client, data); } + else if (DirectoryExists(filename) == true) + { + if (filename == "." || filename[filename.length()-1] == '/') + sendDirectoryListing(client, filename, *m, sendContent); + else + sendRedirect(client, 301, filename.append("/"), *m, sendContent); + } else sendError(client, 404, *m, sendContent); } -- cgit v1.2.3 From 0aec7d5c2f6fd55301bd1e1ed35ab7a23fd2357e Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 15 Jun 2013 23:47:07 +0200 Subject: do not redownload unchanged InRelease files Before we download the 'new' InRelease file the old file will be moved out of the way with the name 'foobar_InRelease.reverify', so if no partial file for the 'new' file exists take the modification time from this reverify file, so that if we get an IMS hit for the InRelease file we can move back the reverify file as new file rather than downloading the 'new' file even though we already have it. We do the same for Release files and this happened to work until the reverify renaming was corrected for InRelease files. --- apt-pkg/acquire-item.cc | 13 ++++++++++++- debian/changelog | 1 + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 7b800e42f..c48443eff 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -1289,7 +1289,14 @@ void pkgAcqMetaIndex::RetrievalDone(string Message) /*{{{*/ string FinalFile = _config->FindDir("Dir::State::lists"); FinalFile += URItoFileName(RealURI); if (SigFile == DestFile) + { SigFile = FinalFile; + // constructor of pkgAcqMetaClearSig moved it out of the way, + // now move it back in on IMS hit for the 'old' file + string const OldClearSig = DestFile + ".reverify"; + if (RealFileExists(OldClearSig) == true) + Rename(OldClearSig, FinalFile); + } DestFile = FinalFile; } Complete = true; @@ -1595,7 +1602,11 @@ string pkgAcqMetaClearSig::Custom600Headers() struct stat Buf; if (stat(Final.c_str(),&Buf) != 0) - return "\nIndex-File: true\nFail-Ignore: true\n"; + { + Final = DestFile + ".reverify"; + if (stat(Final.c_str(),&Buf) != 0) + return "\nIndex-File: true\nFail-Ignore: true\n"; + } return "\nIndex-File: true\nFail-Ignore: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime); } diff --git a/debian/changelog b/debian/changelog index dfff872a7..91d4ae536 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,7 @@ apt (0.9.8.3) UNRELEASED; urgency=low * handle missing "Description" in apt-cache show (Closes: #712435) * try defaults if auto-detection failed in apt-cdrom (Closes: #712433) * support \n and \r\n line endings in ReadMessages + * do not redownload unchanged InRelease files -- David Kalnischkies Sun, 09 Jun 2013 15:06:24 +0200 -- cgit v1.2.3 From 7ea27d2a6d10ee41f8fca5d8ad7373c8b3d90ea9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 15 Jun 2013 23:58:12 +0200 Subject: simple URI rewrite rules config for webserver we have a test which required traditionally lighttpd to be executed as it requires a webserver supporting some kind of URI rewriting. Now with some lines of code our own webserver can do this and the testcase can be enabled by default. This test hinted at the bug fixed in the previous commit, so having more tests which can easily be run is a good thing. Git-Dch: Ignore --- test/integration/skip-bug-602412-dequote-redirect | 38 ----------------------- test/integration/test-bug-602412-dequote-redirect | 29 +++++++++++++++++ test/interactive-helper/aptwebserver.cc | 16 ++++++++++ 3 files changed, 45 insertions(+), 38 deletions(-) delete mode 100755 test/integration/skip-bug-602412-dequote-redirect create mode 100755 test/integration/test-bug-602412-dequote-redirect diff --git a/test/integration/skip-bug-602412-dequote-redirect b/test/integration/skip-bug-602412-dequote-redirect deleted file mode 100755 index 689b671ce..000000000 --- a/test/integration/skip-bug-602412-dequote-redirect +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -set -e - -TESTDIR=$(readlink -f $(dirname $0)) -. $TESTDIR/framework -setupenvironment -configarchitecture 'i386' - -if ! which lighttpd > /dev/null; then - msgdie 'You need lighttpd for this testcase, sorry…' - exit 1 -fi - -buildsimplenativepackage 'unrelated' 'all' '0.5~squeeze1' 'unstable' - -setupaptarchive - -echo "server.modules = ( \"mod_redirect\" ) -server.document-root = \"$(readlink -f ./aptarchive)\" -server.port = 8080 -server.stat-cache-engine = \"disable\" -url.redirect = ( \"^/pool/(.*)$\" => \"/newpool/\$1\", - \"^/dists/(.*)$\" => \"/newdists/\$1\" )" > lighttpd.conf - -mv aptarchive/pool aptarchive/newpool -mv aptarchive/dists aptarchive/newdists - -lighttpd -t -f lighttpd.conf >/dev/null || msgdie 'Can not change to webserver: our lighttpd config is invalid' -lighttpd -D -f lighttpd.conf 2>/dev/null >/dev/null & -addtrap "kill $!;" - -APTARCHIVE="file://$(readlink -f ./aptarchive)" -for LIST in $(find rootdir/etc/apt/sources.list.d/ -name 'apt-test-*.list'); do - sed -i $LIST -e "s#$APTARCHIVE#http://localhost:8080/#" -done - -aptget update || msgdie 'apt-get update failed' -aptget install unrelated --download-only || msgdie 'downloading package failed' diff --git a/test/integration/test-bug-602412-dequote-redirect b/test/integration/test-bug-602412-dequote-redirect new file mode 100755 index 000000000..c20443559 --- /dev/null +++ b/test/integration/test-bug-602412-dequote-redirect @@ -0,0 +1,29 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework +setupenvironment +configarchitecture 'amd64' + +buildsimplenativepackage 'unrelated' 'all' '0.5~squeeze1' 'unstable' + +setupaptarchive +changetowebserver -o aptwebserver::redirect::replace::/pool/=/newpool/ \ + -o aptwebserver::redirect::replace::/dists/=/newdists/ + +mv aptarchive/pool aptarchive/newpool +mv aptarchive/dists aptarchive/newdists + +msgtest 'Test redirection works in' 'apt-get update' +aptget update -qq && msgpass || msgfail + +# check that I-M-S header is kept in redirections +testequal 'Hit http://localhost:8080 unstable InRelease +Hit http://localhost:8080 unstable/main Sources +Hit http://localhost:8080 unstable/main amd64 Packages +Hit http://localhost:8080 unstable/main Translation-en +Reading package lists...' aptget update #-o debug::pkgacquire=1 -o debug::pkgacquire::worker=1 + +msgtest 'Test redirection works in' 'package download' +aptget install unrelated --download-only -qq && msgpass || msgfail diff --git a/test/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc index d25f50624..de235fa05 100644 --- a/test/interactive-helper/aptwebserver.cc +++ b/test/interactive-helper/aptwebserver.cc @@ -420,6 +420,22 @@ int main(int const argc, const char * argv[]) continue; } + // string replacements in the requested filename + ::Configuration::Item const *Replaces = _config->Tree("aptwebserver::redirect::replace"); + if (Replaces != NULL) + { + std::string redirect = "/" + filename; + for (::Configuration::Item *I = Replaces->Child; I != NULL; I = I->Next) + redirect = SubstVar(redirect, I->Tag, I->Value); + redirect.erase(0,1); + if (redirect != filename) + { + sendRedirect(client, 301, redirect, *m, sendContent); + continue; + } + } + + // deal with the request if (RealFileExists(filename) == true) { FileFd data(filename, FileFd::ReadOnly); -- cgit v1.2.3 From 5229b285f07edd5ed695c264c8d80310f339af96 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 16 Jun 2013 23:23:28 +0200 Subject: tests: accept an explaination for msgfail Git-Dch: Ignore --- test/integration/framework | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/test/integration/framework b/test/integration/framework index 9db4a1017..3f11ac23b 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -38,7 +38,11 @@ msgtest() { } msgpass() { echo "${CPASS}PASS${CNORMAL}" >&2; } msgskip() { echo "${CWARNING}SKIP${CNORMAL}" >&2; } -msgfail() { echo "${CFAIL}FAIL${CNORMAL}" >&2; EXIT_CODE=$((EXIT_CODE+1)); } +msgfail() { + if [ $# -gt 0 ]; then echo "${CFAIL}FAIL: $*${CNORMAL}" >&2; + else echo "${CFAIL}FAIL${CNORMAL}" >&2; fi + EXIT_CODE=$((EXIT_CODE+1)); +} # enable / disable Debugging MSGLEVEL=${MSGLEVEL:-3} @@ -56,9 +60,9 @@ if [ $MSGLEVEL -le 2 ]; then msgpass() { echo -n " ${CPASS}P${CNORMAL}" >&2; } msgskip() { echo -n " ${CWARNING}S${CNORMAL}" >&2; } if [ -n "$CFAIL" ]; then - msgfail() { echo -n " ${CFAIL}FAIL${CNORMAL}" >&2; } + msgfail() { echo -n " ${CFAIL}FAIL${CNORMAL}" >&2; EXIT_CODE=$((EXIT_CODE+1)); } else - msgfail() { echo -n " ###FAILED###" >&2; } + msgfail() { echo -n " ###FAILED###" >&2; EXIT_CODE=$((EXIT_CODE+1)); } fi fi if [ $MSGLEVEL -le 3 ]; then -- cgit v1.2.3 From ae99ce2e3cadb07c80b89ab2afc804875b1026c5 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 17 Jun 2013 11:23:13 +0200 Subject: trigger NODATA error for invalid InRelease files With the selfgrown splitting we got the problem of not recovering from networks which just reply with invalid data like those sending us login pages to authenticate with the network (e.g. hotels) back. The good thing about the InRelease file is that we know that it must be clearsigned (a Release file might or might not have a detached sig) so if we get a file but are unable to split it something is seriously wrong, so there is not much point in trying further. The Acquire system already looks out for a NODATA error from gpgv, so this adds a new error message sent to the acquire system in case the splitting we do now ourselves failed including this magic word. Closes: #712486 --- apt-pkg/contrib/gpgv.cc | 2 +- apt-pkg/contrib/gpgv.h | 15 ++++- debian/changelog | 1 + methods/gpgv.cc | 16 +++--- test/integration/framework | 3 + .../test-ubuntu-bug-346386-apt-get-update-paywall | 64 ++++++++++++++++++++++ test/interactive-helper/aptwebserver.cc | 26 +++++++++ 7 files changed, 114 insertions(+), 13 deletions(-) create mode 100755 test/integration/test-ubuntu-bug-346386-apt-get-update-paywall diff --git a/apt-pkg/contrib/gpgv.cc b/apt-pkg/contrib/gpgv.cc index 31db7d5fe..f47e7ea48 100644 --- a/apt-pkg/contrib/gpgv.cc +++ b/apt-pkg/contrib/gpgv.cc @@ -154,7 +154,7 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG, if (sigFd != -1) unlink(data); ioprintf(std::cerr, "Splitting up %s into data and signature failed", File.c_str()); - exit(EINTERNAL); + exit(112); } Args.push_back(sig); Args.push_back(data); diff --git a/apt-pkg/contrib/gpgv.h b/apt-pkg/contrib/gpgv.h index 08b10a97a..45f069058 100644 --- a/apt-pkg/contrib/gpgv.h +++ b/apt-pkg/contrib/gpgv.h @@ -23,9 +23,18 @@ /** \brief generates and run the command to verify a file with gpgv * * If File and FileSig specify the same file it is assumed that we - * deal with a clear-signed message. In that case the file will be - * rewritten to be in a good-known format without uneeded whitespaces - * and additional messages (unsigned or signed). + * deal with a clear-signed message. Note that the method will accept + * and validate files which include additional (unsigned) messages + * without complaining. Do NOT open files accepted by this method + * for reading. Use #OpenMaybeClearSignedFile to access the message + * instead to ensure you are only reading signed data. + * + * The method does not return, but has some noteable exit-codes: + * 111 signals an internal error like the inability to execute gpgv, + * 112 indicates a clear-signed file which doesn't include a message, + * which can happen if APT is run while on a network requiring + * authentication before usage (e.g. in hotels) + * All other exit-codes are passed-through from gpgv. * * @param File is the message (unsigned or clear-signed) * @param FileSig is the signature (detached or clear-signed) diff --git a/debian/changelog b/debian/changelog index 91d4ae536..bd25df1e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,7 @@ apt (0.9.8.3) UNRELEASED; urgency=low * try defaults if auto-detection failed in apt-cdrom (Closes: #712433) * support \n and \r\n line endings in ReadMessages * do not redownload unchanged InRelease files + * trigger NODATA error for invalid InRelease files (Closes: #712486) -- David Kalnischkies Sun, 09 Jun 2013 15:06:24 +0200 diff --git a/methods/gpgv.cc b/methods/gpgv.cc index 3f814b9f0..fe8bac6c9 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -55,9 +55,6 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, vector &NoPubKeySigners) { bool const Debug = _config->FindB("Debug::Acquire::gpgv", false); - // setup a (empty) stringstream for formating the return value - std::stringstream ret; - ret.str(""); if (Debug == true) std::clog << "inside VerifyGetSigners" << std::endl; @@ -170,18 +167,19 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, return ""; } else if (WEXITSTATUS(status) == 1) - { return _("At least one invalid signature was encountered."); - } else if (WEXITSTATUS(status) == 111) + return _("Could not execute 'gpgv' to verify signature (is gpgv installed?)"); + else if (WEXITSTATUS(status) == 112) { - ioprintf(ret, _("Could not execute 'gpgv' to verify signature (is gpgv installed?)")); - return ret.str(); + // acquire system checks for "NODATA" to generate GPG errors (the others are only warnings) + std::string errmsg; + //TRANSLATORS: %s is a single techy word like 'NODATA' + strprintf(errmsg, _("Clearsigned file isn't valid, got '%s' (does the network require authentication?)"), "NODATA"); + return errmsg; } else - { return _("Unknown error executing gpgv"); - } } bool GPGVMethod::Fetch(FetchItem *Itm) diff --git a/test/integration/framework b/test/integration/framework index 3f11ac23b..3a02cfb76 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -118,6 +118,9 @@ gdb() { echo "gdb: run »$*«" APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} $(which gdb) ${BUILDDIRECTORY}/$1 } +http() { + LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/methods/http +} exitwithstatus() { # error if we about to overflow, but ... diff --git a/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall b/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall new file mode 100755 index 000000000..1576c396c --- /dev/null +++ b/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall @@ -0,0 +1,64 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework + +setupenvironment +configarchitecture 'native' + +insertpackage 'unstable' 'unrelated' 'all' '1.0' 'stable' +insertsource 'unstable' 'unrelated' 'all' '1.0' 'stable' + +echo 'ni ni ni' > aptarchive/knights + +setupaptarchive +changetowebserver -o 'aptwebserver::overwrite::.*::filename=/knights' + +msgtest 'Acquire test file from the webserver to check' 'overwrite' +echo '601 Configuration +Config-Item: Acquire::http::DependOnSTDIN=0 + +600 Acquire URI +URI: http://localhost:8080/holygrail +Filename: knights-talking +' | http >/dev/null 2>&1 && msgpass || msgfail +testfileequal knights-talking 'ni ni ni' + +ensure_n_canary_strings_in_dir() { + local DIR="$1" + local CANARY_STRING="$2" + local EXPECTED_N="$3" + + msgtest "Testing in $DIR for $EXPECTED_N canary" "$CANARY_STRING" + local N=$(grep "$CANARY_STRING" $DIR/* 2>/dev/null |wc -l ) + test "$N" = "$EXPECTED_N" && msgpass || msgfail "Expected $EXPECTED_N canaries, got $N" +} + +LISTS='rootdir/var/lib/apt/lists' +rm -rf rootdir/var/lib/apt/lists +msgtest 'Got expected NODATA failure in' 'apt-get update' +aptget update -qq 2>&1 | grep -q 'E: GPG error.*NODATA' && msgpass || msgfail + +ensure_n_canary_strings_in_dir $LISTS 'ni ni ni' 0 +testequal 'partial' ls $LISTS + +# and again with pre-existing files with "valid data" which should remain +for f in Release Release.gpg main_binary-amd64_Packages main_source_Sources; do + echo 'peng neee-wom' > $LISTS/localhost:8080_dists_stable_${f} +done + +msgtest 'Got expected NODATA failure in' 'apt-get update' +aptget update -qq 2>&1 | grep -q 'E: GPG error.*NODATA' && msgpass || msgfail + +ensure_n_canary_strings_in_dir $LISTS 'peng neee-wom' 4 +ensure_n_canary_strings_in_dir $LISTS 'ni ni ni' 0 + +# and now with a pre-existing InRelease file +echo 'peng neee-wom' > $LISTS/localhost:8080_dists_stable_InRelease +rm -f $LISTS/localhost:8080_dists_stable_Release $LISTS/localhost:8080_dists_stable_Release.gpg +msgtest 'excpected failure of' 'apt-get update' +aptget update -qq 2>&1 | grep -q 'E: GPG error.*NODATA' && msgpass || msgfail + +ensure_n_canary_strings_in_dir $LISTS 'peng neee-wom' 3 +ensure_n_canary_strings_in_dir $LISTS 'ni ni ni' 0 diff --git a/test/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc index de235fa05..05b875673 100644 --- a/test/interactive-helper/aptwebserver.cc +++ b/test/interactive-helper/aptwebserver.cc @@ -435,6 +435,32 @@ int main(int const argc, const char * argv[]) } } + ::Configuration::Item const *Overwrite = _config->Tree("aptwebserver::overwrite"); + if (Overwrite != NULL) + { + for (::Configuration::Item *I = Overwrite->Child; I != NULL; I = I->Next) + { + regex_t *pattern = new regex_t; + int const res = regcomp(pattern, I->Tag.c_str(), REG_EXTENDED | REG_ICASE | REG_NOSUB); + if (res != 0) + { + char error[300]; + regerror(res, pattern, error, sizeof(error)); + sendError(client, 500, *m, sendContent, error); + continue; + } + if (regexec(pattern, filename.c_str(), 0, 0, 0) == 0) + { + filename = _config->Find("aptwebserver::overwrite::" + I->Tag + "::filename", filename); + if (filename[0] == '/') + filename.erase(0,1); + regfree(pattern); + break; + } + regfree(pattern); + } + } + // deal with the request if (RealFileExists(filename) == true) { -- cgit v1.2.3 From 947da3eb4ecaf6b7d64bbcfb656efeff33cff58b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 20 Jun 2013 20:21:58 +0200 Subject: fix syntax error in the configure-index The file isn't supposed to be a valid config file, but it should show valid syntax non-the-less. Git-Dch: Ignore --- doc/examples/configure-index | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/examples/configure-index b/doc/examples/configure-index index f75b5738a..f4d9d17f2 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -225,7 +225,7 @@ Acquire Verify-Peer "false"; SslCert "/etc/apt/some.pem"; CaPath "/etc/ssl/certs"; - Verify-Host" "true"; + Verify-Host "true"; AllowRedirect "true"; Timeout "120"; -- cgit v1.2.3 From 0a83556bf3ed33c95f39dd1063c4e745aaaeac9e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sat, 22 Jun 2013 10:03:24 +0200 Subject: Improve the apt-cdrom output when no CD-ROM can be auto-detected (closes: #712433) --- cmdline/apt-cdrom.cc | 25 +++++++++++++++++++------ doc/apt-cdrom.8.xml | 8 ++++++++ 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc index 70e49910c..520b1e0a0 100644 --- a/cmdline/apt-cdrom.cc +++ b/cmdline/apt-cdrom.cc @@ -39,6 +39,12 @@ #include /*}}}*/ +static const char *W_NO_CDROM_FOUND = \ + N_("No CD-ROM could be auto-detected or found using " + "the default mount path.\n" + "You may try the --cdrom option to set the CD-ROM mount path. " + "See 'man apt-cdrom' for more " + "information about the CD-ROM auto-detection and mount path."); using namespace std; @@ -135,7 +141,6 @@ bool AutoDetectCdrom(pkgUdevCdromDevices &UdevCdroms, unsigned int &i) return true; } /*}}}*/ - // DoAdd - Add a new CDROM /*{{{*/ // --------------------------------------------------------------------- /* This does the main add bit.. We show some status and things. The @@ -154,8 +159,12 @@ bool DoAdd(CommandLine &) if (AutoDetect && UdevCdroms.Dlopen()) while (AutoDetectCdrom(UdevCdroms, count)) res &= cdrom.Add(&log); - if (count == 0) + if (count == 0) { res = cdrom.Add(&log); + if (res == false) { + _error->Warning(_(W_NO_CDROM_FOUND)); + } + } if(res) cout << _("Repeat this process for the rest of the CDs in your set.") << endl; @@ -180,8 +189,12 @@ bool DoIdent(CommandLine &) if (AutoDetect && UdevCdroms.Dlopen()) while (AutoDetectCdrom(UdevCdroms, count)) res &= cdrom.Ident(ident, &log); - if (count == 0) - return cdrom.Ident(ident, &log); + if (count == 0) { + res = cdrom.Ident(ident, &log); + if (res == false) { + _error->Warning(_(W_NO_CDROM_FOUND)); + } + } return res; } /*}}}*/ @@ -213,7 +226,7 @@ int ShowHelp() " -m No mounting\n" " -f Fast mode, don't check package files\n" " -a Thorough scan mode\n" - " --auto-detect Auto detect drive and mount point\n" + " --no-auto-detect Do not try to auto detect drive and mount point\n" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" "See fstab(5)\n"; @@ -224,7 +237,7 @@ int main(int argc,const char *argv[]) /*{{{*/ { CommandLine::Args Args[] = { {'h',"help","help",0}, - { 0,"auto-detect","Acquire::cdrom::AutoDetect",0}, + { 0,"auto-detect","Acquire::cdrom::AutoDetect", CommandLine::Boolean}, {'v',"version","version",0}, {'d',"cdrom","Acquire::cdrom::mount",CommandLine::HasArg}, {'r',"rename","APT::CDROM::Rename",0}, diff --git a/doc/apt-cdrom.8.xml b/doc/apt-cdrom.8.xml index 943511f03..b076a98a3 100644 --- a/doc/apt-cdrom.8.xml +++ b/doc/apt-cdrom.8.xml @@ -81,6 +81,14 @@ &apt-cmdblurb; + + Do not try to auto-detect the CD-ROM path. Usually combined with the option. + Configuration Item: Acquire::cdrom::AutoDetect. + + + + + Mount point; specify the location to mount the CD-ROM. This mount point must be listed in /etc/fstab and -- cgit v1.2.3 From 6420c00e30cd9512e045a5370bf391321691ca78 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 24 Jun 2013 12:29:48 +0200 Subject: do not modify DepIterator as we might check again fixup for 42d51f333e8ef522fed02cdfc48663488d56c3a3 The for-loop iterating over the DepIterators which need configuration can (and will be in 'complicated' situations) run multiple times, so we can't just GlobOr on the DepIterator as it modifies it, so that the next iteration over the list ends up checking another dependency leading us into a 'Internal error, packages left unconfigured. foopkg' maybe or we are 'lucky' and calculate a solution which might break down the line Git-Dch: Ignore --- apt-pkg/packagemanager.cc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index b8932753d..310934c42 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -420,11 +420,14 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth) do { Changed = false; - for (std::list::iterator D = needConfigure.begin(); D != needConfigure.end(); ++D) + for (std::list::const_iterator D = needConfigure.begin(); D != needConfigure.end(); ++D) { - // Compute a single dependency element (glob or) + // Compute a single dependency element (glob or) without modifying D pkgCache::DepIterator Start, End; - D->GlobOr(Start,End); + { + pkgCache::DepIterator Discard = *D; + Discard.GlobOr(Start,End); + } if (End->Type != pkgCache::Dep::Depends) continue; @@ -483,9 +486,8 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth) } - if (Bad == true && Changed == false && Debug == true) - std::clog << OutputInDepth(Depth) << "Could not satisfy " << Start << std::endl; + std::clog << OutputInDepth(Depth) << "Could not satisfy " << *D << std::endl; } if (i++ > max_loops) return _error->Error("Internal error: MaxLoopCount reached in SmartUnPack (2) for %s, aborting", Pkg.FullName().c_str()); -- cgit v1.2.3 From f58a9890e345faa04b5fcb2a01cae39f986a42db Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 24 Jun 2013 12:51:29 +0200 Subject: fix SHA2* cleanups to zero-out the complete context MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GCC 4.8 is now clever enough to warn about: contrib/sha2_internal.cc: In function ‘char* SHA256_End(SHA256_CTX*, char*)’: contrib/sha2_internal.cc:656:31: warning: argument to ‘sizeof’ in ‘void* memset(void*, int, size_t)’ call is the same expression as the destination; did you mean to dereference it? [-Wsizeof-pointer-memaccess] MEMSET_BZERO(context, sizeof(context)); So fix it as suggested. Its interesting though that the SHA2* calculation as far as we need it works even without zeroing out. Git-Dch: Ignore --- apt-pkg/contrib/sha2_internal.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apt-pkg/contrib/sha2_internal.cc b/apt-pkg/contrib/sha2_internal.cc index 83b5a98d3..f84fb761c 100644 --- a/apt-pkg/contrib/sha2_internal.cc +++ b/apt-pkg/contrib/sha2_internal.cc @@ -632,7 +632,7 @@ void SHA256_Final(sha2_byte digest[], SHA256_CTX* context) { } /* Clean up state data: */ - MEMSET_BZERO(context, sizeof(context)); + MEMSET_BZERO(context, sizeof(*context)); usedspace = 0; } @@ -653,7 +653,7 @@ char *SHA256_End(SHA256_CTX* context, char buffer[]) { } *buffer = (char)0; } else { - MEMSET_BZERO(context, sizeof(context)); + MEMSET_BZERO(context, sizeof(*context)); } MEMSET_BZERO(digest, SHA256_DIGEST_LENGTH); return buffer; @@ -969,7 +969,7 @@ void SHA512_Final(sha2_byte digest[], SHA512_CTX* context) { } /* Zero out state data */ - MEMSET_BZERO(context, sizeof(context)); + MEMSET_BZERO(context, sizeof(*context)); } char *SHA512_End(SHA512_CTX* context, char buffer[]) { @@ -989,7 +989,7 @@ char *SHA512_End(SHA512_CTX* context, char buffer[]) { } *buffer = (char)0; } else { - MEMSET_BZERO(context, sizeof(context)); + MEMSET_BZERO(context, sizeof(*context)); } MEMSET_BZERO(digest, SHA512_DIGEST_LENGTH); return buffer; @@ -1044,7 +1044,7 @@ void SHA384_Final(sha2_byte digest[], SHA384_CTX* context) { } /* Zero out state data */ - MEMSET_BZERO(context, sizeof(context)); + MEMSET_BZERO(context, sizeof(*context)); } char *SHA384_End(SHA384_CTX* context, char buffer[]) { @@ -1064,7 +1064,7 @@ char *SHA384_End(SHA384_CTX* context, char buffer[]) { } *buffer = (char)0; } else { - MEMSET_BZERO(context, sizeof(context)); + MEMSET_BZERO(context, sizeof(*context)); } MEMSET_BZERO(digest, SHA384_DIGEST_LENGTH); return buffer; -- cgit v1.2.3 From 24a67e0954716697e87f68384eb415e0e0a5796c Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Mon, 24 Jun 2013 13:22:54 +0200 Subject: delete Memb on read-error in arfile Git-Dch: Ignore --- apt-inst/contrib/arfile.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apt-inst/contrib/arfile.cc b/apt-inst/contrib/arfile.cc index 2dee1a40d..d7ee528ba 100644 --- a/apt-inst/contrib/arfile.cc +++ b/apt-inst/contrib/arfile.cc @@ -106,7 +106,10 @@ bool ARArchive::LoadHeaders() return _error->Error(_("Invalid archive member header")); } if (File.Read(S,Len) == false) + { + delete Memb; return false; + } S[Len] = 0; Memb->Name = S; Memb->Size -= Len; -- cgit v1.2.3 From e3c62328abbd548bb0da42fdbad954b3ce4f7102 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 24 Jun 2013 16:34:38 +0200 Subject: simple fork and pidfile aptwebserver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Forking only after being ready to accept clients avoids running races with the tests which sometimes failed on the first 'apt-get update' (or similar) with the previous background-start and hope for the best… The commit fixes also some oversight output-order changes in regards to Description-md5 and (I-M-S) race conditions in various tests. Git-Dch: Ignore --- test/integration/Packages-pdiff-usage | 2 ++ test/integration/Packages-pdiff-usage-new | 2 ++ test/integration/Packages-releasefile-verification | 1 + .../Packages-releasefile-verification-new | 1 + test/integration/framework | 18 ++++++++--- .../test-bug-590041-prefer-non-virtual-packages | 2 ++ .../test-bug-601016-description-translation | 31 +++++++++++------- .../test-cve-2013-1051-InRelease-parsing | 2 +- test/integration/test-pdiff-usage | 2 +- test/integration/test-releasefile-verification | 4 +-- test/interactive-helper/aptwebserver.cc | 37 ++++++++++++++++++++++ 11 files changed, 83 insertions(+), 19 deletions(-) diff --git a/test/integration/Packages-pdiff-usage b/test/integration/Packages-pdiff-usage index d1530a95c..ac962f29a 100644 --- a/test/integration/Packages-pdiff-usage +++ b/test/integration/Packages-pdiff-usage @@ -19,6 +19,7 @@ Description: Advanced front-end for dpkg . APT features complete installation ordering, multiple source capability and several other unique features, see the Users Guide in apt-doc. +Description-md5: d41ee493aa9fcc6cbc9ce4eb7069959c Package: oldstuff Version: 1.0 @@ -32,3 +33,4 @@ SHA1: 3c695e028f74d5c544deeddaaa1242desa81088c SHA256: b46fd1546151c545fe4bfa56a5cc0e7deaef23e2da3e4f129727fd660f28f050 Description: some cool but old stuff This package will disappear in the next mirror update +Description-md5: 1948af60eda0a41dfa9fe83f60eb8389 diff --git a/test/integration/Packages-pdiff-usage-new b/test/integration/Packages-pdiff-usage-new index 4f374b37f..f8d7b1958 100644 --- a/test/integration/Packages-pdiff-usage-new +++ b/test/integration/Packages-pdiff-usage-new @@ -22,6 +22,7 @@ Description: Advanced front-end for dpkg . APT features complete installation ordering, multiple source capability and several other unique features, see the Users Guide in apt-doc. +Description-md5: d41ee493aa9fcc6cbc9ce4eb7069959c Package: newstuff Version: 1.0 @@ -35,3 +36,4 @@ SHA1: 3c695e028f7a1ae324deeddaaa1242desa81088c SHA256: b46fd154615edefab321cc56a5cc0e7deaef23e2da3e4f129727fd660f28f050 Description: some cool and shiny new stuff This package will appear in the next mirror update +Description-md5: d5f89fbbc2ac69c43d7e4c9b67d82b6b diff --git a/test/integration/Packages-releasefile-verification b/test/integration/Packages-releasefile-verification index 29a385f4f..eb7327279 100644 --- a/test/integration/Packages-releasefile-verification +++ b/test/integration/Packages-releasefile-verification @@ -16,3 +16,4 @@ Description: Advanced front-end for dpkg . APT features complete installation ordering, multiple source capability and several other unique features, see the Users Guide in apt-doc. +Description-md5: d41ee493aa9fcc6cbc9ce4eb7069959c diff --git a/test/integration/Packages-releasefile-verification-new b/test/integration/Packages-releasefile-verification-new index e3b2edf1f..61509d157 100644 --- a/test/integration/Packages-releasefile-verification-new +++ b/test/integration/Packages-releasefile-verification-new @@ -19,3 +19,4 @@ Description: Advanced front-end for dpkg . APT features complete installation ordering, multiple source capability and several other unique features, see the Users Guide in apt-doc. +Description-md5: d41ee493aa9fcc6cbc9ce4eb7069959c diff --git a/test/integration/framework b/test/integration/framework index 3a02cfb76..7dd7c20a7 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -605,9 +605,12 @@ buildaptarchivefromfiles() { cat ${line} | bzip2 > ${line}.bz2 cat ${line} | xz --format=lzma > ${line}.lzma cat ${line} | xz > ${line}.xz + if [ -n "$1" ]; then + touch -d "$1" ${line}.gz ${line}.bz2 ${line}.lzma ${line}.xz + fi msgdone "info" done - generatereleasefiles + generatereleasefiles "$@" } # can be overridden by testcases for their pleasure @@ -719,7 +722,10 @@ signreleasefiles() { done for RELEASE in $(find aptarchive/ -name Release); do gpg --yes --no-default-keyring $SECKEYS $PUBKEYS --default-key "$SIGNER" -abs -o ${RELEASE}.gpg ${RELEASE} - gpg --yes --no-default-keyring $SECKEYS $PUBKEYS --default-key "$SIGNER" --clearsign -o "$(echo "${RELEASE}" | sed 's#/Release$#/InRelease#')" $RELEASE + local INRELEASE="$(echo "${RELEASE}" | sed 's#/Release$#/InRelease#')" + gpg --yes --no-default-keyring $SECKEYS $PUBKEYS --default-key "$SIGNER" --clearsign -o $INRELEASE $RELEASE + # we might have set a specific date for the Release file, so copy it + touch -d "$(stat --format "%y" ${RELEASE})" ${RELEASE}.gpg ${INRELEASE} done msgdone "info" } @@ -728,8 +734,12 @@ changetowebserver() { local LOG='/dev/null' if test -x ${BUILDDIRECTORY}/aptwebserver; then cd aptarchive - LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/aptwebserver "$@" >$LOG 2>&1 & - addtrap "kill $!;" + LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/aptwebserver -o aptwebserver::fork=1 "$@" >$LOG 2>&1 + local PID="$(cat aptwebserver.pid)" + if [ -z "$PID" ]; then + msgdie 'Could not fork aptwebserver successfully' + fi + addtrap "kill $PID;" cd - > /dev/null elif [ $# -gt 0 ]; then msgdie 'Need the aptwebserver when passing arguments for the webserver' diff --git a/test/integration/test-bug-590041-prefer-non-virtual-packages b/test/integration/test-bug-590041-prefer-non-virtual-packages index e0dd7737f..0ce4c1413 100755 --- a/test/integration/test-bug-590041-prefer-non-virtual-packages +++ b/test/integration/test-bug-590041-prefer-non-virtual-packages @@ -9,6 +9,7 @@ pkglibc6="Package: libc6 Architecture: armel Version: 2.11.2-2~0.3 Description: Embedded GNU C Library: Shared libraries +Description-md5: b8c1e0561b75e2dc6b6482a99079c3e4 Filename: pool/main/e/eglibc/libc6_2.11.2-2_armel.deb Installed-Size: 9740 MD5sum: f5b878ce5fb8aa01a7927fa1460df537 @@ -25,6 +26,7 @@ Architecture: i386 Version: 2.1.3-13~0.3 Replaces: libc6 (<< 2.2.5-13~0.3) Description: The Berkeley database routines [glibc 2.0/2.1 compatibility] +Description-md5: de1876f7fe7f7709a110875e145e38a8 Filename: pool/main/d/db1-compat/libdb1-compat_2.1.3-13_armel.deb Installed-Size: 136 MD5sum: 4043f176ab2b40b0c01bc1211b8c103c diff --git a/test/integration/test-bug-601016-description-translation b/test/integration/test-bug-601016-description-translation index 03fddbfda..33c209e9d 100755 --- a/test/integration/test-bug-601016-description-translation +++ b/test/integration/test-bug-601016-description-translation @@ -9,8 +9,9 @@ configarchitecture 'i386' 'amd64' # we need a valid locale here, otherwise the language configuration # will be overridden by LC_ALL=C LOCALE="$(echo "$LANG" | cut -d'_' -f 1)" +MD5Sum='Description-md5: d41ee493aa9fcc6cbc9ce4eb7069959c' -PACKAGESTANZA="Package: apt +PACKAGESTANZA='Package: apt Priority: important Section: admin Installed-Size: 5984 @@ -19,8 +20,7 @@ Architecture: i386 Version: 0.8.7 Filename: pool/main/a/apt/apt_0.8.7_i386.deb Size: 2140230 -MD5sum: 74769bfbcef9ebc4fa74f7a5271b9c08 -Description-md5: d41ee493aa9fcc6cbc9ce4eb7069959c" +MD5sum: 74769bfbcef9ebc4fa74f7a5271b9c08' PACKAGESTANZA2='Package: apt Priority: important @@ -31,22 +31,23 @@ Architecture: amd64 Version: 0.8.7 Filename: pool/main/a/apt/apt_0.8.7_amd64.deb Size: 2210342 -MD5sum: 4a869bfbdef9ebc9fa74f7a5271e8d1a -Description-md5: d41ee493aa9fcc6cbc9ce4eb7069959c' +MD5sum: 4a869bfbdef9ebc9fa74f7a5271e8d1a' echo "$PACKAGESTANZA Description: Advanced front-end for dpkg +$MD5Sum $PACKAGESTANZA2 -Description: Advanced front-end for dpkg" > aptarchive/Packages +Description: Advanced front-end for dpkg +$MD5Sum" > aptarchive/Packages echo "Package: apt -Description-md5: d41ee493aa9fcc6cbc9ce4eb7069959c Description-${LOCALE}: Mächtige Oberfläche für dpkg Das Paket bietet dem Nutzer technisch führende Methoden für den Zugriff auf den dpkg-Paketmanager. Es beinhaltet das apt-get-Werkzeug und die APT-Dselect-Methode. Beides sind einfache und sicherere Wege, - um Pakete zu installieren und Upgrades durchzuführen." | bzip2 > aptarchive/${LOCALE}.bz2 + um Pakete zu installieren und Upgrades durchzuführen. +$MD5Sum" | bzip2 > aptarchive/${LOCALE}.bz2 # the $LOCALE translation file will not be included as it is a flat archive it came from and therefore # its name can not be guessed correctly… (in non-flat archives the files are called Translation-*) @@ -54,10 +55,12 @@ echo 'APT::Cache::Generate "false";' > rootdir/etc/apt/apt.conf.d/00nogenerate NOLONGSTANZA="$PACKAGESTANZA Description: Advanced front-end for dpkg +$MD5Sum " ENGLISHSTANZA="$PACKAGESTANZA Description: Advanced front-end for dpkg +$MD5Sum " LOCALESTANZA="$PACKAGESTANZA @@ -66,6 +69,7 @@ Description-${LOCALE}: Mächtige Oberfläche für dpkg auf den dpkg-Paketmanager. Es beinhaltet das apt-get-Werkzeug und die APT-Dselect-Methode. Beides sind einfache und sicherere Wege, um Pakete zu installieren und Upgrades durchzuführen. +$MD5Sum " LOCALESTANZA2="$PACKAGESTANZA2 Description-${LOCALE}: Mächtige Oberfläche für dpkg @@ -73,6 +77,7 @@ Description-${LOCALE}: Mächtige Oberfläche für dpkg auf den dpkg-Paketmanager. Es beinhaltet das apt-get-Werkzeug und die APT-Dselect-Methode. Beides sind einfache und sicherere Wege, um Pakete zu installieren und Upgrades durchzuführen. +$MD5Sum " testrun() { @@ -97,28 +102,32 @@ testrun echo "$PACKAGESTANZA Description: Advanced front-end for dpkg +$MD5Sum $PACKAGESTANZA2 -Description: Advanced front-end for dpkg" > aptarchive/Packages +Description: Advanced front-end for dpkg +$MD5Sum" > aptarchive/Packages echo "Package: apt -Description-md5: d41ee493aa9fcc6cbc9ce4eb7069959c Description-en: Advanced front-end for dpkg This is Debian's next generation front-end for the dpkg package manager. It provides the apt-get utility and APT dselect method that provides a - simpler, safer way to install and upgrade packages." | bzip2 > aptarchive/en.bz2 + simpler, safer way to install and upgrade packages. +$MD5Sum" | bzip2 > aptarchive/en.bz2 ENGLISHSTANZA="$PACKAGESTANZA Description-en: Advanced front-end for dpkg This is Debian's next generation front-end for the dpkg package manager. It provides the apt-get utility and APT dselect method that provides a simpler, safer way to install and upgrade packages. +$MD5Sum " ENGLISHSTANZA2="$PACKAGESTANZA2 Description-en: Advanced front-end for dpkg This is Debian's next generation front-end for the dpkg package manager. It provides the apt-get utility and APT dselect method that provides a simpler, safer way to install and upgrade packages. +$MD5Sum " testrun diff --git a/test/integration/test-cve-2013-1051-InRelease-parsing b/test/integration/test-cve-2013-1051-InRelease-parsing index 853da5ff6..6764fefff 100755 --- a/test/integration/test-cve-2013-1051-InRelease-parsing +++ b/test/integration/test-cve-2013-1051-InRelease-parsing @@ -37,7 +37,7 @@ sed -i '/^-----BEGIN PGP SIGNATURE-----/,/^-----END PGP SIGNATURE-----/ s/^$/ / # we append the (evil unsigned) Release file to the (good signed) InRelease cat aptarchive/dists/stable/Release >> aptarchive/dists/stable/InRelease - +touch -d '+1hour' aptarchive/dists/stable/InRelease # ensure the update fails # useful for debugging to add "-o Debug::pkgAcquire::auth=true" diff --git a/test/integration/test-pdiff-usage b/test/integration/test-pdiff-usage index 29301d07d..e45326970 100755 --- a/test/integration/test-pdiff-usage +++ b/test/integration/test-pdiff-usage @@ -35,7 +35,7 @@ SHA1-History: SHA1-Patches: 7651fc0ac57cd83d41c63195a9342e2db5650257 19722 2010-08-18-0814.28 $(sha1sum $PATCHFILE | cut -d' ' -f 1) $(stat -c%s $PATCHFILE) $(basename $PATCHFILE)" > $PATCHINDEX -generatereleasefiles +generatereleasefiles '+1hour' signreleasefiles find aptarchive -name 'Packages*' -type f -delete aptget update -qq diff --git a/test/integration/test-releasefile-verification b/test/integration/test-releasefile-verification index fba7ab290..e56f458d3 100755 --- a/test/integration/test-releasefile-verification +++ b/test/integration/test-releasefile-verification @@ -184,5 +184,5 @@ runtest2 DELETEFILE="InRelease" runtest -#DELETEFILE="Release.gpg" -#runtest +DELETEFILE="Release.gpg" +runtest diff --git a/test/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc index 05b875673..a8d191d0e 100644 --- a/test/interactive-helper/aptwebserver.cc +++ b/test/interactive-helper/aptwebserver.cc @@ -387,6 +387,41 @@ int main(int const argc, const char * argv[]) return 2; } + FileFd pidfile; + if (_config->FindB("aptwebserver::fork", false) == true) + { + std::string const pidfilename = _config->Find("aptwebserver::pidfile", "aptwebserver.pid"); + int const pidfilefd = GetLock(pidfilename); + if (pidfilefd < 0 || pidfile.OpenDescriptor(pidfilefd, FileFd::WriteOnly) == false) + { + _error->Errno("aptwebserver", "Couldn't acquire lock on pidfile '%s'", pidfilename.c_str()); + _error->DumpErrors(std::cerr); + return 3; + } + + pid_t child = fork(); + if (child < 0) + { + _error->Errno("aptwebserver", "Forking failed"); + _error->DumpErrors(std::cerr); + return 4; + } + else if (child != 0) + { + // successfully forked: ready to serve! + std::string pidcontent; + strprintf(pidcontent, "%d", child); + pidfile.Write(pidcontent.c_str(), pidcontent.size()); + if (_error->PendingError() == true) + { + _error->DumpErrors(std::cerr); + return 5; + } + std::cout << "Successfully forked as " << child << std::endl; + return 0; + } + } + std::clog << "Serving ANY file on port: " << port << std::endl; listen(sock, 1); @@ -502,5 +537,7 @@ int main(int const argc, const char * argv[]) << " on socket " << sock << std::endl; close(client); } + pidfile.Close(); + return 0; } -- cgit v1.2.3 From 9d0c9e70494abe789490cd3b76b67d2927e410e7 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 26 Jun 2013 07:35:16 +0200 Subject: "mount path"->"mount point" and also make the warning a error when no CD-ROM is found --- cmdline/apt-cdrom.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc index 520b1e0a0..3f53e16ee 100644 --- a/cmdline/apt-cdrom.cc +++ b/cmdline/apt-cdrom.cc @@ -41,10 +41,10 @@ /*}}}*/ static const char *W_NO_CDROM_FOUND = \ N_("No CD-ROM could be auto-detected or found using " - "the default mount path.\n" - "You may try the --cdrom option to set the CD-ROM mount path. " + "the default mount point.\n" + "You may try the --cdrom option to set the CD-ROM mount point. " "See 'man apt-cdrom' for more " - "information about the CD-ROM auto-detection and mount path."); + "information about the CD-ROM auto-detection and mount point."); using namespace std; @@ -162,7 +162,7 @@ bool DoAdd(CommandLine &) if (count == 0) { res = cdrom.Add(&log); if (res == false) { - _error->Warning(_(W_NO_CDROM_FOUND)); + _error->Error(_(W_NO_CDROM_FOUND)); } } @@ -192,7 +192,7 @@ bool DoIdent(CommandLine &) if (count == 0) { res = cdrom.Ident(ident, &log); if (res == false) { - _error->Warning(_(W_NO_CDROM_FOUND)); + _error->Error(_(W_NO_CDROM_FOUND)); } } return res; -- cgit v1.2.3 From 03d7b3cdd0fa1f13a41a611d22294266cae9d798 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 26 Jun 2013 07:38:02 +0200 Subject: make update-po --- po/apt-all.pot | 335 ++++++++++++++++++++++++++++++--------------------------- po/ar.po | 333 +++++++++++++++++++++++++++++--------------------------- po/ast.po | 333 +++++++++++++++++++++++++++++--------------------------- po/bg.po | 333 +++++++++++++++++++++++++++++--------------------------- po/bs.po | 333 +++++++++++++++++++++++++++++--------------------------- po/ca.po | 333 +++++++++++++++++++++++++++++--------------------------- po/cs.po | 333 +++++++++++++++++++++++++++++--------------------------- po/cy.po | 333 +++++++++++++++++++++++++++++--------------------------- po/da.po | 333 +++++++++++++++++++++++++++++--------------------------- po/de.po | 333 +++++++++++++++++++++++++++++--------------------------- po/dz.po | 333 +++++++++++++++++++++++++++++--------------------------- po/el.po | 333 +++++++++++++++++++++++++++++--------------------------- po/es.po | 333 +++++++++++++++++++++++++++++--------------------------- po/eu.po | 333 +++++++++++++++++++++++++++++--------------------------- po/fi.po | 333 +++++++++++++++++++++++++++++--------------------------- po/fr.po | 333 +++++++++++++++++++++++++++++--------------------------- po/gl.po | 333 +++++++++++++++++++++++++++++--------------------------- po/hu.po | 333 +++++++++++++++++++++++++++++--------------------------- po/it.po | 333 +++++++++++++++++++++++++++++--------------------------- po/ja.po | 333 +++++++++++++++++++++++++++++--------------------------- po/km.po | 333 +++++++++++++++++++++++++++++--------------------------- po/ko.po | 333 +++++++++++++++++++++++++++++--------------------------- po/ku.po | 333 +++++++++++++++++++++++++++++--------------------------- po/lt.po | 333 +++++++++++++++++++++++++++++--------------------------- po/mr.po | 333 +++++++++++++++++++++++++++++--------------------------- po/nb.po | 333 +++++++++++++++++++++++++++++--------------------------- po/ne.po | 333 +++++++++++++++++++++++++++++--------------------------- po/nl.po | 333 +++++++++++++++++++++++++++++--------------------------- po/nn.po | 333 +++++++++++++++++++++++++++++--------------------------- po/pl.po | 333 +++++++++++++++++++++++++++++--------------------------- po/pt.po | 333 +++++++++++++++++++++++++++++--------------------------- po/pt_BR.po | 333 +++++++++++++++++++++++++++++--------------------------- po/ro.po | 333 +++++++++++++++++++++++++++++--------------------------- po/ru.po | 333 +++++++++++++++++++++++++++++--------------------------- po/sk.po | 333 +++++++++++++++++++++++++++++--------------------------- po/sl.po | 333 +++++++++++++++++++++++++++++--------------------------- po/sv.po | 333 +++++++++++++++++++++++++++++--------------------------- po/th.po | 333 +++++++++++++++++++++++++++++--------------------------- po/tl.po | 333 +++++++++++++++++++++++++++++--------------------------- po/uk.po | 333 +++++++++++++++++++++++++++++--------------------------- po/vi.po | 333 +++++++++++++++++++++++++++++--------------------------- po/zh_CN.po | 333 +++++++++++++++++++++++++++++--------------------------- po/zh_TW.po | 333 +++++++++++++++++++++++++++++--------------------------- 43 files changed, 7612 insertions(+), 6709 deletions(-) diff --git a/po/apt-all.pot b/po/apt-all.pot index a19328105..1bfca4088 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt 0.9.8~20130508\n" +"Project-Id-Version: apt 0.9.8.1\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-08 18:12+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -94,72 +94,72 @@ msgstr "" msgid "Package file %s is out of sync." msgstr "" -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1243 msgid "You must give at least one search pattern" msgstr "" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "" -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1526 msgid "Package files:" msgstr "" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1547 msgid "Pinned packages:" msgstr "" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr "" -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr "" -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr "" #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr "" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "" -#: cmdline/apt-cache.cc:1690 +#: cmdline/apt-cache.cc:1730 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -196,20 +196,28 @@ msgid "" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "" -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" @@ -425,7 +433,7 @@ msgstr "" msgid "%s is already the newest version.\n" msgstr "" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "" @@ -532,8 +540,8 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 #, c-format msgid "Couldn't determine free space in %s" msgstr "" @@ -569,7 +577,7 @@ msgstr "" msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -578,7 +586,7 @@ msgstr "" msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "" @@ -654,7 +662,7 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 msgid "The following information may help to resolve the situation:" msgstr "" @@ -699,7 +707,7 @@ msgid "" "solution)." msgstr "" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1973 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" @@ -707,85 +715,85 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1995 +#: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2020 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2184 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2192 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2452 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2514 #, c-format msgid "" "Please use:\n" @@ -793,141 +801,141 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2567 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2605 +#: cmdline/apt-get.cc:2604 #, c-format msgid "You don't have enough free space in %s" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2613 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2618 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2625 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2663 +#: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2694 +#: cmdline/apt-get.cc:2693 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2707 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2729 +#: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2749 +#: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2768 +#: cmdline/apt-get.cc:2767 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2793 +#: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2840 +#: cmdline/apt-get.cc:2839 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:3010 +#: cmdline/apt-get.cc:3009 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "" -#: cmdline/apt-get.cc:3028 +#: cmdline/apt-get.cc:3027 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:3051 +#: cmdline/apt-get.cc:3050 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:3090 +#: cmdline/apt-get.cc:3089 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:3096 +#: cmdline/apt-get.cc:3095 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "" -#: cmdline/apt-get.cc:3119 +#: cmdline/apt-get.cc:3118 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:3135 +#: cmdline/apt-get.cc:3133 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:3140 +#: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, c-format msgid "Changelog for %s (%s)" msgstr "" -#: cmdline/apt-get.cc:3368 +#: cmdline/apt-get.cc:3366 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:3409 +#: cmdline/apt-get.cc:3407 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -973,7 +981,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:3574 +#: cmdline/apt-get.cc:3572 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1041,7 +1049,7 @@ msgid "%s was already not hold.\n" msgstr "" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" @@ -1176,8 +1184,8 @@ msgstr "" msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 +#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 msgid "Read error" msgstr "" @@ -1190,8 +1198,8 @@ msgid "Protocol corruption" msgstr "" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 +#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 msgid "Write error" msgstr "" @@ -1334,28 +1342,36 @@ msgstr "" msgid "Unable to connect to %s:%s:" msgstr "" -#: methods/gpgv.cc:169 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:183 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1436,8 +1452,8 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1466,7 +1482,12 @@ msgstr "" msgid "Can not read mirror file '%s'" msgstr "" -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, c-format +msgid "No entry found in mirror file '%s'" +msgstr "" + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "" @@ -1546,7 +1567,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "" @@ -1856,23 +1877,23 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "" @@ -2089,7 +2110,7 @@ msgstr "" msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1172 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "" @@ -2229,111 +2250,111 @@ msgstr "" msgid "Problem closing the gzip file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:249 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:843 #, c-format msgid "Sub-process %s received signal %u." msgstr "" -#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:984 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Could not open file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1062 #, c-format msgid "Could not open file descriptor %d" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " msgstr "" -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1297 #, c-format msgid "read, still have %llu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1681 #, c-format msgid "Problem closing the file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1693 #, c-format msgid "Problem renaming the file %s to %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1704 #, c-format msgid "Problem unlinking the file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1717 msgid "Problem syncing the file" msgstr "" @@ -2530,19 +2551,19 @@ msgstr "" msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, c-format msgid "Could not configure '%s'. " msgstr "" -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2571,13 +2592,13 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 +#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." msgstr "" -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, c-format msgid "List directory %spartial is missing." msgstr "" @@ -2677,14 +2698,14 @@ msgstr "" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 -#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 -#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 -#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 -#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 -#: apt-pkg/pkgcachegen.cc:561 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "" @@ -2705,26 +2726,26 @@ msgstr "" msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:568 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:1197 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 -#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" msgstr "" -#: apt-pkg/pkgcachegen.cc:1302 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "" @@ -2737,40 +2758,40 @@ msgstr "" msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 msgid "Hash Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2778,32 +2799,32 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "" @@ -2853,7 +2874,7 @@ msgstr "" msgid "Stored label: %s\n" msgstr "" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 msgid "Unmounting CD-ROM...\n" msgstr "" @@ -2911,30 +2932,30 @@ msgstr "" msgid "Copying package lists..." msgstr "" -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/ar.po b/po/ar.po index 5af611f2a..f77c14a2b 100644 --- a/po/ar.po +++ b/po/ar.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2006-10-20 21:28+0300\n" "Last-Translator: Ossama M. Khayat \n" "Language-Team: Arabic \n" @@ -100,73 +100,73 @@ msgstr "مجموع المساحة المحسوب حسابها:" msgid "Package file %s is out of sync." msgstr "" -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "لم يُعثر على أية حزم" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1243 #, fuzzy msgid "You must give at least one search pattern" msgstr "يجب أن تعطي صيغة واحدة بالضبط" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "تعذر العثور على الحزمة %s" -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1526 msgid "Package files:" msgstr "ملفات الحزم:" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1547 msgid "Pinned packages:" msgstr "الحزم المُدبّسة:" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "(غير موجود)" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr " مُثبّت:" -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr " مرشّح: " -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "(لاشيء)" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr "" #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr " جدول النسخ:" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s لـ%s %s مُجمّع على %s %s\n" -#: cmdline/apt-cache.cc:1690 +#: cmdline/apt-cache.cc:1730 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -203,21 +203,29 @@ msgid "" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 #, fuzzy msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "الرجاء كتابة اسم لهذا القرص، مثال 'Debian 2.1r1 Disk 1'" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" msgstr "الرجاء إدخال قرص في السواقة وضغط الزر enter" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "فشل تغيير اسم %s إلى %s" -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "كرر هذه العملية لباقي الأقراص المدمجة في المجموعة." @@ -435,7 +443,7 @@ msgstr "إعادة تثبيت %s غير ممكنة، حيث أنّه لا يم msgid "%s is already the newest version.\n" msgstr "%s هي النسخة الأحدث.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "إلا أنه سيتم تثبيت %s" @@ -542,8 +550,8 @@ msgstr "بعد الاستخراج %sب من المساحة الإضافيّة س msgid "After this operation, %sB disk space will be freed.\n" msgstr "بعد الاستخراج %sب من المساحة ستفرّغ.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 #, c-format msgid "Couldn't determine free space in %s" msgstr "تعذر حساب المساحة الحرة في %s" @@ -582,7 +590,7 @@ msgstr "إجهاض." msgid "Do you want to continue [Y/n]? " msgstr "هل تريد الاستمرار [Y/n]؟" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" msgstr "فشل إحضار %s %s\n" @@ -591,7 +599,7 @@ msgstr "فشل إحضار %s %s\n" msgid "Some files failed to download" msgstr "فشل تنزيل بعض الملفات" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "اكتمل التنزيل وفي وضع التنزيل فقط" @@ -669,7 +677,7 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 msgid "The following information may help to resolve the situation:" msgstr "قد تساعد المعلومات التالية في حل المشكلة:" @@ -717,7 +725,7 @@ msgid "" msgstr "" "مُعتمدات غير مستوفاة. جرب 'apt-get -f install' بدون أسماء حزم (أو حدّد حلاً)." -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1973 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" @@ -725,85 +733,85 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1995 +#: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "حزم معطوبة" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2020 msgid "The following extra packages will be installed:" msgstr "سيتم تثبيت الحزم الإضافيّة التالية:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "الحزم المقترحة:" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "الحزم المستحسنة:" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "تعذر العثور على الحزمة %s" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "إلا أنه سيتم تثبيت %s" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2184 msgid "Calculating upgrade... " msgstr "حساب الترقية..." -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "فشل" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2192 msgid "Done" msgstr "تمّ" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "تعذر قَفْل دليل التنزيل" -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2452 msgid "Must specify at least one package to fetch source for" msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها" -#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, c-format msgid "Unable to find a source package for %s" msgstr "تعذر العثور على مصدر الحزمة %s" -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2514 #, c-format msgid "" "Please use:\n" @@ -811,141 +819,141 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2567 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "تخطي الملف '%s' المنزل مسبقاً\n" -#: cmdline/apt-get.cc:2605 +#: cmdline/apt-get.cc:2604 #, c-format msgid "You don't have enough free space in %s" msgstr "ليس هناك مساحة كافية في %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2613 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "يجب جلب %sب/%sب من الأرشيفات المصدرية.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2618 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "يجب جلب %sب من الأرشيفات المصدريّة.\n" -#: cmdline/apt-get.cc:2625 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" msgstr "إحضار المصدر %s\n" -#: cmdline/apt-get.cc:2663 +#: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "فشل إحضار بعض الأرشيفات." -#: cmdline/apt-get.cc:2694 +#: cmdline/apt-get.cc:2693 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "أمر فك الحزمة '%s' فشل.\n" -#: cmdline/apt-get.cc:2707 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2729 +#: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "أمر البناء '%s' فشل.\n" -#: cmdline/apt-get.cc:2749 +#: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2768 +#: cmdline/apt-get.cc:2767 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2793 +#: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2840 +#: cmdline/apt-get.cc:2839 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:3010 +#: cmdline/apt-get.cc:3009 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "" -#: cmdline/apt-get.cc:3028 +#: cmdline/apt-get.cc:3027 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:3051 +#: cmdline/apt-get.cc:3050 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:3090 +#: cmdline/apt-get.cc:3089 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:3096 +#: cmdline/apt-get.cc:3095 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "" -#: cmdline/apt-get.cc:3119 +#: cmdline/apt-get.cc:3118 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:3135 +#: cmdline/apt-get.cc:3133 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:3140 +#: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "الاتصال بـ%s (%s)" -#: cmdline/apt-get.cc:3368 +#: cmdline/apt-get.cc:3366 msgid "Supported modules:" msgstr "الوحدات المدعومة:" -#: cmdline/apt-get.cc:3409 +#: cmdline/apt-get.cc:3407 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -991,7 +999,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:3574 +#: cmdline/apt-get.cc:3572 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1062,7 +1070,7 @@ msgid "%s was already not hold.\n" msgstr "%s هي النسخة الأحدث.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" @@ -1201,8 +1209,8 @@ msgstr "انتهى وقت الاتصال" msgid "Server closed the connection" msgstr "أغلق الخادم الاتصال" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 +#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 msgid "Read error" msgstr "خطأ في القراءة" @@ -1215,8 +1223,8 @@ msgid "Protocol corruption" msgstr "" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 +#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 msgid "Write error" msgstr "خطأ في الكتابة" @@ -1359,28 +1367,36 @@ msgstr "" msgid "Unable to connect to %s:%s:" msgstr "تعذر الاتصال بـ%s %s:" -#: methods/gpgv.cc:169 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:183 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1461,8 +1477,8 @@ msgstr "خطأ داخلي" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1491,7 +1507,12 @@ msgstr "" msgid "Can not read mirror file '%s'" msgstr "فشل إغلاق الملف %s" -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "فشل إغلاق الملف %s" + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "" @@ -1573,7 +1594,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "تعذرت الكتابة إلى %s" @@ -1883,23 +1904,23 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "فشل تنفيذ gzip" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "أرشيف فاسد" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "فشل تحقّق Checksum لملف Tar، الأرشيف فاسد" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "" @@ -2119,7 +2140,7 @@ msgstr "" msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1172 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "تعذر العثور على التحديد %s" @@ -2259,111 +2280,111 @@ msgstr "" msgid "Problem closing the gzip file %s" msgstr "مشكلة في إغلاق الملف" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:249 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:843 #, c-format msgid "Sub-process %s received signal %u." msgstr "" -#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:984 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Could not open file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1062 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "فشل إغلاق الملف %s" -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " msgstr "" -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1297 #, c-format msgid "read, still have %llu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1681 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "مشكلة في إغلاق الملف" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1693 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "مشكلة في مزامنة الملف" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1704 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "مشكلة في إغلاق الملف" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1717 msgid "Problem syncing the file" msgstr "مشكلة في مزامنة الملف" @@ -2561,19 +2582,19 @@ msgstr "" msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "فشل إغلاق الملف %s" -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2602,13 +2623,13 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 +#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." msgstr "" -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, c-format msgid "List directory %spartial is missing." msgstr "" @@ -2708,14 +2729,14 @@ msgstr "" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 -#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 -#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 -#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 -#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 -#: apt-pkg/pkgcachegen.cc:561 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "حدث خطأ أثناء معالجة %s (NewVersion1)" @@ -2736,26 +2757,26 @@ msgstr "" msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:568 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:1197 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 -#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" msgstr "قراءة قوائم الحزم" -#: apt-pkg/pkgcachegen.cc:1302 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "" @@ -2768,41 +2789,41 @@ msgstr "فشل إعادة التسمية ، %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "MD5Sum غير متطابقة" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 #, fuzzy msgid "Hash Sum mismatch" msgstr "MD5Sum غير متطابقة" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "تعذر فتح ملف قاعدة البيانات %s: %s" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2810,32 +2831,32 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "الحجم غير متطابق" @@ -2885,7 +2906,7 @@ msgstr "جاري التعرف..." msgid "Stored label: %s\n" msgstr "" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "فك تركيب القرص المدمج..." @@ -2946,30 +2967,30 @@ msgstr "" msgid "Copying package lists..." msgstr "نسخ قوائم الحزم..." -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "كتابة لائحة المصادر الجديدة\n" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/ast.po b/po/ast.po index 951b91fd2..b0cd998e4 100644 --- a/po/ast.po +++ b/po/ast.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.18\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2010-10-02 23:35+0100\n" "Last-Translator: Iñigo Varela \n" "Language-Team: Asturian (ast)\n" @@ -93,73 +93,73 @@ msgstr "Informe del total d'espaciu: " msgid "Package file %s is out of sync." msgstr "El ficheru de paquetes %s nun ta sincronizáu." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Nun s'alcontraron paquetes" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1243 msgid "You must give at least one search pattern" msgstr "Has de dar polo menos un patrón de gueta" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Nun pue alcontrase'l paquete %s" -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1526 msgid "Package files:" msgstr "Ficheros de paquete:" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 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" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1547 msgid "Pinned packages:" msgstr "Paquetes na chincheta:" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "(nun s'alcontró)" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr " Instaláu: " -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr " Candidatu: " -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "(dengún)" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr " Chincheta de paquetes: " #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr " Tabla de versiones:" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s pa %s compiláu en %s %s\n" -#: cmdline/apt-cache.cc:1690 +#: cmdline/apt-cache.cc:1730 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -235,20 +235,28 @@ msgstr "" "tmp\n" "Ver les páxines del manual apt-cache(8) y apt.conf(5) pa más información.\n" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Da-y un nome a esti discu, como 'Debian 5.0.3 Discu 1'" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" msgstr "Inxerta un discu nel preséu y calca intro" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Falló al montar '%s' a '%s'" -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Repite'l procesu colos demás CDs del conxuntu." @@ -481,7 +489,7 @@ msgstr "La reinstalación de %s nun ye dable, nun pue descargase.\n" msgid "%s is already the newest version.\n" msgstr "%s yá ta na versión más nueva.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s axustáu como instaláu manualmente.\n" @@ -588,8 +596,8 @@ msgstr "Tres d'esta operación, van usase %sB d'espaciu de discu adicional.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Tres d'esta operación, van lliberase %sB d'espaciu de discu.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nun pue determinase l'espaciu llibre de %s" @@ -628,7 +636,7 @@ msgstr "Encaboxar." msgid "Do you want to continue [Y/n]? " msgstr "¿Quies continuar [S/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falló algamar %s %s\n" @@ -637,7 +645,7 @@ msgstr "Falló algamar %s %s\n" msgid "Some files failed to download" msgstr "Dellos ficheros nun pudieron descargase" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "Descarga completa y en mou de sólo descarga" @@ -721,7 +729,7 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 msgid "The following information may help to resolve the situation:" msgstr "La siguiente información pue aidar a resolver la situación:" @@ -772,7 +780,7 @@ msgstr "" "Dependencies ensin cubrir. Tenta 'apt-get -f install' ensin paquetes (o " "conseña una solución)." -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1973 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" @@ -784,78 +792,78 @@ msgstr "" "inestable, que dellos paquetes necesarios nun se crearon o que\n" "s'allugaron fuera d'Incoming." -#: cmdline/apt-get.cc:1995 +#: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "Paquetes frañaos" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2020 msgid "The following extra packages will be installed:" msgstr "Instalaránse los siguientes paquetes extra:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "Paquetes afalaos:" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "Paquetes encamentaos" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "Nun pudo alcontrase'l paquete %s" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s axustáu como instaláu automáticamente.\n" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2184 msgid "Calculating upgrade... " msgstr "Calculando l'anovamientu... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Falló" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2192 msgid "Done" msgstr "Fecho" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 msgid "Internal error, problem resolver broke stuff" msgstr "Error internu, l'iguador de problemes frañó coses" -#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "Nun pue bloquiase'l direutoriu de descarga" -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2452 msgid "Must specify at least one package to fetch source for" msgstr "Has de conseñar polo menos un paquete p'algamar so fonte" -#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, c-format msgid "Unable to find a source package for %s" msgstr "Nun pudo alcontrase un paquete fonte pa %s" -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -864,7 +872,7 @@ msgstr "" "AVISU: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2514 #, fuzzy, c-format msgid "" "Please use:\n" @@ -876,87 +884,87 @@ msgstr "" "pa baxar los caberos anovamientos (posiblemente tovía nun sacaos) pal " "paquete.\n" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2567 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Saltando'l ficheru yá descargáu '%s'\n" -#: cmdline/apt-get.cc:2605 +#: cmdline/apt-get.cc:2604 #, c-format msgid "You don't have enough free space in %s" msgstr "Nun hai espaciu llibre bastante en %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2613 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Hai falta descargar %sB/%sB d'archivos fonte.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2618 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Hai falta descargar %sB d'archivos fonte.\n" -#: cmdline/apt-get.cc:2625 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" msgstr "Fonte descargada %s\n" -#: cmdline/apt-get.cc:2663 +#: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "Falló la descarga de dellos archivos." -#: cmdline/apt-get.cc:2694 +#: cmdline/apt-get.cc:2693 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Saltando'l desempaquetáu de la fonte yá desempaquetada en %s\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Falló la orde de desempaquetáu '%s'.\n" -#: cmdline/apt-get.cc:2707 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instaláu.\n" -#: cmdline/apt-get.cc:2729 +#: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "Falló la orde build '%s'.\n" -#: cmdline/apt-get.cc:2749 +#: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "Falló el procesu fíu" -#: cmdline/apt-get.cc:2768 +#: cmdline/apt-get.cc:2767 msgid "Must specify at least one package to check builddeps for" msgstr "" "Hai que conseñar polo menos un paquete pa verificar les dependencies de " "construcción" -#: cmdline/apt-get.cc:2793 +#: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nun pudo algamase información de dependencies de construcción pa %s" -#: cmdline/apt-get.cc:2840 +#: cmdline/apt-get.cc:2839 #, c-format msgid "%s has no build depends.\n" msgstr "%s nun tien dependencies de construcción.\n" -#: cmdline/apt-get.cc:3010 +#: cmdline/apt-get.cc:3009 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -965,7 +973,7 @@ msgstr "" "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el " "paquete %s" -#: cmdline/apt-get.cc:3028 +#: cmdline/apt-get.cc:3027 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -974,14 +982,14 @@ msgstr "" "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el " "paquete %s" -#: cmdline/apt-get.cc:3051 +#: cmdline/apt-get.cc:3050 #, 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 instaláu %s ye " "enforma nuevu" -#: cmdline/apt-get.cc:3090 +#: cmdline/apt-get.cc:3089 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -990,7 +998,7 @@ msgstr "" "La dependencia %s en %s nun puede satisfacese porque denguna versión " "disponible del paquete %s satisfaz los requisitos de versión" -#: cmdline/apt-get.cc:3096 +#: cmdline/apt-get.cc:3095 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -999,30 +1007,30 @@ msgstr "" "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el " "paquete %s" -#: cmdline/apt-get.cc:3119 +#: cmdline/apt-get.cc:3118 #, 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:3135 +#: cmdline/apt-get.cc:3133 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Les dependencies de construcción de %s nun pudieron satisfacese." -#: cmdline/apt-get.cc:3140 +#: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "Fallu al procesar les dependencies de construcción" -#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Coneutando a %s (%s)" -#: cmdline/apt-get.cc:3368 +#: cmdline/apt-get.cc:3366 msgid "Supported modules:" msgstr "Módulos sofitaos:" -#: cmdline/apt-get.cc:3409 +#: cmdline/apt-get.cc:3407 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1113,7 +1121,7 @@ msgstr "" "pa más información y opciones.\n" " Esti APT tien Poderes de Super Vaca.\n" -#: cmdline/apt-get.cc:3574 +#: cmdline/apt-get.cc:3572 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1189,7 +1197,7 @@ msgid "%s was already not hold.\n" msgstr "%s yá ta na versión más nueva.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" @@ -1328,8 +1336,8 @@ msgstr "Gandió'l tiempu de conexón" msgid "Server closed the connection" msgstr "El sirvidor zarró la conexón" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 +#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 msgid "Read error" msgstr "Fallu de llectura" @@ -1342,8 +1350,8 @@ msgid "Protocol corruption" msgstr "Corrupción del protocolu" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 +#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 msgid "Write error" msgstr "Fallu d'escritura" @@ -1486,29 +1494,37 @@ msgstr "Daqué raro asocedió resolviendo '%s:%s' (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Nun pudo coneutase a %s:%s:" -#: methods/gpgv.cc:169 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Fallu internu: Robla bona, pero nun se pudo determinar la so buelga dixital?!" -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Atopóse polo menos una robla mala." -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Nun pudo executase 'gpgv' pa verificar la robla (¿ta instaláu gpgv?)" -#: methods/gpgv.cc:183 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Fallu desconocíu al executar gpgv" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Les siguientes robles nun valieron:\n" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1591,8 +1607,8 @@ msgstr "Fallu internu" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1621,7 +1637,12 @@ msgstr "Nun s'alcontró ficheru espeyu '%s'" msgid "Can not read mirror file '%s'" msgstr "Nun s'alcontró ficheru espeyu '%s'" -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "Nun s'alcontró ficheru espeyu '%s'" + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "[Espeyu: %s]" @@ -1721,7 +1742,7 @@ msgstr "" "-o=? Afita una opción de configuración arbitraria, p. ej. -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Nun se pue escribir en %s" @@ -2095,23 +2116,23 @@ msgstr "" "-o=? Afita una opción de configuración arbitraria, p. ej. -o dir::\n" "cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "Fallu al crear les tuberíes" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "Fallu al executar gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "Ficheru tollíu" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "Falló la suma de control de tar, ficheru tollíu" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Testera del TAR triba %u desconocida, miembru %s" @@ -2333,7 +2354,7 @@ msgstr "%limin %lis" msgid "%lis" msgstr "%lis" -#: apt-pkg/contrib/strutl.cc:1172 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "Escoyeta %s que nun s'atopa" @@ -2476,111 +2497,111 @@ msgstr "Nun se pudo montar el CD-ROM" msgid "Problem closing the gzip file %s" msgstr "Problemes zarrando'l ficheru gzip %s" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Nun ta usándose bloquéu pal ficheru de bloquéu de sólo llectura %s" -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "Nun puede abrise'l ficheru de bloquéu %s" -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:249 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Nun ta usándose bloquéu pal ficheru de bloquéu %s montáu per nfs" -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "Nun se pudo torgar %s" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "El subprocesu %s recibió un fallu de segmentación." -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:843 #, c-format msgid "Sub-process %s received signal %u." msgstr "El subprocesu %s recibió una señal %u." -#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "El subprocesu %s devolvió un códigu d'error (%u)" -#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "El subprocesu %s terminó de manera inesperada" -#: apt-pkg/contrib/fileutl.cc:984 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Could not open file %s" msgstr "Nun se pudo abrir el ficheru %s" -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1062 #, c-format msgid "Could not open file descriptor %d" msgstr "Nun pudo abrise un ficheru descriptor %d" -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "Nun pudo criase'l soprocesu IPC" -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " msgstr "Nun pudo executase'l compresor " -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1297 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "lleíos, entá tenía de lleer %lu pero nun queda nada" -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "escritos, entá tenía d'escribir %lu pero nun pudo facerse" -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1681 #, c-format msgid "Problem closing the file %s" msgstr "Problemes zarrando'l ficheru %s" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1693 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Hai problemes al renomar el ficheru %s a %s" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1704 #, c-format msgid "Problem unlinking the file %s" msgstr "Hai problemes desvenceyando'l ficheru %s" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1717 msgid "Problem syncing the file" msgstr "Hai problemes al sincronizar el ficheru" @@ -2781,7 +2802,7 @@ msgstr "Llinia %u mal formada na llista d'oríxenes %s (triba)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Triba '%s' desconocida na llinia %u de la llista d'oríxenes %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2790,12 +2811,12 @@ msgstr "" "Nun pudó facese la configuración inmediatamente en '%s'. Por favor, mira man " "5 apt.conf embaxo APT::Immediate-Configure for details. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Nun pudo abrise'l ficheru '%s'" -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2830,7 +2851,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Nun pueden iguase los problemes; tienes paquetes frañaos reteníos." -#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 +#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2839,7 +2860,7 @@ msgstr "" "Nun pudieron descargase dellos ficheros d'índiz; inoráronse o usáronse los " "antiguos nel so llugar." -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, c-format msgid "List directory %spartial is missing." msgstr "Falta'l direutoriu de llistes %spartial." @@ -2941,14 +2962,14 @@ msgstr "La caché tien un sistema de versiones incompatible" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 -#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 -#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 -#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 -#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 -#: apt-pkg/pkgcachegen.cc:561 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Hebo un error al procesar %s (FindPkg)" @@ -2970,26 +2991,26 @@ msgstr "Coime, perpasaste'l númberu de descripciones qu'esti APT ye a remanar." msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Vaya, perpasaste'l númberu de dependencies coles que puede esti APT." -#: apt-pkg/pkgcachegen.cc:568 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Al procesar dependencies de ficheros nun s'alcontró el paquete %s %s" -#: apt-pkg/pkgcachegen.cc:1197 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nun se puede lleer la llista de paquetes d'oríxenes %s" -#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 -#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" msgstr "Lleendo llista de paquetes" -#: apt-pkg/pkgcachegen.cc:1302 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "Recoyendo ficheros qu'apurren" -#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "Fallu de E/S al grabar caché d'oríxenes" @@ -3002,40 +3023,40 @@ msgstr "falló'l cambiu de nome, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "La suma MD5 nun concasa" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 msgid "Hash Sum mismatch" msgstr "La suma hash nun concasa" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nun se pudo parchear el ficheru release %s" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "Nun hai clave pública denguna disponible pa les IDs de clave darréu:\n" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Conflictu de distribución: %s (esperábase %s pero obtúvose %s)" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3045,12 +3066,12 @@ msgstr "" "anováu y va usase un ficheru índiz. Fallu GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "Fallu GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3059,7 +3080,7 @@ msgstr "" "Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que " "necesites iguar manualmente esti paquete (por faltar una arquitectura)" -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3068,7 +3089,7 @@ msgstr "" "Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que " "necesites iguar manualmente esti paquete" -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3076,7 +3097,7 @@ msgstr "" "Los ficheros d'indiz de paquetes tan corrompíos. Nun hai campu Filename: pal " "paquete %s." -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "El tamañu nun concasa" @@ -3128,7 +3149,7 @@ msgstr "Identificando.. " msgid "Stored label: %s\n" msgstr "Etiqueta guardada: %s\n" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 msgid "Unmounting CD-ROM...\n" msgstr "Desmontando l CD-ROM...\n" @@ -3192,30 +3213,30 @@ msgstr "" msgid "Copying package lists..." msgstr "Copiando les llistes de paquetes..." -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "Escribiendo llista nueva d'oríxenes\n" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "Les entraes de la llista d'oríxenes pa esti discu son:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "%i rexistros escritos.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i rexistros escritos con %i ficheros de menos.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i rexistros escritos con %i ficheros mal empareyaos\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/bg.po b/po/bg.po index a5a07ac47..f4106df3b 100644 --- a/po/bg.po +++ b/po/bg.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.21\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2012-06-25 17:23+0300\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -99,73 +99,73 @@ msgstr "Общо отчетено пространство: " msgid "Package file %s is out of sync." msgstr "Пакетният файл %s не е синхронизиран." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Няма намерени пакети" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1243 msgid "You must give at least one search pattern" msgstr "Трябва да въведете поне един шаблон за търсене" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "Тази командата е остаряла. Използвайте „apt-mark showauto“ вместо нея." -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Пакетът %s не може да бъде намерен" -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1526 msgid "Package files:" msgstr "Пакетни файлове:" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Кешът не е синхронизиран, не може да се изпълни „x-ref“ на пакетен файл" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1547 msgid "Pinned packages:" msgstr "Отбити пакети:" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "(не са намерени)" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr " Инсталирана: " -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr " Кандидат: " -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "(няма)" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr " Отбиване на пакета: " #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr " Таблица с версиите:" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s за %s компилиран на %s %s\n" -#: cmdline/apt-cache.cc:1690 +#: cmdline/apt-cache.cc:1730 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -236,20 +236,28 @@ msgstr "" "cache=/tmp\n" "За повече информация вижте наръчниците apt-cache(8) и apt.conf(5).\n" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Укажете име за този диск, например „Debian 5.0.3 Disk1“" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" msgstr "Сложете диск в устройството и натиснете „Enter“" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Неуспех при монтиране на %s на %s" -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Повторете този процес за останалите дискове от комплекта." @@ -486,7 +494,7 @@ msgstr "Преинсталацията на %s не е възможна, не м msgid "%s is already the newest version.\n" msgstr "%s вече е най-новата версия.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s е отбелязан като ръчно инсталиран.\n" @@ -598,8 +606,8 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "След тази операция ще бъде освободено %sB дисково пространство.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 #, c-format msgid "Couldn't determine free space in %s" msgstr "Неуспех при определянето на свободното пространство в %s" @@ -638,7 +646,7 @@ msgstr "Прекъсване." msgid "Do you want to continue [Y/n]? " msgstr "Искате ли да продължите [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Неуспех при изтеглянето на %s %s\n" @@ -647,7 +655,7 @@ msgstr "Неуспех при изтеглянето на %s %s\n" msgid "Some files failed to download" msgstr "Някои файлове не можаха да бъдат изтеглени" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "Изтеглянето завърши в режим само на изтегляне" @@ -731,7 +739,7 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 msgid "The following information may help to resolve the situation:" msgstr "" "Следната информация може да помогне за намиране на изход от ситуацията:" @@ -781,7 +789,7 @@ msgstr "" "Неудовлетворени зависимости. Опитайте „apt-get -f install“ без пакети (или " "укажете разрешение)." -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1973 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" @@ -793,33 +801,33 @@ msgstr "" "дистрибуция, че някои необходими пакети още не са създадени или пък\n" "са били преместени от Incoming." -#: cmdline/apt-get.cc:1995 +#: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "Счупени пакети" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2020 msgid "The following extra packages will be installed:" msgstr "Следните допълнителни пакети ще бъдат инсталирани:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "Предложени пакети:" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "Препоръчвани пакети:" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "Неуспех при намирането на пакет %s" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s е отбелязан като автоматично инсталиран.\n" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -827,46 +835,46 @@ msgstr "" "Тази команда е остаряла. Вместо нея използвайте „apt-mark auto“ и „apt-mark " "manual“." -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2184 msgid "Calculating upgrade... " msgstr "Изчисляване на актуализацията..." -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Неуспех" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2192 msgid "Done" msgstr "Готово" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 msgid "Internal error, problem resolver broke stuff" msgstr "Вътрешна грешка, „problem resolver“ счупи нещо в системата" -#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "Неуспех при заключването на директорията за изтегляне" -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Не е открит източник, от който да се изтегли версия „%s“ на „%s“" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "Изтегляне на %s %s" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2452 msgid "Must specify at least one package to fetch source for" msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код" -#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, c-format msgid "Unable to find a source package for %s" msgstr "Неуспех при намирането на изходен код на пакет %s" -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -876,7 +884,7 @@ msgstr "" "адрес:\n" "%s\n" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2514 #, c-format msgid "" "Please use:\n" @@ -888,70 +896,70 @@ msgstr "" "за да изтеглите последните промени в пакета (евентуално в процес на " "разработка).\n" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2567 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускане на вече изтегления файл „%s“\n" -#: cmdline/apt-get.cc:2605 +#: cmdline/apt-get.cc:2604 #, c-format msgid "You don't have enough free space in %s" msgstr "Нямате достатъчно свободно пространство в %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2613 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необходимо е да се изтеглят %sB/%sB архиви изходен код.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2618 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Необходимо е да се изтеглят %sB архиви изходен код.\n" -#: cmdline/apt-get.cc:2625 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" msgstr "Изтегляне на изходен код %s\n" -#: cmdline/apt-get.cc:2663 +#: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "Неуспех при изтеглянето на някои архиви." -#: cmdline/apt-get.cc:2694 +#: cmdline/apt-get.cc:2693 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Пропускане на разпакетирането на вече разпакетирания изходен код в %s\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Командата за разпакетиране „%s“ пропадна.\n" -#: cmdline/apt-get.cc:2707 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n" -#: cmdline/apt-get.cc:2729 +#: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "Командата за компилиране „%s“ пропадна.\n" -#: cmdline/apt-get.cc:2749 +#: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "Процесът-потомък пропадна" -#: cmdline/apt-get.cc:2768 +#: cmdline/apt-get.cc:2767 msgid "Must specify at least one package to check builddeps for" msgstr "" "Трябва да укажете поне един пакет за проверка на зависимости за компилиране" -#: cmdline/apt-get.cc:2793 +#: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -960,18 +968,18 @@ msgstr "" "Липсва информация за архитектурата %s. Прегледайте информацията за APT::" "Architectures в apt.conf(5)." -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Неуспех при получаването на информация за зависимостите за компилиране на %s" -#: cmdline/apt-get.cc:2840 +#: cmdline/apt-get.cc:2839 #, c-format msgid "%s has no build depends.\n" msgstr "%s няма зависимости за компилиране.\n" -#: cmdline/apt-get.cc:3010 +#: cmdline/apt-get.cc:3009 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -980,7 +988,7 @@ msgstr "" "Зависимост %s за пакета %s не може да бъде удовлетворена, %s не се позволява " "за пакети „%s“" -#: cmdline/apt-get.cc:3028 +#: cmdline/apt-get.cc:3027 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -989,14 +997,14 @@ msgstr "" "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s " "не може да бъде намерен" -#: cmdline/apt-get.cc:3051 +#: cmdline/apt-get.cc:3050 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Неуспех при удовлетворяването на зависимост %s за пакета %s: Инсталираният " "пакет %s е твърде нов" -#: cmdline/apt-get.cc:3090 +#: cmdline/apt-get.cc:3089 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1005,7 +1013,7 @@ msgstr "" "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже версията " "кандидат на пакета %s не може да удовлетвори изискването за версия" -#: cmdline/apt-get.cc:3096 +#: cmdline/apt-get.cc:3095 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1014,30 +1022,30 @@ msgstr "" "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s " "няма подходящи версии" -#: cmdline/apt-get.cc:3119 +#: cmdline/apt-get.cc:3118 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Неуспех при удовлетворяването на зависимост %s за пакета %s: %s" -#: cmdline/apt-get.cc:3135 +#: cmdline/apt-get.cc:3133 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Зависимостите за компилиране на %s не можаха да бъдат удовлетворени." -#: cmdline/apt-get.cc:3140 +#: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "Неуспех при обработката на зависимостите за компилиране" -#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, c-format msgid "Changelog for %s (%s)" msgstr "Журнал на промените в %s (%s)" -#: cmdline/apt-get.cc:3368 +#: cmdline/apt-get.cc:3366 msgid "Supported modules:" msgstr "Поддържани модули:" -#: cmdline/apt-get.cc:3409 +#: cmdline/apt-get.cc:3407 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1127,7 +1135,7 @@ msgstr "" "информация и опции.\n" " Това APT има Върховни Сили.\n" -#: cmdline/apt-get.cc:3574 +#: cmdline/apt-get.cc:3572 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1202,7 +1210,7 @@ msgid "%s was already not hold.\n" msgstr "Пакетът „%s“ вече е задържан.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" @@ -1360,8 +1368,8 @@ msgstr "Допустимото време за свързването изтеч msgid "Server closed the connection" msgstr "Сървърът разпадна връзката" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 +#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 msgid "Read error" msgstr "Грешка при четене" @@ -1374,8 +1382,8 @@ msgid "Protocol corruption" msgstr "Развален протокол" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 +#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 msgid "Write error" msgstr "Грешка при запис" @@ -1520,32 +1528,40 @@ msgstr "Нещо лошо се случи при намирането на IP а msgid "Unable to connect to %s:%s:" msgstr "Неуспех при свързване с %s:%s:" -#: methods/gpgv.cc:169 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Вътрешна грешка: Валиден подпис, но не може да се провери отпечатъка на " "ключа?!" -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Намерен е поне един невалиден подпис." -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Неуспех при изпълнение на „gpgv“ за проверка на подписа (инсталиран ли е " "gpgv?)" -#: methods/gpgv.cc:183 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Неизвестна грешка при изпълнението на gpgv" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Следните подписи са невалидни:\n" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1628,8 +1644,8 @@ msgstr "Вътрешна грешка" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1658,7 +1674,12 @@ msgstr "Файлът „%s“ на огледалния сървър не е н msgid "Can not read mirror file '%s'" msgstr "Грешка при четене файла „%s“ от огледалния сървър" -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "Грешка при четене файла „%s“ от огледалния сървър" + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "[Огледален сървър: %s]" @@ -1756,7 +1777,7 @@ msgstr "" " -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Неуспех при записа на %s" @@ -2132,23 +2153,23 @@ msgstr "" " -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/" "tmp\n" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "Неуспех при създаването на програмни канали" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "Неуспех при изпълнението на gzip" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "Развален архив" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "Невярна контролна сума на tar, развален архив" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Непозната заглавна част на TAR тип %u, елемент %s" @@ -2371,7 +2392,7 @@ msgstr "%liм %liс" msgid "%lis" msgstr "%liс" -#: apt-pkg/contrib/strutl.cc:1172 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "Изборът %s не е намерен" @@ -2514,115 +2535,115 @@ msgstr "Неуспех при намирането на атрибутите н msgid "Problem closing the gzip file %s" msgstr "Проблем при затваряне на компресираният файл %s (gzip)" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Не се използва заключване за файл за заключване %s, който е само за четене" -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "Неуспех при отварянето на файл за заключване %s" -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:249 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Не се използва заключване за файл за заключване %s, който е монтиран по NFS" -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "Неуспех при достъпа до заключване %s" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "Не може да се създаде списък от файлове, защото „%s“ не е директория" -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "Пропускане на „%s“ в директорията „%s“, понеже не е обикновен файл" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "Пропускане на файла „%s“ в директорията „%s“, понеже няма разширение" -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" "Пропускане на файла „%s“ в директорията „%s“, понеже разширението му е грешно" -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Нарушение на защитата на паметта (segmentation fault) в подпроцеса %s." -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:843 #, c-format msgid "Sub-process %s received signal %u." msgstr "Под-процесът %s получи сигнал %u." -#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Подпроцесът %s върна код за грешка (%u)" -#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Подпроцесът %s завърши неочаквано" -#: apt-pkg/contrib/fileutl.cc:984 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Could not open file %s" msgstr "Неуспех при отварянето на файла %s" -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1062 #, c-format msgid "Could not open file descriptor %d" msgstr "Неуспех при отварянето на файлов манипулатор %d" -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "Неуспех при създаването на подпроцес IPC" -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " msgstr "Неуспех при изпълнението на компресиращата програма " -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1297 #, c-format msgid "read, still have %llu to read but none left" msgstr "" "грешка при четене, все още има %llu за четене, но няма нито един останал" -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "грешка при запис, все още име %llu за запис, но не успя" -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1681 #, c-format msgid "Problem closing the file %s" msgstr "Проблем при затваряне на файла %s" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1693 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Проблем при преименуване на файла %s на %s" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1704 #, c-format msgid "Problem unlinking the file %s" msgstr "Проблем при изтриване на файла %s" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1717 msgid "Problem syncing the file" msgstr "Проблем при синхронизиране на файла" @@ -2826,7 +2847,7 @@ msgstr "Лошо форматиран ред %u в списъка с източ msgid "Type '%s' is not known on line %u in source list %s" msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен." -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2835,12 +2856,12 @@ msgstr "" "Неуспех при незабавната настройка на „%s“. За повече информация вижте " "информацията за APT::Immediate-Configure в „man 5 apt.conf“. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, c-format msgid "Could not configure '%s'. " msgstr "Неуспех при конфигуриране на „%s“. " -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2878,7 +2899,7 @@ msgid "Unable to correct problems, you have held broken packages." msgstr "" "Неуспех при коригирането на проблемите, имате задържани счупени пакети." -#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 +#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2886,7 +2907,7 @@ msgstr "" "Някои индексни файлове не можаха да бъдат изтеглени. Те са пренебрегнати или " "са използвани по-стари." -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, c-format msgid "List directory %spartial is missing." msgstr "Директорията със списъци %spartial липсва." @@ -2991,14 +3012,14 @@ msgstr "Кешът има несъвместима система за верс #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 -#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 -#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 -#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 -#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 -#: apt-pkg/pkgcachegen.cc:561 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Възникна грешка при обработката на %s (%s%d)" @@ -3023,27 +3044,27 @@ msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Еха, надхвърлихте броя зависимости, на който е способна тази версия на APT." -#: apt-pkg/pkgcachegen.cc:568 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Пакетът %s %s не беше открит при обработката на файла със зависимости" -#: apt-pkg/pkgcachegen.cc:1197 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "" "Неуспех при получаването на атрибути на списъка с пакети с изходен код %s" -#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 -#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" msgstr "Четене на списъците с пакети" -#: apt-pkg/pkgcachegen.cc:1302 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "Събиране на информация за „Осигурява“" -#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "Входно/изходна грешка при запазването на кеша на пакети с изходен код" @@ -3056,12 +3077,12 @@ msgstr "преименуването се провали, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "Несъответствие на контролна сума MD5" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 msgid "Hash Sum mismatch" msgstr "Несъответствие на контролната сума" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3070,16 +3091,16 @@ msgstr "" "Не може да се открие елемент „%s“ във файла Release (объркан ред в sources." "list или повреден файл)" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Не е открита контролна сума за „%s“ във файла Release" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3088,12 +3109,12 @@ msgstr "" "Файлът със служебна информация за „%s“ е остарял (валиден до %s). Няма да се " "прилагат обновявания от това хранилище." -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Конфликт в дистрибуцията: %s (очаквана: %s, намерена: %s)" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3103,12 +3124,12 @@ msgstr "" "използват старите индексни файлове. Грешка от GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "Грешка от GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3117,7 +3138,7 @@ msgstr "" "Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва " "ръчно да оправите този пакет (поради пропусната архитектура)." -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3126,14 +3147,14 @@ msgstr "" "Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва " "ръчно да оправите този пакет." -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Индексните файлове на пакета са повредени. Няма поле Filename: за пакет %s." -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "Несъответствие на размера" @@ -3185,7 +3206,7 @@ msgstr "Идентифициране..." msgid "Stored label: %s\n" msgstr "Запазен етикет: %s \n" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 msgid "Unmounting CD-ROM...\n" msgstr "Демонтиране на CD-ROM...\n" @@ -3249,30 +3270,30 @@ msgstr "" msgid "Copying package lists..." msgstr "Копиране на списъците с пакети..." -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "Запазване на новия списък с източници\n" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "Записите в списъка с източници за този диск са:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "Записани са %i записа.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Записани са %i записа с %i липсващи файла.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Записани са %i записа с %i несъответстващи файла\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Записани са %i записа с %i липсващи и %i несъответстващи файла\n" diff --git a/po/bs.po b/po/bs.po index 6825d1bf3..4f0beca48 100644 --- a/po/bs.po +++ b/po/bs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2004-05-06 15:25+0100\n" "Last-Translator: Safir Šećerović \n" "Language-Team: Bosnian \n" @@ -96,72 +96,72 @@ msgstr "" msgid "Package file %s is out of sync." msgstr "" -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Paketi nisu pronađeni" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1243 msgid "You must give at least one search pattern" msgstr "" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Ne mogu pronaći paket %s" -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1526 msgid "Package files:" msgstr "Datoteke paketa:" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1547 msgid "Pinned packages:" msgstr "" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr " Instalirano:" -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr "" -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr "" #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr "" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "" -#: cmdline/apt-cache.cc:1690 +#: cmdline/apt-cache.cc:1730 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -198,20 +198,28 @@ msgid "" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Ne mogu otvoriti %s" -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" @@ -441,7 +449,7 @@ msgstr "" msgid "%s is already the newest version.\n" msgstr "" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ali se %s treba instalirati" @@ -549,8 +557,8 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 #, c-format msgid "Couldn't determine free space in %s" msgstr "" @@ -587,7 +595,7 @@ msgstr "Odustani." msgid "Do you want to continue [Y/n]? " msgstr "Da li želite nastaviti? [Y/n]" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -596,7 +604,7 @@ msgstr "" msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "" @@ -672,7 +680,7 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 msgid "The following information may help to resolve the situation:" msgstr "" @@ -718,7 +726,7 @@ msgid "" "solution)." msgstr "" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1973 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" @@ -726,85 +734,85 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1995 +#: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "Oštećeni paketi" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2020 msgid "The following extra packages will be installed:" msgstr "Slijedeći dodatni paketi će biti instalirani:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "Predloženi paketi:" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "Preporučeni paketi:" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "ali se %s treba instalirati" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2184 msgid "Calculating upgrade... " msgstr "Računam nadogradnju..." -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Neuspješno" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2192 msgid "Done" msgstr "Urađeno" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2452 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2514 #, c-format msgid "" "Please use:\n" @@ -812,141 +820,141 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2567 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2605 +#: cmdline/apt-get.cc:2604 #, c-format msgid "You don't have enough free space in %s" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2613 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2618 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2625 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2663 +#: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2694 +#: cmdline/apt-get.cc:2693 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2707 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2729 +#: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2749 +#: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2768 +#: cmdline/apt-get.cc:2767 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2793 +#: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2840 +#: cmdline/apt-get.cc:2839 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:3010 +#: cmdline/apt-get.cc:3009 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "" -#: cmdline/apt-get.cc:3028 +#: cmdline/apt-get.cc:3027 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:3051 +#: cmdline/apt-get.cc:3050 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:3090 +#: cmdline/apt-get.cc:3089 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:3096 +#: cmdline/apt-get.cc:3095 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "" -#: cmdline/apt-get.cc:3119 +#: cmdline/apt-get.cc:3118 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:3135 +#: cmdline/apt-get.cc:3133 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:3140 +#: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, c-format msgid "Changelog for %s (%s)" msgstr "" -#: cmdline/apt-get.cc:3368 +#: cmdline/apt-get.cc:3366 msgid "Supported modules:" msgstr "Podržani moduli:" -#: cmdline/apt-get.cc:3409 +#: cmdline/apt-get.cc:3407 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -992,7 +1000,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:3574 +#: cmdline/apt-get.cc:3572 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1060,7 +1068,7 @@ msgid "%s was already not hold.\n" msgstr "" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" @@ -1197,8 +1205,8 @@ msgstr "" msgid "Server closed the connection" msgstr "Server je zatvorio vezu" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 +#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 msgid "Read error" msgstr "Greška pri čitanju" @@ -1212,8 +1220,8 @@ msgid "Protocol corruption" msgstr "Oštećenje protokola" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 +#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 msgid "Write error" msgstr "Greška pri pisanju" @@ -1356,29 +1364,37 @@ msgstr "" msgid "Unable to connect to %s:%s:" msgstr "Ne mogu se povezati sa %s %s:" -#: methods/gpgv.cc:169 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:183 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Slijedeći dodatni paketi će biti instalirani:" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1459,8 +1475,8 @@ msgstr "Unutrašnja greška" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1489,7 +1505,12 @@ msgstr "" msgid "Can not read mirror file '%s'" msgstr "Ne mogu otvoriti %s" -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "Ne mogu otvoriti %s" + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "" @@ -1569,7 +1590,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Ne mogu zapisati na %s" @@ -1880,23 +1901,23 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "Ne mogu izvršiti gzip" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "Oštećena arhiva" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "Provjera Tar kontrolnog zbira nije uspjela, arhiva oštećena" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "" @@ -2116,7 +2137,7 @@ msgstr "" msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1172 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "" @@ -2256,111 +2277,111 @@ msgstr "" msgid "Problem closing the gzip file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:249 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:843 #, c-format msgid "Sub-process %s received signal %u." msgstr "" -#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:984 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Could not open file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1062 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "Ne mogu otvoriti %s" -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " msgstr "" -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1297 #, c-format msgid "read, still have %llu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1681 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Ne mogu ukloniti %s" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1693 #, c-format msgid "Problem renaming the file %s to %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1704 #, c-format msgid "Problem unlinking the file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1717 msgid "Problem syncing the file" msgstr "" @@ -2559,19 +2580,19 @@ msgstr "" msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Ne mogu otvoriti %s" -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2600,13 +2621,13 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 +#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." msgstr "" -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, c-format msgid "List directory %spartial is missing." msgstr "" @@ -2706,14 +2727,14 @@ msgstr "" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 -#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 -#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 -#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 -#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 -#: apt-pkg/pkgcachegen.cc:561 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "" @@ -2734,26 +2755,26 @@ msgstr "" msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:568 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:1197 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 -#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" msgstr "Čitam spiskove paketa" -#: apt-pkg/pkgcachegen.cc:1302 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "" @@ -2766,40 +2787,40 @@ msgstr "" msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 msgid "Hash Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Ne mogu otvoriti DB datoteku %s" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2807,32 +2828,32 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "" @@ -2882,7 +2903,7 @@ msgstr "" msgid "Stored label: %s\n" msgstr "" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "Pogrešan CD" @@ -2943,30 +2964,30 @@ msgstr "" msgid "Copying package lists..." msgstr "Čitam spiskove paketa" -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/ca.po b/po/ca.po index ab9e30631..1df614e6a 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.6\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2012-10-19 13:30+0200\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" @@ -96,74 +96,74 @@ msgstr "Nombre total de l'espai atribuït a: " msgid "Package file %s is out of sync." msgstr "El fitxer %s del paquet està desincronitzat." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "No s'han trobat paquets" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1243 msgid "You must give at least one search pattern" msgstr "Heu de donar com a mínim un patró de cerca" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" "Aquesta ordre és desaconsellada. Empreu «apt-mark showauto» en el seu lloc." -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "No s'ha trobat el paquet %s" -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1526 msgid "Package files:" msgstr "Fitxers de paquets:" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Memòria cau no sincronitzada, no es pot fer x-ref a un fitxer del paquet" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1547 msgid "Pinned packages:" msgstr "Paquets etiquetats:" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "(no trobat)" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr " Instaŀlat: " -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr " Candidat: " -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "(cap)" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr " Etiqueta del paquet: " #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr " Taula de versió:" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s per a %s compilat el %s %s\n" -#: cmdline/apt-cache.cc:1690 +#: cmdline/apt-cache.cc:1730 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -237,20 +237,28 @@ msgstr "" "Vegeu les pàgines de manual apt-cache(8) i apt.conf(5) per a més " "informació.\n" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Doneu un nom per a aquest disc, com per exemple «Debian 5.0.3 Disc 1»" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" msgstr "Inseriu un disc en la unitat i premeu Intro" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "No s'ha pogut muntar «%s» a «%s»" -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Repetiu aquest procés per a la resta de CD del vostre joc." @@ -487,7 +495,7 @@ msgstr "No es possible la reinstaŀlació del paquet %s, no es pot baixar.\n" msgid "%s is already the newest version.\n" msgstr "%s ja es troba en la versió més recent.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "S'ha marcat %s com instaŀlat manualment.\n" @@ -599,8 +607,8 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Després d'aquesta operació s'alliberaran %sB d'espai en disc.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 #, c-format msgid "Couldn't determine free space in %s" msgstr "No s'ha pogut determinar l'espai lliure en %s" @@ -639,7 +647,7 @@ msgstr "Avortat." msgid "Do you want to continue [Y/n]? " msgstr "Voleu continuar [S/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" msgstr "No s'ha pogut obtenir %s %s\n" @@ -648,7 +656,7 @@ msgstr "No s'ha pogut obtenir %s %s\n" msgid "Some files failed to download" msgstr "Alguns fitxers no s'han pogut baixar" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "Baixada completa i en mode de només baixada" @@ -734,7 +742,7 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 msgid "The following information may help to resolve the situation:" msgstr "La informació següent pot ajudar-vos a resoldre la situació:" @@ -785,7 +793,7 @@ msgstr "" "Dependències insatisfetes. Proveu amb «apt-get -f install» sense paquets (o " "especifiqueu una solució)." -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1973 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" @@ -797,33 +805,33 @@ msgstr "" "«unstable» i alguns paquets requerits encara no han estat creats o bé\n" "encara no els hi han introduït des d'«Incoming»." -#: cmdline/apt-get.cc:1995 +#: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "Paquets trencats" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2020 msgid "The following extra packages will be installed:" msgstr "S'instaŀlaran els següents paquets extres:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "Paquets suggerits:" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "Paquets recomanats:" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "No s'ha pogut trobar el paquet %s" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "S'ha marcat %s com instaŀlat automàticament.\n" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -831,47 +839,47 @@ msgstr "" "Aquesta ordre és desaconsellada. Empreu «apt-mark auto» i «apt-mark manual» " "en el seu lloc." -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2184 msgid "Calculating upgrade... " msgstr "S'està calculant l'actualització… " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Ha fallat" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2192 msgid "Done" msgstr "Fet" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 msgid "Internal error, problem resolver broke stuff" msgstr "" "S'ha produït un error intern, el solucionador de problemes ha trencat coses" -#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "No és possible blocar el directori de descàrrega" -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "No es troba una font per baixar la versió «%s» de «%s»" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "S'està baixant %s %s" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2452 msgid "Must specify at least one package to fetch source for" msgstr "Haureu d'especificar un paquet de codi font per a baixar" -#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, c-format msgid "Unable to find a source package for %s" msgstr "No es pot trobar un paquet de fonts per a %s" -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -881,7 +889,7 @@ msgstr "" "versions «%s» a:\n" "%s\n" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2514 #, c-format msgid "" "Please use:\n" @@ -893,71 +901,71 @@ msgstr "" "per obtenir les últimes actualitzacions (possiblement no publicades) del " "paquet.\n" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2567 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "S'està ometent el fitxer ja baixat «%s»\n" -#: cmdline/apt-get.cc:2605 +#: cmdline/apt-get.cc:2604 #, c-format msgid "You don't have enough free space in %s" msgstr "No teniu prou espai lliure en %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2613 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Es necessita baixar %sB/%sB d'arxius font.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2618 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es necessita baixar %sB d'arxius font.\n" -#: cmdline/apt-get.cc:2625 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" msgstr "Obtén el font %s\n" -#: cmdline/apt-get.cc:2663 +#: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "No s'ha pogut baixar alguns arxius." -#: cmdline/apt-get.cc:2694 +#: cmdline/apt-get.cc:2693 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "S'està ometent el desempaquetament de les fonts que ja ho estan en %s\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "L'ordre de desempaquetar «%s» ha fallat.\n" -#: cmdline/apt-get.cc:2707 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comproveu si el paquet «dpkgdev» està instaŀlat.\n" -#: cmdline/apt-get.cc:2729 +#: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "L'ordre de construir «%s» ha fallat.\n" -#: cmdline/apt-get.cc:2749 +#: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "Ha fallat el procés fill" -#: cmdline/apt-get.cc:2768 +#: cmdline/apt-get.cc:2767 msgid "Must specify at least one package to check builddeps for" msgstr "" "S'ha d'especificar un paquet per a verificar les dependències de construcció " "per a" -#: cmdline/apt-get.cc:2793 +#: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -966,18 +974,18 @@ msgstr "" "No hi ha informació d'arquitectura disponible per a %s. Vegeu apt.conf(5) " "APT::Architectures per a configurar-ho" -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "No es pot obtenir informació sobre les dependències de construcció per a %s" -#: cmdline/apt-get.cc:2840 +#: cmdline/apt-get.cc:2839 #, c-format msgid "%s has no build depends.\n" msgstr "%s no té dependències de construcció.\n" -#: cmdline/apt-get.cc:3010 +#: cmdline/apt-get.cc:3009 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -986,7 +994,7 @@ msgstr "" "La dependència %s en %s no es pot satisfer perquè %s no és permès als " "paquets «%s»" -#: cmdline/apt-get.cc:3028 +#: cmdline/apt-get.cc:3027 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -995,14 +1003,14 @@ msgstr "" "La dependència %s en %s no es pot satisfer perquè no es pot trobar el paquet " "%s" -#: cmdline/apt-get.cc:3051 +#: cmdline/apt-get.cc:3050 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "No s'ha pogut satisfer la dependència %s per a %s: El paquet instaŀlat %s és " "massa nou" -#: cmdline/apt-get.cc:3090 +#: cmdline/apt-get.cc:3089 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1011,7 +1019,7 @@ msgstr "" "La dependència %s per a %s no es pot satisfer perquè la versió candidata del " "paquet %s no pot satisfer els requeriments de versions" -#: cmdline/apt-get.cc:3096 +#: cmdline/apt-get.cc:3095 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1020,30 +1028,30 @@ msgstr "" "La dependència %s en %s no es pot satisfer perquè el paquet %s no té versió " "candidata" -#: cmdline/apt-get.cc:3119 +#: cmdline/apt-get.cc:3118 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "No s'ha pogut satisfer la dependència %s per a %s: %s" -#: cmdline/apt-get.cc:3135 +#: cmdline/apt-get.cc:3133 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "No s'han pogut satisfer les dependències de construcció per a %s" -#: cmdline/apt-get.cc:3140 +#: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "No es poden processar les dependències de construcció" -#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, c-format msgid "Changelog for %s (%s)" msgstr "Registre de canvis per a %s (%s)" -#: cmdline/apt-get.cc:3368 +#: cmdline/apt-get.cc:3366 msgid "Supported modules:" msgstr "Mòduls suportats:" -#: cmdline/apt-get.cc:3409 +#: cmdline/apt-get.cc:3407 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1135,7 +1143,7 @@ msgstr "" "per a obtenir més informació i opcions.\n" " Aquest APT té superpoders bovins.\n" -#: cmdline/apt-get.cc:3574 +#: cmdline/apt-get.cc:3572 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1210,7 +1218,7 @@ msgid "%s was already not hold.\n" msgstr "%s ja estava no retingut.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" @@ -1349,8 +1357,8 @@ msgstr "Temps de connexió finalitzat" msgid "Server closed the connection" msgstr "El servidor ha tancat la connexió" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 +#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 msgid "Read error" msgstr "Error de lectura" @@ -1363,8 +1371,8 @@ msgid "Protocol corruption" msgstr "Protocol corromput" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 +#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 msgid "Write error" msgstr "Error d'escriptura" @@ -1508,32 +1516,40 @@ msgstr "Ha passat alguna cosa estranya en resoldre «%s:%s» (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "No es pot connectar amb %s:%s:" -#: methods/gpgv.cc:169 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Error intern: La signatura és correcta, però no s'ha pogut determinar " "l'emprempta digital de la clau!" -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "S'ha trobat almenys una signatura invàlida." -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "No s'ha pogut executar el «gpgv» per a verificar la signatura (està " "instaŀlat el gpgv?)" -#: methods/gpgv.cc:183 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "S'ha produït un error desconegut en executar el gpgv" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Les signatures següents són invàlides:\n" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1617,8 +1633,8 @@ msgstr "Error intern" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1647,7 +1663,12 @@ msgstr "No s'ha trobat el fitxer rèplica «%s»" msgid "Can not read mirror file '%s'" msgstr "No es pot llegir el fitxer rèplica «%s»" -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "No es pot llegir el fitxer rèplica «%s»" + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "[Rèplica: %s]" @@ -1746,7 +1767,7 @@ msgstr "" " -c=? Llegeix aquest fitxer de configuració\n" " -o=? Estableix una opció de conf arbitrària, p.e. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "No es pot escriure en %s" @@ -2118,23 +2139,23 @@ msgstr "" " -c=? Llegeix aquest fitxer de configuració\n" " -o=? Estableix una opció de configuració, p. ex: -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "No es poden crear els conductes" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "No es pot executar el gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "Arxiu corromput" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "La suma de comprovació de tar ha fallat, arxiu corromput" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Capçalera TAR desconeguda del tipus %u, membre %s" @@ -2357,7 +2378,7 @@ msgstr "%limin %lis" msgid "%lis" msgstr "%lis" -#: apt-pkg/contrib/strutl.cc:1172 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "No s'ha trobat la selecció %s" @@ -2499,45 +2520,45 @@ msgstr "No s'ha pogut fer «stat» del cdrom" msgid "Problem closing the gzip file %s" msgstr "Ha hagut un problema en tancar el fitxer gzip %s" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "No s'empren blocats per a llegir el fitxer de blocat de sols lectura %s" -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "No es pot resoldre el fitxer de blocat %s" -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:249 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "No s'empren blocats per al fitxer de blocat %s de muntar nfs" -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "No s'ha pogut blocar %s" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "No es pot crear la llista de fitxers perquè «%s» no és un directori" -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "S'està descartant «%s» al directori «%s» perquè no és un fitxer normal" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" "S'està descartant «%s» al directori «%s» perquè no té extensió del nom de " "fitxer" -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" @@ -2545,70 +2566,70 @@ msgstr "" "S'està descartant «%s» al directori «%s» perquè té una extensió del nom de " "fitxer invàlida" -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "El sub-procés %s ha rebut una violació de segment." -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:843 #, c-format msgid "Sub-process %s received signal %u." msgstr "El sub-procés %s ha rebut un senyal %u." -#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "El sub-procés %s ha retornat un codi d'error (%u)" -#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "El sub-procés %s ha sortit inesperadament" -#: apt-pkg/contrib/fileutl.cc:984 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Could not open file %s" msgstr "No s'ha pogut obrir el fitxer %s" -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1062 #, c-format msgid "Could not open file descriptor %d" msgstr "No s'ha pogut obrir el descriptor del fitxer %d" -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "No s'ha pogut crear el subprocés IPC" -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " msgstr "No s'ha pogut executar el compressor " -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1297 #, c-format msgid "read, still have %llu to read but none left" msgstr "llegits, falten %llu per llegir, però no queda res" -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "escrits, falten %llu per escriure però no s'ha pogut" -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1681 #, c-format msgid "Problem closing the file %s" msgstr "Ha hagut un problema en tancar el fitxer %s" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1693 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Ha hagut un problema en reanomenar el fitxer %s a %s" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1704 #, c-format msgid "Problem unlinking the file %s" msgstr "Ha hagut un problema en desenllaçar el fitxer %s" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1717 msgid "Problem syncing the file" msgstr "Ha hagut un problema en sincronitzar el fitxer" @@ -2808,7 +2829,7 @@ msgstr "La línia %u és malformada en la llista de fonts %s (tipus)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2817,12 +2838,12 @@ msgstr "" "No s'ha pogut realitzar la configuració immediata de «%s». Vegeu man 5 apt." "conf, sota APT::Immediate-Configure per a més detalls. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, c-format msgid "Could not configure '%s'. " msgstr "No s'ha pogut configurar «%s»." -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2860,7 +2881,7 @@ msgstr "" "No es poden corregir els problemes, teniu paquets retinguts que estan " "trencats." -#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 +#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2868,7 +2889,7 @@ msgstr "" "Alguns índex no s'han pogut baixar. S'han descartat, o en el seu lloc s'han " "emprat els antics." -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, c-format msgid "List directory %spartial is missing." msgstr "Falta el directori de llistes %spartial." @@ -2972,14 +2993,14 @@ msgstr "La memòria cau té un sistema de versions incompatible" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 -#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 -#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 -#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 -#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 -#: apt-pkg/pkgcachegen.cc:561 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "S'ha produït un error en processar %s (%s%d)" @@ -3006,27 +3027,27 @@ msgstr "" "Uau, heu excedit el nombre de dependències que aquest APT és capaç de " "gestionar." -#: apt-pkg/pkgcachegen.cc:568 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "No s'ha trobat el paquet %s %s en processar les dependències del fitxer" -#: apt-pkg/pkgcachegen.cc:1197 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "No s'ha pogut llegir la llista de paquets font %s" -#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 -#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" msgstr "S'està llegint la llista de paquets" -#: apt-pkg/pkgcachegen.cc:1302 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "S'estan recollint els fitxers que proveeixen" -#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "Error d'E/S en desar la memòria cau de la font" @@ -3039,12 +3060,12 @@ msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "La suma MD5 no concorda" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 msgid "Hash Sum mismatch" msgstr "La suma resum no concorda" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3053,16 +3074,16 @@ msgstr "" "No s'ha trobat l'entrada «%s» esperada, al fitxer Release (entrada errònia " "al sources.list o fitxer malformat)" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "No s'ha trobat la suma de comprovació per a «%s» al fitxer Release" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "No hi ha cap clau pública disponible per als següents ID de clau:\n" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3071,12 +3092,12 @@ msgstr "" "El fitxer Release per a %s ha caducat (invàlid des de %s). Les " "actualitzacions per a aquest dipòsit no s'aplicaran." -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribució en conflicte: %s (s'esperava %s però s'ha obtingut %s)" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3087,12 +3108,12 @@ msgstr "" "%s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "S'ha produït un error amb el GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3102,7 +3123,7 @@ msgstr "" "significar que haureu d'arreglar aquest paquet manualment (segons " "arquitectura)." -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3111,7 +3132,7 @@ msgstr "" "No s'ha trobat un fitxer pel paquet %s. Això podria significar que haureu " "d'arreglar aquest paquet manualment." -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3119,7 +3140,7 @@ msgstr "" "L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp " "per al paquet %s." -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "La mida no concorda" @@ -3171,7 +3192,7 @@ msgstr "S'està identificant…" msgid "Stored label: %s\n" msgstr "S'ha emmagatzemat l'etiqueta: %s\n" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 msgid "Unmounting CD-ROM...\n" msgstr "S'esta desmuntant el CD-ROM…\n" @@ -3235,30 +3256,30 @@ msgstr "" msgid "Copying package lists..." msgstr "S'estan copiant les llistes de paquets…" -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "S'està escrivint una nova llista de fonts\n" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "Les entrades de la llista de fonts per a aquest disc són:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "S'han escrit %i registres.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "S'han escrit %i registres, on falten %i fitxers.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "S'han escrit %i registres, on hi ha %i fitxers no coincidents\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/cs.po b/po/cs.po index 429cbabdd..7c81bc778 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2012-07-08 13:46+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -95,72 +95,72 @@ msgstr "Celkem přiřazeného místa: " msgid "Package file %s is out of sync." msgstr "Soubor balíku %s je špatně synchronizovaný." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Nebyly nalezeny žádné balíky" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1243 msgid "You must give at least one search pattern" msgstr "Musíte zadat alespoň jeden vyhledávací vzor" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "Tento příkaz je zastaralý, použijte místo něj „apt-mark showauto“." -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Nelze najít balík %s" -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1526 msgid "Package files:" msgstr "Soubory balíku:" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Cache není synchronizovaná, nemohu se odkázat na soubor balíku" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1547 msgid "Pinned packages:" msgstr "Vypíchnuté balíky:" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "(nenalezeno)" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr " Instalovaná verze: " -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr " Kandidát: " -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "(žádná)" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr " Vypíchnutý balík: " #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr " Tabulka verzí:" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s pro %s zkompilován na %s %s\n" -#: cmdline/apt-cache.cc:1690 +#: cmdline/apt-cache.cc:1730 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -229,20 +229,28 @@ msgstr "" " -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n" "Více informací viz manuálové stránky apt-cache(8) a apt.conf(5).\n" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Zadejte prosím název tohoto média, např. „Debian 5.0.3 Disk 1“" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" msgstr "Vložte prosím médium do mechaniky a stiskněte enter" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Selhalo připojení „%s“ na „%s“" -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Tento proces opakujte pro všechna zbývající média." @@ -478,7 +486,7 @@ msgstr "Přeinstalace %s není možná, protože nelze stáhnout.\n" msgid "%s is already the newest version.\n" msgstr "%s je již nejnovější verze.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s nastaven jako instalovaný ručně.\n" @@ -586,8 +594,8 @@ 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:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nelze určit volné místo v %s" @@ -626,7 +634,7 @@ msgstr "Přerušeno." msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovat [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Selhalo stažení %s %s\n" @@ -635,7 +643,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:1375 cmdline/apt-get.cc:2668 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "Stahování dokončeno v režimu pouze stáhnout" @@ -722,7 +730,7 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 msgid "The following information may help to resolve the situation:" msgstr "Následující informace vám mohou pomoci vyřešit tuto situaci:" @@ -774,7 +782,7 @@ msgstr "" "Nesplněné závislosti. Zkuste spustit „apt-get -f install“ bez balíků (nebo " "navrhněte řešení)." -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1973 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" @@ -785,33 +793,33 @@ 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:1995 +#: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "Poškozené balíky" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2020 msgid "The following extra packages will be installed:" msgstr "Následující extra balíky budou instalovány:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "Navrhované balíky:" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "Doporučované balíky:" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "Nelze najít balík %s" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s nastaven jako instalovaný automaticky.\n" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -819,46 +827,46 @@ msgstr "" "Tento příkaz je zastaralý, použijte místo něj „apt-mark auto“ a „apt-mark " "manual“." -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2184 msgid "Calculating upgrade... " msgstr "Propočítávám aktualizaci… " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Selhalo" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2192 msgid "Done" msgstr "Hotovo" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 msgid "Internal error, problem resolver broke stuff" msgstr "Vnitřní chyba, řešitel problémů pokazil věci" -#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "Nelze zamknout adresář pro stahování" -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Nelze najít zdroj pro stažení verze „%s“ balíku „%s“" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "Stahuje se %s %s" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2452 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:2493 cmdline/apt-get.cc:2805 +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, c-format msgid "Unable to find a source package for %s" msgstr "Nelze najít zdrojový balík pro %s" -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -867,7 +875,7 @@ msgstr "" "INFO: Balík „%s“ je spravován v systému pro správu verzí „%s“ na:\n" "%s\n" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2514 #, c-format msgid "" "Please use:\n" @@ -878,70 +886,70 @@ msgstr "" "použijte:\n" "bzr branch %s\n" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2567 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Přeskakuji dříve stažený soubor „%s“\n" -#: cmdline/apt-get.cc:2605 +#: cmdline/apt-get.cc:2604 #, c-format msgid "You don't have enough free space in %s" msgstr "Na %s nemáte dostatek volného místa" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2613 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potřebuji stáhnout %sB/%sB zdrojových archivů.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2618 #, 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:2625 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" msgstr "Stažení zdroje %s\n" -#: cmdline/apt-get.cc:2663 +#: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "Stažení některých archivů selhalo." -#: cmdline/apt-get.cc:2694 +#: cmdline/apt-get.cc:2693 #, 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:2706 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Příkaz pro rozbalení „%s“ selhal.\n" -#: cmdline/apt-get.cc:2707 +#: cmdline/apt-get.cc:2706 #, 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:2729 +#: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "Příkaz pro sestavení „%s“ selhal.\n" -#: cmdline/apt-get.cc:2749 +#: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "Synovský proces selhal" -#: cmdline/apt-get.cc:2768 +#: cmdline/apt-get.cc:2767 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:2793 +#: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -950,17 +958,17 @@ msgstr "" "O architektuře %s nejsou známy žádné informace. Pro nastavení si přečtěte " "část APT::Architectures v manuálové stránce apt.conf(5)" -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nelze získat závislosti pro sestavení %s" -#: cmdline/apt-get.cc:2840 +#: cmdline/apt-get.cc:2839 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žádné závislosti pro sestavení.\n" -#: cmdline/apt-get.cc:3010 +#: cmdline/apt-get.cc:3009 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -969,20 +977,20 @@ msgstr "" "závislost %s pro %s nemůže být splněna, protože %s není na balících „%s“ " "dovolena" -#: cmdline/apt-get.cc:3028 +#: cmdline/apt-get.cc:3027 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "závislost %s pro %s nemůže být splněna, protože balík %s nebyl nalezen" -#: cmdline/apt-get.cc:3051 +#: cmdline/apt-get.cc:3050 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Selhalo splnění závislosti %s pro %s: Instalovaný balík %s je příliš nový" -#: cmdline/apt-get.cc:3090 +#: cmdline/apt-get.cc:3089 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -991,7 +999,7 @@ msgstr "" "závislost %s pro %s nemůže být splněna, protože kandidátská verze balíku %s " "nesplňuje požadavek na verzi" -#: cmdline/apt-get.cc:3096 +#: cmdline/apt-get.cc:3095 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1000,30 +1008,30 @@ msgstr "" "závislost %s pro %s nemůže být splněna, protože balík %s nemá kandidátskou " "verzi" -#: cmdline/apt-get.cc:3119 +#: cmdline/apt-get.cc:3118 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Selhalo splnění závislosti %s pro %s: %s" -#: cmdline/apt-get.cc:3135 +#: cmdline/apt-get.cc:3133 #, 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:3140 +#: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "Chyba při zpracování závislostí pro sestavení" -#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, c-format msgid "Changelog for %s (%s)" msgstr "Seznam změn %s (%s)" -#: cmdline/apt-get.cc:3368 +#: cmdline/apt-get.cc:3366 msgid "Supported modules:" msgstr "Podporované moduly:" -#: cmdline/apt-get.cc:3409 +#: cmdline/apt-get.cc:3407 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1110,7 +1118,7 @@ msgstr "" "a apt.conf(5).\n" " Tato APT má schopnosti svaté krávy.\n" -#: cmdline/apt-get.cc:3574 +#: cmdline/apt-get.cc:3572 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1185,7 +1193,7 @@ msgid "%s was already not hold.\n" msgstr "%s již nebyl držen v aktuální verzi.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" @@ -1342,8 +1350,8 @@ msgstr "Čas spojení vypršel" msgid "Server closed the connection" msgstr "Server uzavřel spojení" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 +#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 msgid "Read error" msgstr "Chyba čtení" @@ -1356,8 +1364,8 @@ msgid "Protocol corruption" msgstr "Porušení protokolu" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 +#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 msgid "Write error" msgstr "Chyba zápisu" @@ -1500,28 +1508,36 @@ msgstr "Něco hodně ošklivého se přihodilo při překladu „%s:%s“ (%i - msgid "Unable to connect to %s:%s:" msgstr "Nelze se připojit k %s:%s:" -#: methods/gpgv.cc:169 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Vnitřní chyba: Dobrý podpis, ale nemohu zjistit otisk klíče?!" -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Byl zaznamenán nejméně jeden neplatný podpis. " -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Nelze spustit „gpgv“ pro ověření podpisu (je gpgv nainstalováno?)" -#: methods/gpgv.cc:183 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Neznámá chyba při spouštění gpgv" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Následující podpisy jsou neplatné:\n" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1604,8 +1620,8 @@ msgstr "Vnitřní chyba" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1634,7 +1650,12 @@ msgstr "Soubor se zrcadly „%s“ nebyl nalezen " msgid "Can not read mirror file '%s'" msgstr "Nelze číst soubor se zrcadly „%s“" -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "Nelze číst soubor se zrcadly „%s“" + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "[Zrcadlo: %s]" @@ -1727,7 +1748,7 @@ msgstr "" " -c=? Načte tento konfigurační soubor\n" " -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Nelze zapsat do %s" @@ -2097,23 +2118,23 @@ msgstr "" " -c=? Načte tento konfigurační soubor\n" " -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "Selhalo vytvoření roury" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "Selhalo spuštění gzipu " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "Porušený archiv" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "Kontrolní součet taru selhal, archiv je poškozený" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Neznámá hlavička TARu typ %u, člen %s" @@ -2334,7 +2355,7 @@ msgstr "%limin %lis" msgid "%lis" msgstr "%lis" -#: apt-pkg/contrib/strutl.cc:1172 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "Výběr %s nenalezen" @@ -2477,111 +2498,111 @@ msgstr "Nezdařilo se vyhodnotit cdrom" msgid "Problem closing the gzip file %s" msgstr "Problém při zavírání gzip souboru %s" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Nepoužívám zamykání pro zámkový soubor %s, který je pouze pro čtení" -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "Nešlo otevřít zámkový soubor %s" -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:249 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Nepoužívám zamykání pro zámkový soubor %s připojený přes nfs" -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "Nelze získat zámek %s" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "Seznam souborů nelze vytvořit, jelikož „%s“ není adresář" -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "Ignoruji „%s“ v adresáři „%s“, jelikož to není obyčejný soubor" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "Ignoruji soubor „%s“ v adresáři „%s“, jelikož nemá příponu" -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "Ignoruji soubor „%s“ v adresáři „%s“, jelikož má neplatnou příponu" -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Podproces %s obdržel chybu segmentace." -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:843 #, c-format msgid "Sub-process %s received signal %u." msgstr "Podproces %s obdržel signál %u." -#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Podproces %s vrátil chybový kód (%u)" -#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Podproces %s neočekávaně skončil" -#: apt-pkg/contrib/fileutl.cc:984 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Could not open file %s" msgstr "Nelze otevřít soubor %s" -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1062 #, c-format msgid "Could not open file descriptor %d" msgstr "Nelze otevřít popisovač souboru %d" -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "Nelze vytvořit podproces IPC" -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " msgstr "Nezdařilo se spustit kompresor " -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1297 #, c-format msgid "read, still have %llu to read but none left" msgstr "čtení, stále mám k přečtení %llu, ale už nic nezbývá" -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "zápis, stále mám %llu k zápisu, ale nejde to" -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1681 #, c-format msgid "Problem closing the file %s" msgstr "Problém při zavírání souboru %s" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1693 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problém při přejmenování souboru %s na %s" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1704 #, c-format msgid "Problem unlinking the file %s" msgstr "Problém při odstraňování souboru %s" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1717 msgid "Problem syncing the file" msgstr "Problém při synchronizování souboru" @@ -2778,7 +2799,7 @@ msgstr "Zkomolený řádek %u v seznamu zdrojů %s (typ)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ „%s“ na řádce %u v seznamu zdrojů %s není známý" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2787,12 +2808,12 @@ msgstr "" "Nelze spustit okamžitou konfiguraci balíku „%s“. Podrobnosti naleznete v man " "5 apt.conf v části APT::Immediate-Configure. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, c-format msgid "Could not configure '%s'. " msgstr "Nelze nastavit „%s“." -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2826,7 +2847,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Nelze opravit problémy, některé balíky držíte v porouchaném stavu." -#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 +#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2834,7 +2855,7 @@ msgstr "" "Některé indexové soubory se nepodařilo stáhnout. Jsou ignorovány, nebo jsou " "použity starší verze." -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, c-format msgid "List directory %spartial is missing." msgstr "Adresář seznamů %spartial chybí." @@ -2937,14 +2958,14 @@ msgstr "Cache má nekompatibilní systém správy verzí" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 -#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 -#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 -#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 -#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 -#: apt-pkg/pkgcachegen.cc:561 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Chyba při zpracování %s (%s%d)" @@ -2965,26 +2986,26 @@ msgstr "Wow, překročili jste počet popisů, které tato APT umí zpracovat." msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Wow, překročili jste počet závislostí, které tato APT umí zpracovat." -#: apt-pkg/pkgcachegen.cc:568 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Při zpracování závislostí nebyl nalezen balík %s %s" -#: apt-pkg/pkgcachegen.cc:1197 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nešlo vyhodnotit seznam zdrojových balíků %s" -#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 -#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" msgstr "Čtu seznamy balíků" -#: apt-pkg/pkgcachegen.cc:1302 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "Collecting File poskytuje" -#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "Chyba IO při ukládání zdrojové cache" @@ -2997,12 +3018,12 @@ msgstr "přejmenování selhalo, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "Neshoda MD5 součtů" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 msgid "Hash Sum mismatch" msgstr "Neshoda kontrolních součtů" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3011,16 +3032,16 @@ msgstr "" "V souboru Release nelze najít očekávanou položku „%s“ (chybný sources.list " "nebo porušený soubor)" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "V souboru Release nelze najít kontrolní součet „%s“" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "K následujícím ID klíčů není dostupný veřejný klíč:\n" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3029,12 +3050,12 @@ msgstr "" "Soubor Release pro %s již expiroval (neplatný od %s). Aktualizace z tohoto " "repositáře se nepoužijí." -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konfliktní distribuce: %s (očekáváno %s, obdrženo %s)" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3044,12 +3065,12 @@ msgstr "" "se použijí předchozí indexové soubory. Chyba GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "Chyba GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3058,7 +3079,7 @@ msgstr "" "Nebylo možné nalézt soubor s balíkem %s. To by mohlo znamenat, že tento " "balík je třeba opravit ručně (kvůli chybějící architektuře)" -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3067,14 +3088,14 @@ msgstr "" "Nebylo možné nalézt soubor s balíkem %s. Asi budete muset tento balík " "opravit ručně." -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Indexové soubory balíku jsou narušeny. Chybí pole Filename: u balíku %s." -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "Velikosti nesouhlasí" @@ -3126,7 +3147,7 @@ msgstr "Rozpoznávám… " msgid "Stored label: %s\n" msgstr "Uložený název: %s \n" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 msgid "Unmounting CD-ROM...\n" msgstr "Odpojuji CD-ROM…\n" @@ -3190,30 +3211,30 @@ msgstr "" msgid "Copying package lists..." msgstr "Kopíruji seznamy balíků…" -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "Zapisuji nový seznam balíků\n" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "Seznamy zdrojů na tomto disku jsou:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "Zapsáno %i záznamů.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Zapsáno %i záznamů s chybějícími soubory (%i).\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Zapsáno %i záznamů s nesouhlasícími soubory (%i).\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Zapsáno %i záznamů s chybějícími (%i) a nesouhlasícími (%i) soubory.\n" diff --git a/po/cy.po b/po/cy.po index a72c91ebd..ad7023047 100644 --- a/po/cy.po +++ b/po/cy.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries \n" "Language-Team: Welsh \n" @@ -109,77 +109,77 @@ msgstr "Cyfanswm Gofod Cyfrifwyd: " msgid "Package file %s is out of sync." msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Canfuwyd dim pecyn" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1243 #, fuzzy msgid "You must give at least one search pattern" msgstr "Rhaid i chi ddarparu un patrwm yn union" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Ni ellir lleoli'r pecyn %s" -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1526 #, fuzzy msgid "Package files:" msgstr "Ffeiliau Pecynnau:" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Nid yw'r storfa yn gydamserol, ni ellir croesgyfeirio ffeil pecym" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1547 #, fuzzy msgid "Pinned packages:" msgstr "Pecynnau wedi eu Pinio:" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "(heb ganfod)" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr " Wedi Sefydlu: " -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr " Ymgeisydd: " -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "(dim)" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1601 #, fuzzy msgid " Package pin: " msgstr " Pin Pecyn: " #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1610 #, fuzzy msgid " Version table:" msgstr " Tabl Fersiynnau:" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n" -#: cmdline/apt-cache.cc:1690 +#: cmdline/apt-cache.cc:1730 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -252,11 +252,19 @@ msgstr "" " -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" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 #, fuzzy msgid "Please insert a Disc in the drive and press enter" msgstr "" @@ -264,12 +272,12 @@ msgstr "" " '%s'\n" "yn y gyrriant '%s' a gwasgwch Enter\n" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Methwyd ailenwi %s at %s" -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" @@ -511,7 +519,7 @@ msgstr "Nid yw ailsefydlu %s yn bosib, gan ni ellir ei lawrlwytho.\n" msgid "%s is already the newest version.\n" msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ond mae %s yn mynd i gael ei sefydlu" @@ -622,8 +630,8 @@ 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:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Does dim digon o le rhydd yn %s gennych" @@ -663,7 +671,7 @@ msgstr "Erthylu." msgid "Do you want to continue [Y/n]? " msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Methwyd cyrchu %s %s\n" @@ -672,7 +680,7 @@ msgstr "Methwyd cyrchu %s %s\n" msgid "Some files failed to download" msgstr "Methodd rhai ffeiliau lawrlwytho" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig" @@ -751,7 +759,7 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 msgid "The following information may help to resolve the situation:" msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:" @@ -803,7 +811,7 @@ msgstr "" "pecyn (neu penodwch ddatrys)" # FIXME: needs commas -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1973 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" @@ -815,87 +823,87 @@ msgstr "" "ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n" "heb gael eu symud allan o Incoming." -#: cmdline/apt-get.cc:1995 +#: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "Pecynnau wedi torri" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2020 msgid "The following extra packages will be installed:" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "Pecynnau a awgrymmir:" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "Pecynnau a argymhellir:" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2184 #, fuzzy msgid "Calculating upgrade... " msgstr "Yn Cyfrifo'r Uwchraddiad... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Methwyd" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2192 msgid "Done" msgstr "Wedi Gorffen" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho" -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2452 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:2493 cmdline/apt-get.cc:2805 +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, c-format msgid "Unable to find a source package for %s" msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s" -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2514 #, c-format msgid "" "Please use:\n" @@ -903,86 +911,86 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2567 #, 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:2605 +#: cmdline/apt-get.cc:2604 #, c-format msgid "You don't have enough free space in %s" msgstr "Does dim digon o le rhydd yn %s gennych" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2613 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2618 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:2625 +#: cmdline/apt-get.cc:2624 #, fuzzy, c-format msgid "Fetch source %s\n" msgstr "Cyrchu Ffynhonell %s\n" -#: cmdline/apt-get.cc:2663 +#: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "Methwyd cyrchu rhai archifau." -#: cmdline/apt-get.cc:2694 +#: cmdline/apt-get.cc:2693 #, 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:2706 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Methodd y gorchymyn dadbacio '%s'.\n" -#: cmdline/apt-get.cc:2707 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2729 +#: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "Methodd y gorchymyn adeiladu '%s'.\n" -#: cmdline/apt-get.cc:2749 +#: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "Methodd proses plentyn" -#: cmdline/apt-get.cc:2768 +#: cmdline/apt-get.cc:2767 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:2793 +#: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, 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:2840 +#: cmdline/apt-get.cc:2839 #, c-format msgid "%s has no build depends.\n" msgstr "Nid oes dibyniaethau adeiladu gan %s.\n" -#: cmdline/apt-get.cc:3010 +#: cmdline/apt-get.cc:3009 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -991,7 +999,7 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:3028 +#: cmdline/apt-get.cc:3027 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1000,14 +1008,14 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:3051 +#: cmdline/apt-get.cc:3050 #, 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:3090 +#: cmdline/apt-get.cc:3089 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1016,7 +1024,7 @@ 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:3096 +#: cmdline/apt-get.cc:3095 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1025,32 +1033,32 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:3119 +#: cmdline/apt-get.cc:3118 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Methwyd bodloni dibyniaeth %s am %s: %s" -#: cmdline/apt-get.cc:3135 +#: cmdline/apt-get.cc:3133 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s." -#: cmdline/apt-get.cc:3140 +#: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "Methwyd prosesu dibyniaethau adeiladu" -#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Yn cysylltu i %s (%s)" -#: cmdline/apt-get.cc:3368 +#: cmdline/apt-get.cc:3366 #, fuzzy msgid "Supported modules:" msgstr "Modylau a Gynhelir:" # FIXME: split -#: cmdline/apt-get.cc:3409 +#: cmdline/apt-get.cc:3407 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1137,7 +1145,7 @@ msgstr "" "\n" " Mae gan yr APT hwn bŵerau buwch hudol.\n" -#: cmdline/apt-get.cc:3574 +#: cmdline/apt-get.cc:3572 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1208,7 +1216,7 @@ msgid "%s was already not hold.\n" msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, fuzzy, c-format msgid "Waited for %s but it wasn't there" @@ -1352,8 +1360,8 @@ msgstr "Goramser cysylltu" msgid "Server closed the connection" msgstr "Caeodd y gweinydd y cysylltiad" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 +#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 msgid "Read error" msgstr "Gwall darllen" @@ -1366,8 +1374,8 @@ msgid "Protocol corruption" msgstr "Llygr protocol" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 +#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 msgid "Write error" msgstr "Gwall ysgrifennu" @@ -1513,29 +1521,37 @@ 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:169 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:183 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1622,8 +1638,8 @@ msgstr "Gwall mewnol" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1652,7 +1668,12 @@ msgstr "" msgid "Can not read mirror file '%s'" msgstr "Methwyd agor ffeil %s" -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "Methwyd agor ffeil %s" + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "" @@ -1749,7 +1770,7 @@ msgstr "" " -c=? Darllen y ffeil cyfluniad hwn\n" " -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Ni ellir ysgrifennu i %s" @@ -2125,24 +2146,24 @@ msgstr "" " -c=? Darllen y ffeil cyfluniad hwn\n" " -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "Methwyd creu pibau" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "Methwyd gweithredu gzip" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "Archif llygredig" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 #, fuzzy msgid "Tar checksum failed, archive corrupted" msgstr "Methodd swm gwirio Tar, archif llygredig" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Math pennawd TAR anhysbys %u, aelod %s" @@ -2368,7 +2389,7 @@ msgstr "" msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1172 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "Ni chanfuwyd y dewis %s" @@ -2513,113 +2534,113 @@ msgstr "Methwyd gwneud stat() o'r CD-ROM" msgid "Problem closing the gzip file %s" msgstr "Gwall wrth gau'r ffeil" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Ddim yn cloi'r ffeil clo darllen-yn-unig %s" -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "Methwyd agor y ffeil clo %s" -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:249 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Ddim yn cloi'r ffeil clo ar NFS %s" -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "Methwyd cael y clo %s" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Derbyniodd is-broses %s wall segmentu." -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:843 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Derbyniodd is-broses %s wall segmentu." -#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Dychwelodd is-broses %s gôd gwall (%u)" -#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Gorffenodd is-broses %s yn annisgwyl" -#: apt-pkg/contrib/fileutl.cc:984 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Could not open file %s" msgstr "Methwyd agor ffeil %s" -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1062 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "Methwyd agor pibell ar gyfer %s" -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "Methwyd creu isbroses IPC" -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " msgstr "Methwyd gweithredu cywasgydd " # FIXME -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1297 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "o hyd %lu i ddarllen ond dim ar ôl" # FIXME -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "o hyd %lu i ysgrifennu ond methwyd" -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1681 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Gwall wrth gau'r ffeil" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1693 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Gwall wrth gyfamseru'r ffeil" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1704 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Gwall wrth dadgysylltu'r ffeil" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1717 msgid "Problem syncing the file" msgstr "Gwall wrth gyfamseru'r ffeil" @@ -2828,20 +2849,20 @@ msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Methwyd agor ffeil %s" # FIXME: %s may have an arbirrary length -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2878,7 +2899,7 @@ msgid "Unable to correct problems, you have held broken packages." msgstr "" "Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig." -#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 +#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2887,7 +2908,7 @@ msgstr "" "Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen " "rai eu defnyddio yn lle." -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." @@ -2994,14 +3015,14 @@ msgstr "Mae can y storfa system fersiwn anghyfaddas" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 -#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 -#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 -#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 -#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 -#: apt-pkg/pkgcachegen.cc:561 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)" @@ -3025,27 +3046,27 @@ msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin." -#: apt-pkg/pkgcachegen.cc:568 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil" -#: apt-pkg/pkgcachegen.cc:1197 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s" -#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 -#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 #, fuzzy msgid "Reading package lists" msgstr "Yn Darllen Rhestrau Pecynnau" -#: apt-pkg/pkgcachegen.cc:1302 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "Yn Casglu Darpariaethau Ffeil" -#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "Gwall M/A wrth gadw'r storfa ffynhonell" @@ -3058,13 +3079,13 @@ msgstr "methwyd ailenwi, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 #, fuzzy msgid "Hash Sum mismatch" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3072,28 +3093,28 @@ msgid "" msgstr "" # FIXME: number? -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3101,13 +3122,13 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "" # FIXME: case -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3116,7 +3137,7 @@ msgstr "" "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi " "drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)" -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3125,14 +3146,14 @@ msgstr "" "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi " "drwsio'r pecyn hyn a law." -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s." -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "Camgyfatebiaeth maint" @@ -3184,7 +3205,7 @@ msgstr "" msgid "Stored label: %s\n" msgstr "" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "CD Anghywir" @@ -3245,31 +3266,31 @@ msgstr "" msgid "Copying package lists..." msgstr "Yn Darllen Rhestrau Pecynnau" -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 #, fuzzy msgid "Writing new source list\n" msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/da.po b/po/da.po index b9094b081..7a71876aa 100644 --- a/po/da.po +++ b/po/da.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2012-07-03 23:51+0200\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" @@ -98,75 +98,75 @@ msgstr "Total plads, der kan gøres rede for: " msgid "Package file %s is out of sync." msgstr "Pakkefilen %s er ude af trit." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Fandt ingen pakker" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1243 msgid "You must give at least one search pattern" msgstr "Du skal angive mindst ét søgemønster" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" "Denne kommando er forældet. Brug venligst »apt-mark showauto« i stedet for." -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Kunne ikke lokalisere pakken %s" # Overskriften til apt-cache policy, # forkorter "Package" væk. CH -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1526 msgid "Package files:" msgstr "Pakkefiler:" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Mellemlageret er ude af trit, kan ikke krydsreferere en pakkefil" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1547 msgid "Pinned packages:" msgstr "»Pinned« pakker:" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "(ikke fundet)" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr " Installeret: " -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr " Kandidat: " -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "(ingen)" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr " Pakke-pin: " #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr " Versionstabel:" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s for %s kompileret på %s %s\n" -#: cmdline/apt-cache.cc:1690 +#: cmdline/apt-cache.cc:1730 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -236,21 +236,29 @@ msgstr "" " -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n" "Se manualsiderne for apt-cache(8) og apt.conf(5) for flere oplysninger.\n" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "" "Angiv venligst et navn for denne disk, som f.eks. »Debian 5.0.3 Disk 1«" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" msgstr "Indsæt en disk i drevet og tryk retur" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Kunne ikke montere %s til %s" -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Gentag processen for resten af cd'erne i dit sæt." @@ -488,7 +496,7 @@ msgstr "Geninstallering af %s er ikke mulig, da den ikke kan hentes.\n" msgid "%s is already the newest version.\n" msgstr "%s er i forvejen den nyeste version.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s sat til manuelt installeret.\n" @@ -595,8 +603,8 @@ msgstr "Efter denne handling, vil %sB yderligere diskplads være brugt.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Efter denne handling, vil %sB diskplads blive frigjort.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunne ikke bestemme ledig plads i %s" @@ -635,7 +643,7 @@ msgstr "Afbryder." msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortsætte [J/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Kunne ikke hente %s %s\n" @@ -644,7 +652,7 @@ msgstr "Kunne ikke hente %s %s\n" msgid "Some files failed to download" msgstr "Nedhentningen af filer mislykkedes" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "Nedhentning afsluttet i 'hent-kun'-tilstand" @@ -730,7 +738,7 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 msgid "The following information may help to resolve the situation:" msgstr "Følgende oplysninger kan hjælpe dig med at klare situationen:" @@ -780,7 +788,7 @@ msgstr "" "Uopfyldte afhængigheder. Prøv 'apt-get -f install' uden pakker (eller angiv " "en løsning)." -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1973 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" @@ -791,33 +799,33 @@ msgstr "" "en umulig situation eller bruger den ustabile distribution, hvor enkelte\n" "pakker endnu ikke er lavet eller gjort tilgængelige." -#: cmdline/apt-get.cc:1995 +#: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "Ødelagte pakker" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2020 msgid "The following extra packages will be installed:" msgstr "Følgende yderligere pakker vil blive installeret:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "Foreslåede pakker:" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "Anbefalede pakker:" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "Kunne ikke finde pakken %s" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s sat til automatisk installation.\n" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -825,46 +833,46 @@ msgstr "" "Denne kommando er forældet. Brug venligst »apt-mark auto« og »apt-mark " "manual« i stedet for." -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2184 msgid "Calculating upgrade... " msgstr "Beregner opgraderingen... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Mislykkedes" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2192 msgid "Done" msgstr "Færdig" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 msgid "Internal error, problem resolver broke stuff" msgstr "Intern fejl. Problemløseren ødelagde noget" -#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "Kunne ikke låse nedhentningsmappen" -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Kan ikke finde en kilde til at hente version »%s« for »%s«" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "Henter %s %s" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2452 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:2493 cmdline/apt-get.cc:2805 +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, c-format msgid "Unable to find a source package for %s" msgstr "Kunne ikke finde kildetekstpakken for %s" -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -873,7 +881,7 @@ msgstr "" "BEMÆRK: Pakning af '%s' vedligeholdes i versionskontrolsystemet '%s' på:\n" "%s\n" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2514 #, c-format msgid "" "Please use:\n" @@ -884,68 +892,68 @@ msgstr "" "bzr branch %s\n" "for at hente de seneste (muligvis ikke udgivet) opdateringer til pakken.\n" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2567 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Overspringer allerede hentet fil '%s'\n" -#: cmdline/apt-get.cc:2605 +#: cmdline/apt-get.cc:2604 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikke nok ledig plads i %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2613 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB/%sB skal hentes fra kildetekst-arkiverne.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2618 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB skal hentes fra kildetekst-arkiverne.\n" -#: cmdline/apt-get.cc:2625 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" msgstr "Henter kildetekst %s\n" -#: cmdline/apt-get.cc:2663 +#: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "Nogle arkiver kunne ikke hentes." -#: cmdline/apt-get.cc:2694 +#: cmdline/apt-get.cc:2693 #, 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:2706 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Udpakningskommandoen '%s' fejlede.\n" -#: cmdline/apt-get.cc:2707 +#: cmdline/apt-get.cc:2706 #, 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:2729 +#: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "Opbygningskommandoen '%s' fejlede.\n" -#: cmdline/apt-get.cc:2749 +#: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "Barneprocessen fejlede" -#: cmdline/apt-get.cc:2768 +#: cmdline/apt-get.cc:2767 msgid "Must specify at least one package to check builddeps for" msgstr "Skal angive mindst én pakke at tjekke opbygningsafhængigheder for" -#: cmdline/apt-get.cc:2793 +#: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -954,17 +962,17 @@ msgstr "" "Ingen arkitekturinformation tilgængelig for %s. Se apt.conf(5) APT::" "Architectures for opsætning" -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kunne ikke hente oplysninger om opbygningsafhængigheder for %s" -#: cmdline/apt-get.cc:2840 +#: cmdline/apt-get.cc:2839 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen opbygningsafhængigheder.\n" -#: cmdline/apt-get.cc:3010 +#: cmdline/apt-get.cc:3009 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -972,7 +980,7 @@ msgid "" msgstr "" "Afhængigheden %s for %s kan ikke opfyldes, da %s ikke er tilladt på '%s'" -#: cmdline/apt-get.cc:3028 +#: cmdline/apt-get.cc:3027 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -980,14 +988,14 @@ msgid "" msgstr "" "Afhængigheden %s for %s kan ikke opfyldes, da pakken %s ikke blev fundet" -#: cmdline/apt-get.cc:3051 +#: cmdline/apt-get.cc:3050 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Kunne ikke opfylde %s-afhængigheden for %s: Den installerede pakke %s er for " "ny" -#: cmdline/apt-get.cc:3090 +#: cmdline/apt-get.cc:3089 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -996,7 +1004,7 @@ msgstr "" "Afhængigheden %s for %s kan ikke opfyldes, da ingen af de tilgængelige " "kandidater for pakken %s kan tilfredsstille versionskravene" -#: cmdline/apt-get.cc:3096 +#: cmdline/apt-get.cc:3095 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1005,30 +1013,30 @@ msgstr "" "%s-afhængigheden for %s kan ikke opfyldes, da pakken %s ikke har en " "kandidatversion" -#: cmdline/apt-get.cc:3119 +#: cmdline/apt-get.cc:3118 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Kunne ikke opfylde %s-afhængigheden for %s: %s" -#: cmdline/apt-get.cc:3135 +#: cmdline/apt-get.cc:3133 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Opbygningsafhængigheden for %s kunne ikke opfyldes." -#: cmdline/apt-get.cc:3140 +#: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "Kunne ikke behandler opbygningsafhængighederne" -#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, c-format msgid "Changelog for %s (%s)" msgstr "Ændringslog for %s (%s)" -#: cmdline/apt-get.cc:3368 +#: cmdline/apt-get.cc:3366 msgid "Supported modules:" msgstr "Understøttede moduler:" -#: cmdline/apt-get.cc:3409 +#: cmdline/apt-get.cc:3407 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1116,7 +1124,7 @@ msgstr "" "for flere oplysninger og tilvalg.\n" " Denne APT har »Super Cow Powers«.\n" -#: cmdline/apt-get.cc:3574 +#: cmdline/apt-get.cc:3572 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1191,7 +1199,7 @@ msgid "%s was already not hold.\n" msgstr "%s var allerede ikke i bero.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" @@ -1350,8 +1358,8 @@ msgstr "Tidsudløb på forbindelsen" msgid "Server closed the connection" msgstr "Serveren lukkede forbindelsen" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 +#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 msgid "Read error" msgstr "Læsefejl" @@ -1364,8 +1372,8 @@ msgid "Protocol corruption" msgstr "Protokolfejl" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 +#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 msgid "Write error" msgstr "Skrivefejl" @@ -1508,30 +1516,38 @@ msgstr "Der skete noget underligt under opløsning af '%s:%s' (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Kunne ikke forbinde til %s:%s:" -#: methods/gpgv.cc:169 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Intern fejl: Gyldig signatur, men kunne ikke afgøre nøgle-fingeraftryk?!" -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Stødte på mindst én ugyldig signatur." -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Kunne ikke køre 'gpgv' for at verificere signaturen (er gpgv installeret?)" -#: methods/gpgv.cc:183 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Ukendt fejl ved kørsel af gpgv" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Følgende signaturer var ugyldige:\n" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1615,8 +1631,8 @@ msgstr "Intern fejl" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1645,7 +1661,12 @@ msgstr "Ingen spejlfil »%s« fundet " msgid "Can not read mirror file '%s'" msgstr "Kan ikke læse spejlfil »%s«" -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "Kan ikke læse spejlfil »%s«" + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "[Spejl: %s]" @@ -1744,7 +1765,7 @@ msgstr "" " -c=? Læs denne opsætningsfil\n" " -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Kunne ikke skrive til %s" @@ -2116,23 +2137,23 @@ msgstr "" " -c=? Læs denne opsætningsfil\n" " -o=? Angiv en opsætningsindstilling. F.eks. -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "Kunne ikke oprette videreførsler" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "Kunne ikke udføre gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "Ødelagt arkiv" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "Tar-tjeksum fejlede, arkivet er ødelagt" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Ukendt TAR-hovedtype %u, element %s" @@ -2357,7 +2378,7 @@ msgstr "%limin %lis" msgid "%lis" msgstr "%lis" -#: apt-pkg/contrib/strutl.cc:1172 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "Det valgte %s blev ikke fundet" @@ -2497,111 +2518,111 @@ msgstr "Kunne ikke finde cdrommen" msgid "Problem closing the gzip file %s" msgstr "Problem under lukning af gzip-filen %s" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Benytter ikke låsning for skrivebeskyttet låsefil %s" -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "Kunne ikke åbne låsefilen %s" -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:249 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Benytter ikke låsning for nfs-monteret låsefil %s" -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "Kunne ikke opnå låsen %s" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "Liste over filer kan ikke oprettes da »%s« ikke er en mappe" -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "Ignorerer »%s« i mappe »%s« da det ikke er en regulær fil" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "Ignorerer fil »%s« i mappe »%s« da den ikke har en filendelse" -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "Ignorerer fil »%s« i mappe »%s« da den har en ugyldig filendelse" -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Underprocessen %s modtog en segmenteringsfejl." -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:843 #, c-format msgid "Sub-process %s received signal %u." msgstr "Underprocessen %s modtog en signal %u." -#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Underprocessen %s returnerede en fejlkode (%u)" -#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Underprocessen %s afsluttedes uventet" -#: apt-pkg/contrib/fileutl.cc:984 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Could not open file %s" msgstr "Kunne ikke åbne filen %s" -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1062 #, c-format msgid "Could not open file descriptor %d" msgstr "Kunne ikke åbne filbeskrivelse %d" -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "Kunne ikke oprette underproces IPC" -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " msgstr "Kunne ikke udføre komprimeringsprogram " -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1297 #, c-format msgid "read, still have %llu to read but none left" msgstr "læs, mangler stadig at læse %llu men der er ikke flere" -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "skriv, mangler stadig at skrive %llu men kunne ikke" -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1681 #, c-format msgid "Problem closing the file %s" msgstr "Problem under lukning af filen %s" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1693 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problem under omdøbning af filen %s til %s" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1704 #, c-format msgid "Problem unlinking the file %s" msgstr "Fejl ved frigivelse af filen %s" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1717 msgid "Problem syncing the file" msgstr "Problem under synkronisering af fil" @@ -2798,7 +2819,7 @@ msgstr "Ugyldig linje %u i kildelisten %s (type)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen '%s' er ukendt på linje %u i kildelisten %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2807,12 +2828,12 @@ msgstr "" "Kunne ikke udføre øjeblikkelig konfiguration på »%s«. Se venligst man 5 apt." "conf under APT:Immediate-Cinfigure for detaljer. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, c-format msgid "Could not configure '%s'. " msgstr "Kunne ikke åbne filen »%s«. " -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2849,7 +2870,7 @@ msgid "Unable to correct problems, you have held broken packages." msgstr "" "Kunne ikke korrigere problemerne, da du har tilbageholdt ødelagte pakker." -#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 +#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2857,7 +2878,7 @@ msgstr "" "Nogle indeksfiler kunne ikke hentes. De er blevet ignoreret eller de gamle " "bruges i stedet." -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, c-format msgid "List directory %spartial is missing." msgstr "Listemappen %spartial mangler." @@ -2959,14 +2980,14 @@ msgstr "Mellemlageret benytter en inkompatibel versionsstyring" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 -#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 -#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 -#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 -#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 -#: apt-pkg/pkgcachegen.cc:561 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Der opstod en fejl under behandlingen af %s (%s%d)" @@ -2989,26 +3010,26 @@ msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Hold da op! Du nåede over det antal afhængigheder, denne APT kan håndtere." -#: apt-pkg/pkgcachegen.cc:568 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Pakken %s %s blev ikke fundet under behandlingen af filafhængigheder" -#: apt-pkg/pkgcachegen.cc:1197 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kunne ikke finde kildepakkelisten %s" -#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 -#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" msgstr "Indlæser pakkelisterne" -#: apt-pkg/pkgcachegen.cc:1302 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "Samler filudbud" -#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "IO-fejl ved gemning af kilde-mellemlageret" @@ -3021,12 +3042,12 @@ msgstr "omdøbning mislykkedes, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "MD5Sum stemmer ikke" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 msgid "Hash Sum mismatch" msgstr "Hashsum stemmer ikke" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3035,17 +3056,17 @@ msgstr "" "Kunne ikke finde uventet punkt »%s« i udgivelsesfil (forkert sources.list-" "punkt eller forkert udformet fil)" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Kunne ikke finde hashsum for »%s« i udgivelsesfilen" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Der er ingen tilgængelige offentlige nøgler for følgende nøgle-ID'er:\n" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3054,12 +3075,12 @@ msgstr "" "Udgivelsesfil for %s er udløbet (ugyldig siden %s). Opdateringer for dette " "arkiv vil ikke blive anvendt." -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konfliktdistribution: %s (forventede %s men fik %s)" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3069,12 +3090,12 @@ msgstr "" "og den forrige indeksfil vil blive brugt. GPG-fejl: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-fejl: %s: %s" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3083,7 +3104,7 @@ msgstr "" "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er " "nødt til manuelt at reparere denne pakke. (grundet manglende arch)" -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3092,13 +3113,13 @@ msgstr "" "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er " "nødt til manuelt at reparere denne pakke." -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Pakkeindeksfilerne er i stykker. Intet 'Filename:'-felt for pakken %s." -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "Størrelsen stemmer ikke" @@ -3150,7 +3171,7 @@ msgstr "Identificerer.. " msgid "Stored label: %s\n" msgstr "Gemt mærkat: %s \n" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 msgid "Unmounting CD-ROM...\n" msgstr "Afmonterer cdrom...\n" @@ -3214,30 +3235,30 @@ msgstr "" msgid "Copying package lists..." msgstr "Kopierer pakkelisterne..." -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "Skriver ny kildeliste\n" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "Denne disk har følgende kildeliste-indgange:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "Skrev %i poster.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Skrev %i poster med %i manglende filer.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Skrev %i poster med %i ikke-trufne filer\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Skrev %i poster med %i manglende filer og %i ikke-trufne filer\n" diff --git a/po/de.po b/po/de.po index 9dd4a208d..2635b26de 100644 --- a/po/de.po +++ b/po/de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.2\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2012-06-27 10:55+0200\n" "Last-Translator: Holger Wansing \n" "Language-Team: Debian German \n" @@ -98,76 +98,76 @@ msgstr "Gesamtmenge an Speicher: " msgid "Package file %s is out of sync." msgstr "Paketdatei %s ist nicht synchronisiert." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Keine Pakete gefunden" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1243 msgid "You must give at least one search pattern" msgstr "Sie müssen mindestens ein Suchmuster angeben" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" "Dieser Befehl ist überholt. Bitte verwenden Sie stattdessen »apt-mark " "showauto«." -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Paket %s kann nicht gefunden werden." -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1526 msgid "Package files:" msgstr "Paketdateien:" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Zwischenspeicher ist nicht synchron, Querverweisen einer Paketdatei nicht " "möglich" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1547 msgid "Pinned packages:" msgstr "Mit Pinning verwaltete Pakete:" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "(nicht gefunden)" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr " Installiert: " -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr " Installationskandidat: " -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "(keine)" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr " Paket-Pinning: " #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr " Versionstabelle:" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s für %s, kompiliert am %s %s\n" -#: cmdline/apt-cache.cc:1690 +#: cmdline/apt-cache.cc:1730 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -238,24 +238,32 @@ msgstr "" "Weitere Informationen finden Sie in den Handbuchseiten von apt-cache(8)\n" "und apt.conf(5).\n" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "" "Bitte geben Sie einen Namen für dieses Medium an, wie zum Beispiel »Debian " "5.0.3 Disk 1«" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" msgstr "" "Bitte legen Sie ein Medium in das Laufwerk ein und drücken Sie die " "Eingabetaste (Enter)." -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "»%s« konnte nicht in »%s« eingebunden werden." -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" "Wiederholen Sie dieses Prozedere für die restlichen Disks Ihres Satzes." @@ -499,7 +507,7 @@ msgstr "" msgid "%s is already the newest version.\n" msgstr "%s ist schon die neueste Version.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s wurde als manuell installiert festgelegt.\n" @@ -608,8 +616,8 @@ 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:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 #, c-format msgid "Couldn't determine free space in %s" msgstr "Freier Platz in %s konnte nicht bestimmt werden." @@ -648,7 +656,7 @@ msgstr "Abbruch." msgid "Do you want to continue [Y/n]? " msgstr "Möchten Sie fortfahren [J/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Fehlschlag beim Holen von %s %s\n" @@ -657,7 +665,7 @@ msgstr "Fehlschlag beim Holen von %s %s\n" msgid "Some files failed to download" msgstr "Einige Dateien konnten nicht heruntergeladen werden." -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "Herunterladen abgeschlossen; Nur-Herunterladen-Modus aktiv" @@ -743,7 +751,7 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 msgid "The following information may help to resolve the situation:" msgstr "" "Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:" @@ -797,7 +805,7 @@ msgstr "" "Unerfüllte Abhängigkeiten. Versuchen Sie »apt-get -f install« ohne Angabe " "eines Pakets (oder geben Sie eine Lösung an)." -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1973 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" @@ -809,33 +817,33 @@ msgstr "" "Unstable-Distribution verwenden, dass einige erforderliche Pakete noch\n" "nicht erstellt wurden oder Incoming noch nicht verlassen haben." -#: cmdline/apt-get.cc:1995 +#: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "Beschädigte Pakete" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2020 msgid "The following extra packages will be installed:" msgstr "Die folgenden zusätzlichen Pakete werden installiert:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "Vorgeschlagene Pakete:" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "Empfohlene Pakete:" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "Paket %s konnte nicht gefunden werden" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s wurde als automatisch installiert festgelegt.\n" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -843,50 +851,50 @@ msgstr "" "Dieser Befehl ist überholt. Bitte verwenden Sie stattdessen »apt-mark auto« " "und »apt-mark manual«." -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2184 msgid "Calculating upgrade... " msgstr "Paketaktualisierung (Upgrade) wird berechnet... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Fehlgeschlagen" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2192 msgid "Done" msgstr "Fertig" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 msgid "Internal error, problem resolver broke stuff" msgstr "Interner Fehler, der Problemlöser hat etwas beschädigt." -#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "Das Downloadverzeichnis konnte nicht gesperrt werden." -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" "Es konnte keine Quelle gefunden werden, um Version »%s« von »%s« " "herunterzuladen." -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "Herunterladen von %s %s" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2452 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:2493 cmdline/apt-get.cc:2805 +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, c-format msgid "Unable to find a source package for %s" msgstr "Quellpaket für %s kann nicht gefunden werden." -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -896,7 +904,7 @@ msgstr "" "auf:\n" "%s\n" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2514 #, c-format msgid "" "Please use:\n" @@ -908,70 +916,70 @@ msgstr "" "um die neuesten (möglicherweise noch unveröffentlichten) Aktualisierungen\n" "für das Paket abzurufen.\n" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2567 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Bereits heruntergeladene Datei »%s« wird übersprungen.\n" -#: cmdline/apt-get.cc:2605 +#: cmdline/apt-get.cc:2604 #, c-format msgid "You don't have enough free space in %s" msgstr "Sie haben nicht genügend freien Speicherplatz in %s." #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2613 #, 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" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2618 #, 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:2625 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" msgstr "Quelle %s wird heruntergeladen.\n" -#: cmdline/apt-get.cc:2663 +#: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "Einige Archive konnten nicht heruntergeladen werden." -#: cmdline/apt-get.cc:2694 +#: cmdline/apt-get.cc:2693 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Das Entpacken der bereits entpackten Quelle in %s wird übersprungen.\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Entpackbefehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:2707 +#: cmdline/apt-get.cc:2706 #, 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:2729 +#: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build-Befehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:2749 +#: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "Kindprozess fehlgeschlagen" -#: cmdline/apt-get.cc:2768 +#: cmdline/apt-get.cc:2767 msgid "Must specify at least one package to check builddeps for" msgstr "" "Es muss mindestens ein Paket angegeben werden, dessen Bauabhängigkeiten " "überprüft werden sollen." -#: cmdline/apt-get.cc:2793 +#: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -980,18 +988,18 @@ msgstr "" "Keine Architekturinformation für %s verfügbar. Weiteres zur Einrichtung " "finden Sie unter apt.conf(5) APT::Architectures." -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Informationen zu Bauabhängigkeiten für %s konnten nicht gefunden werden." -#: cmdline/apt-get.cc:2840 +#: cmdline/apt-get.cc:2839 #, c-format msgid "%s has no build depends.\n" msgstr "%s hat keine Bauabhängigkeiten.\n" -#: cmdline/apt-get.cc:3010 +#: cmdline/apt-get.cc:3009 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -1000,7 +1008,7 @@ msgstr "" "»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da %s bei »%s«-Paketen " "nicht erlaubt ist." -#: cmdline/apt-get.cc:3028 +#: cmdline/apt-get.cc:3027 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1009,14 +1017,14 @@ msgstr "" "»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da Paket %s nicht " "gefunden werden kann." -#: cmdline/apt-get.cc:3051 +#: cmdline/apt-get.cc:3050 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "»%s«-Abhängigkeit für %s kann nicht erfüllt werden: Installiertes Paket %s " "ist zu neu." -#: cmdline/apt-get.cc:3090 +#: cmdline/apt-get.cc:3089 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1026,7 +1034,7 @@ msgstr "" "Installationskandidaten für das Paket %s die Versionsanforderungen nicht " "erfüllen kann." -#: cmdline/apt-get.cc:3096 +#: cmdline/apt-get.cc:3095 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1035,30 +1043,30 @@ msgstr "" "»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da für Paket %s kein " "Installationskandidat existiert." -#: cmdline/apt-get.cc:3119 +#: cmdline/apt-get.cc:3118 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "»%s«-Abhängigkeit für %s konnte nicht erfüllt werden: %s" -#: cmdline/apt-get.cc:3135 +#: cmdline/apt-get.cc:3133 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Bauabhängigkeiten für %s konnten nicht erfüllt werden." -#: cmdline/apt-get.cc:3140 +#: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "Verarbeitung der Bauabhängigkeiten fehlgeschlagen" -#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, c-format msgid "Changelog for %s (%s)" msgstr "Änderungsprotokoll (Changelog) für %s (%s)" -#: cmdline/apt-get.cc:3368 +#: cmdline/apt-get.cc:3366 msgid "Supported modules:" msgstr "Unterstützte Module:" -#: cmdline/apt-get.cc:3409 +#: cmdline/apt-get.cc:3407 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1153,7 +1161,7 @@ msgstr "" "bezüglich weitergehender Informationen und Optionen.\n" " Dieses APT hat Super-Kuh-Kräfte.\n" -#: cmdline/apt-get.cc:3574 +#: cmdline/apt-get.cc:3572 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1230,7 +1238,7 @@ msgid "%s was already not hold.\n" msgstr "Die Halten-Markierung für %s wurde bereits entfernt.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" @@ -1392,8 +1400,8 @@ msgstr "Zeitüberschreitung der Verbindung" msgid "Server closed the connection" msgstr "Verbindung durch Server geschlossen" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 +#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 msgid "Read error" msgstr "Lesefehler" @@ -1406,8 +1414,8 @@ msgid "Protocol corruption" msgstr "Protokoll beschädigt" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 +#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 msgid "Write error" msgstr "Schreibfehler" @@ -1554,32 +1562,40 @@ msgstr "Beim Auflösen von »%s:%s« ist etwas Schlimmes passiert (%i - %s)." msgid "Unable to connect to %s:%s:" msgstr "Verbindung mit %s:%s nicht möglich:" -#: methods/gpgv.cc:169 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Interner Fehler: Gültige Signatur, Fingerabdruck des Schlüssels konnte " "jedoch nicht ermittelt werden?!" -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Mindestens eine ungültige Signatur wurde entdeckt." -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "»gpgv« konnte zur Überprüfung der Signatur nicht ausgeführt werden (ist gpgv " "installiert?)" -#: methods/gpgv.cc:183 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Unbekannter Fehler beim Ausführen von gpgv" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Die folgenden Signaturen waren ungültig:\n" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1668,8 +1684,8 @@ msgstr "Interner Fehler" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1698,7 +1714,12 @@ msgstr "Keine Datei von Spiegelserver »%s« gefunden" msgid "Can not read mirror file '%s'" msgstr "Datei »%s« von Spiegelserver kann nicht gelesen werden." -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "Datei »%s« von Spiegelserver kann nicht gelesen werden." + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "[Spiegelserver: %s]" @@ -1797,7 +1818,7 @@ msgstr "" " -c=? Diese Konfigurationsdatei lesen\n" " -o=? Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Schreiben nach %s nicht möglich" @@ -2178,23 +2199,23 @@ msgstr "" " -c=? Diese Konfigurationsdatei lesen\n" " -o=? Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "Pipes (Weiterleitungen) konnten nicht erzeugt werden." -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "gzip konnte nicht ausgeführt werden." -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "Beschädigtes Archiv" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "Tar-Prüfsumme fehlgeschlagen, Archiv beschädigt" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Unbekannter Tar-Kopfzeilen-Typ %u, Bestandteil %s" @@ -2418,7 +2439,7 @@ msgstr "%li min %li s" msgid "%lis" msgstr "%li s" -#: apt-pkg/contrib/strutl.cc:1172 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "Auswahl %s nicht gefunden" @@ -2561,45 +2582,45 @@ msgstr "CD-ROM mit »stat« abfragen fehlgeschlagen" msgid "Problem closing the gzip file %s" msgstr "Problem beim Schließen der gzip-Datei %s" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Es wird keine Sperre für schreibgeschützte Sperrdatei %s verwendet." -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "Sperrdatei %s konnte nicht geöffnet werden." -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:249 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Es wird keine Sperre für per NFS eingebundene Sperrdatei %s verwendet." -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "Konnte Sperre %s nicht bekommen" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "Dateiliste kann nicht erstellt werden, da »%s« kein Verzeichnis ist." -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" "»%s« in Verzeichnis »%s« wird ignoriert, da es keine reguläre Datei ist." -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" "Datei »%s« in Verzeichnis »%s« wird ignoriert, da sie keine Dateinamen-" "Erweiterung hat." -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" @@ -2607,74 +2628,74 @@ msgstr "" "Datei »%s« in Verzeichnis »%s« wird ignoriert, da sie eine ungültige " "Dateinamen-Erweiterung hat." -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Unterprozess %s hat einen Speicherzugriffsfehler empfangen." -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:843 #, c-format msgid "Sub-process %s received signal %u." msgstr "Unterprozess %s hat das Signal %u empfangen." -#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Unterprozess %s hat Fehlercode zurückgegeben (%u)" -#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Unterprozess %s unerwartet beendet" -#: apt-pkg/contrib/fileutl.cc:984 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Could not open file %s" msgstr "Datei %s konnte nicht geöffnet werden." -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1062 #, c-format msgid "Could not open file descriptor %d" msgstr "Datei-Deskriptor %d konnte nicht geöffnet werden." -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "" "Interprozesskommunikation mit Unterprozess konnte nicht aufgebaut werden." -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " msgstr "Fehler beim Ausführen von Komprimierer " -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1297 #, c-format msgid "read, still have %llu to read but none left" msgstr "" "Lesevorgang: es verbleiben noch %llu zu lesen, jedoch ist nichts mehr übrig." -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "" "Schreibvorgang: es verbleiben noch %llu zu schreiben, Schreiben ist jedoch " "nicht möglich." -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1681 #, c-format msgid "Problem closing the file %s" msgstr "Problem beim Schließen der Datei %s" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1693 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problem beim Umbenennen der Datei %s nach %s" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1704 #, c-format msgid "Problem unlinking the file %s" msgstr "Problem beim Entfernen (unlink) der Datei %s" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1717 msgid "Problem syncing the file" msgstr "Problem beim Synchronisieren der Datei" @@ -2873,7 +2894,7 @@ msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ »%s« in Zeile %u der Quellliste %s ist unbekannt." -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2882,12 +2903,12 @@ msgstr "" "»%s« konnte nicht unmittelbar konfiguriert werden. Lesen Sie »man 5 apt." "conf« unter APT::Immediate-Configure bezüglich weiterer Details. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, c-format msgid "Could not configure '%s'. " msgstr "»%s« konnte nicht konfiguriert werden. " -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2926,7 +2947,7 @@ msgstr "" "Probleme können nicht korrigiert werden, Sie haben zurückgehaltene defekte " "Pakete." -#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 +#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2934,7 +2955,7 @@ msgstr "" "Einige Indexdateien konnten nicht heruntergeladen werden. Sie wurden " "ignoriert oder alte an ihrer Stelle benutzt." -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, c-format msgid "List directory %spartial is missing." msgstr "Listenverzeichnis %spartial fehlt." @@ -3043,14 +3064,14 @@ msgstr "Zwischenspeicher hat ein inkompatibles Versionssystem." #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 -#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 -#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 -#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 -#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 -#: apt-pkg/pkgcachegen.cc:561 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Fehler aufgetreten beim Verarbeiten von %s (%s%d)" @@ -3079,27 +3100,27 @@ msgstr "" "Na so was, Sie haben die Anzahl an Abhängigkeiten überschritten, mit denen " "diese APT-Version umgehen kann." -#: apt-pkg/pkgcachegen.cc:568 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Paket %s %s wurde beim Verarbeiten der Dateiabhängigkeiten nicht gefunden." -#: apt-pkg/pkgcachegen.cc:1197 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "Die Quellpaket-Liste %s konnte nicht mit »stat« abgefragt werden" -#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 -#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" msgstr "Paketlisten werden gelesen" -#: apt-pkg/pkgcachegen.cc:1302 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "Sammeln der angebotenen Funktionalitäten (Provides) aus den Dateien" -#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "E/A-Fehler beim Speichern des Quell-Zwischenspeichers" @@ -3112,12 +3133,12 @@ msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "MD5-Summe stimmt nicht überein" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 msgid "Hash Sum mismatch" msgstr "Hash-Summe stimmt nicht überein" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3126,17 +3147,17 @@ msgstr "" "Erwarteter Eintrag »%s« konnte in Release-Datei nicht gefunden werden " "(falscher Eintrag in sources.list oder missgebildete Datei)." -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Hash-Summe für »%s« kann in Release-Datei nicht gefunden werden." -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Es gibt keine öffentlichen Schlüssel für die folgenden Schlüssel-IDs:\n" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3145,12 +3166,12 @@ msgstr "" "Release-Datei für %s ist abgelaufen (ungültig seit %s). Aktualisierungen für " "dieses Depot werden nicht angewendet." -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konflikt bei Distribution: %s (%s erwartet, aber %s bekommen)" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3161,12 +3182,12 @@ msgstr "" "GPG-Fehler: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-Fehler: %s: %s" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3176,7 +3197,7 @@ msgstr "" "Sie dieses Paket von Hand korrigieren müssen (aufgrund fehlender " "Architektur)." -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3185,14 +3206,14 @@ msgstr "" "Es konnte keine Datei für Paket %s gefunden werden. Das könnte heißen, dass " "Sie dieses Paket von Hand korrigieren müssen." -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Die Paketindexdateien sind beschädigt: Kein Filename:-Feld für Paket %s." -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "Größe stimmt nicht überein" @@ -3244,7 +3265,7 @@ msgstr "Identifizieren ... " msgid "Stored label: %s\n" msgstr "Gespeicherte Kennzeichnung: %s\n" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 msgid "Unmounting CD-ROM...\n" msgstr "Einbindung der CD-ROM wird gelöst ...\n" @@ -3308,30 +3329,30 @@ msgstr "" msgid "Copying package lists..." msgstr "Kopieren der Paketlisten ..." -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "Schreiben der neuen Quellliste\n" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "Quelllisteneinträge für dieses Medium sind:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "Es wurden %i Datensätze geschrieben.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Es wurden %i Datensätze mit %i fehlenden Dateien geschrieben.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Es wurden %i Datensätze mit %i nicht passenden Dateien geschrieben.\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/dz.po b/po/dz.po index 0215f21be..fbe317285 100644 --- a/po/dz.po +++ b/po/dz.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po.pot\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2006-09-19 09:49+0530\n" "Last-Translator: Kinley Tshering \n" "Language-Team: Dzongkha \n" @@ -100,74 +100,74 @@ msgstr "གི་དོན་ལུ་རྩིས་ཐོ་བཏོན་ཡ msgid "Package file %s is out of sync." msgstr "ཐུམ་སྒྲིལ་ཡིག་སྣོད་ %sའདི་མཉམ་འབྱུང་གི་ཕྱི་ཁར་ཨིན་པས།" -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "ཐུམ་སྒྲིལ་ཚུ་མ་ཐོབ།" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1243 #, fuzzy msgid "You must give at least one search pattern" msgstr "ཁྱོད་ཀྱིས་ཏག་ཏག་སྦེ་དཔེ་གཞི་གཅིག་བྱིན་དགོ" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "%sཐུམ་སྒྲིལ་འདི་ག་ཡོད་ཟཚོལ་མ་ཐོབ།" -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1526 msgid "Package files:" msgstr "ཐུམ་སྒྲིལ་གྱི་ཡིག་སྣོད:" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "འདྲ་མཛོད་འདི་མཉམ་བྱུང་གི་ཕྱི་ཁར་ཨིན་པས་ ཐུམ་སྒྲིལ་ཡིག་སྣོད་ཅིག་ལུ་ ཨེགསི་-རེཕ་འབད་མི་ཚུགས་པས།" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1547 msgid "Pinned packages:" msgstr "ཁབ་གཟེར་བཏབ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "(མ་ཐོབ།)" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr "གཞི་བཙུགས་འབད་ཡོདཔ།" -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr "མི་ངོ:" -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "(ཅི་མེད།)" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr "ཐུམ་སྒྲིལ་གྱི་ཁབ་གཟེར:" #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr "ཐོན་རིམ་ཐིག་ཁྲམ།:" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s་གི་དོན་ལུ་%s %sགུར་ཕྱོགས་སྒྲིག་འབད་ཡོད་པའི་%s %s\n" -#: cmdline/apt-cache.cc:1690 +#: cmdline/apt-cache.cc:1730 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -242,21 +242,29 @@ msgstr "" "cache=/tmp\n" " ཧེང་བཀལ་བརྡ་དོན་གི་དོན་ལུ་ ཨེ་apt-cache(8)དང་apt.conf(5)ལག་ཐོག་ཤོག་ལེབ་ཚུ་བལྟ།.\n" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 #, fuzzy msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "ཌིསིཀ་འདི་གི་དོན་ལུ་མིང་ཅིག་བླིན་གནང་ དཔེར་ན་ 'Debian 2.1r1 Disk 1'བཟུམ།" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" msgstr "ཌིསིཀ་ཅིག་འདྲེན་འཕྲུལ་ནང་བཙུགས་བཞིནམ་ལས་ལོག་ལྡེ་འདི་ཨེབ།" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "ཁྱོད་ཀྱི་ཆ་ཚན་ནང་གི་སི་ཌི་ལྷག་ལུས་ཡོད་མི་གི་དོན་ལུ་འ་ནི་ལས་སྦྱོར་དེ་ཡང་བསྐྱར་འབད།" @@ -494,7 +502,7 @@ msgstr "%s ་ལོག་གཞི་བཙུགས་འབད་ནི་འ msgid "%s is already the newest version.\n" msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རིམ་གསར་ཤོས་ཅིག་ཨིན།\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།" @@ -605,8 +613,8 @@ msgstr "ཁ་སྐོང་གི་%sB་འདི་བཤུབ་པའི msgid "After this operation, %sB disk space will be freed.\n" msgstr "%sB་འདི་ཤུབ་པའི་ཤུལ་ལས་ཀྱི་བར་སྟོང་དེ་དལཝ་སྦེ་ལུས་འོང་།\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s་ནང་བར་སྟོང་" @@ -645,7 +653,7 @@ msgstr "བར་བཤོལ་འབད།" msgid "Do you want to continue [Y/n]? " msgstr "ཁྱོན་ཀྱི་འཕྲོ་མཐུད་ནི་འབད་ནི་ཨིན་ན་[Y/n]?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n" @@ -654,7 +662,7 @@ msgstr "%s %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བ msgid "Some files failed to download" msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "ཕབ་ལེན་ཐབས་ལམ་རྐྱངམ་གཅིག་ནང་མཇུག་བསྡུཝ་སྦེ་རང་ཕབ་ལེན་འབད།" @@ -732,7 +740,7 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 msgid "The following information may help to resolve the situation:" msgstr "འོག་གི་བརྡ་དོན་དེ་གིས་དུས་སྐབས་འདི་མོས་མཐུན་བཟོ་ནི་ལུ་གྲོགས་རམ་འབད་འོང་:" @@ -781,7 +789,7 @@ msgstr "" "མ་ཚང་བའི་རྟེན་འབྲེལ་ ཐུས་སྒྲིལ་མེད་མི་ཚུ་དང་གཅིག་ཁར་ 'apt-get -f install'དེ་འབཐ་རྩོལ་བསྐྱེདཔ།" "(ཡང་ན་ཐབས་ཤེས་ཅིག་གསལ་བཀོད་འབད།)" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1973 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" @@ -792,85 +800,85 @@ msgstr "" "འབད་འབདཝ་འོང་ནི་མས་ ཡང་ན་ད་ལྟོ་ཡང་གསར་བསྐྲུན་མ་འབད་བར་ཡོད་པའི་ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་ཡང་ན་ནང་" "འབྱོར་གྱི་ཕྱི་ཁར་རྩ་བསྐྲད་བཏང་ཡོད་པའི་རྩ་བརྟན་མེད་པའི་བགོ་འགྲེམ་ཚུ་ལག་ལེན་འཐབ་དོ་ཡོདཔ་འོང་ནི་ཨིན་པས།" -#: cmdline/apt-get.cc:1995 +#: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "ཆད་པ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ།" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2020 msgid "The following extra packages will be installed:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཐེབས་ཚུ་གཞི་བཙུགས་འབད་འོང་:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "བསམ་འཆར་བཀོད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "འོས་སྦྱོར་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2184 msgid "Calculating upgrade... " msgstr "ཡར་བསྐྱེད་རྩིས་བཏོན་དོ་... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "འཐུས་ཤོར་བྱུང་ཡོད།" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2192 msgid "Done" msgstr "འབད་ཚར་ཡི།" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 msgid "Internal error, problem resolver broke stuff" msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།" -#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "ཕབ་ལེན་འབད་ནིའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབས་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2452 msgid "Must specify at least one package to fetch source for" msgstr "གི་དོན་ལུ་འབྱུང་ཁུངས་ལེན་ནི་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་ལེན་དགོ" -#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, c-format msgid "Unable to find a source package for %s" msgstr "%s་གི་དོན་ལུ་འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་ཅིག་འཚོལ་མ་འཐོབ" -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2514 #, c-format msgid "" "Please use:\n" @@ -878,106 +886,106 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2567 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "གོམ་འགྱོ་གིས་ཧེ་མ་ལས་རང་'%s'་ཡིག་སྣོད་དེ་ཕབ་ལེན་འབད་ནུག\n" -#: cmdline/apt-get.cc:2605 +#: cmdline/apt-get.cc:2604 #, c-format msgid "You don't have enough free space in %s" msgstr " %s་ནང་ཁྱོད་ལུ་བར་སྟོང་ཚུ་ལངམ་སྦེ་མིན་འདུག་" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2613 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB་ལེན་དགོཔ་འདུག་ འབྱུང་ཁུངས་ཡིག་མཛོད་ཀྱི་%sB།\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2618 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "འབྱུང་ཁུངས་ཡིག་མཛོད་ཚུ་ཀྱི་%sB་ལེན་དགོ་པསས།\n" -#: cmdline/apt-get.cc:2625 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" msgstr "%s་འབྱུང་ཁུངས་ལེན།\n" -#: cmdline/apt-get.cc:2663 +#: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: cmdline/apt-get.cc:2694 +#: cmdline/apt-get.cc:2693 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s་ནང་ཧེ་མ་ལས་སྦུང་ཚན་བཟོ་བཤོལ་ཨིན་མའི་སྦུང་ཚན་བཟོ་བཤོལ་གོམ་འགྱོ་འབད་དོ།\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s'སྦུང་ཚན་བཟོ་བཤོལ་འཐུས་ཤོར་བྱུང་ཡོད།\n" -#: cmdline/apt-get.cc:2707 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n" -#: cmdline/apt-get.cc:2729 +#: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "'%s'་བཟོ་བརྩིགས་བརྡ་བཀོད་འཐུས་ཤོར་བྱུང་ཡོད།\n" -#: cmdline/apt-get.cc:2749 +#: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "ཆ་ལག་ལས་སྦྱོར་དེ་འཐུས་ཤོར་བྱུང་ནུག" -#: cmdline/apt-get.cc:2768 +#: cmdline/apt-get.cc:2767 msgid "Must specify at least one package to check builddeps for" msgstr "builddeps ཞིབ་དཔྱད་འབད་ནིའི་དོན་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་གསལ་བཀོད་འབད་དགོ" -#: cmdline/apt-get.cc:2793 +#: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་བརྡ་དོན་དེ་ལེན་མ་ཚུགས།" -#: cmdline/apt-get.cc:2840 +#: cmdline/apt-get.cc:2839 #, c-format msgid "%s has no build depends.\n" msgstr "%s ལུ་བཟོ་བརྩིགས་རྟེན་འབྲེལ་མིན་འདུག\n" -#: cmdline/apt-get.cc:3010 +#: cmdline/apt-get.cc:3009 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "%sཐུམ་སྒྲིལ་འདི་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:3028 +#: cmdline/apt-get.cc:3027 #, 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:3051 +#: cmdline/apt-get.cc:3050 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%s:གི་དོན་ལུ་%s་རྟེན་འབྲེལ་དེ་གི་རེ་བ་སྐོང་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན་ གཞི་བཙུགས་འབད་ཡོད་པའི་ཐུམ་" "སྒྲིལ་%s་དེ་གནམ་མེད་ས་མེད་གསརཔ་ཨིན་པས།" -#: cmdline/apt-get.cc:3090 +#: cmdline/apt-get.cc:3089 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -986,37 +994,37 @@ msgstr "" "%s གི་དོན་ལུ་%s་རྟེན་འབྲེལ་འདི་གི་རེ་བ་སྐོང་མི་ཚུགས་ནུག་ག་ཅི་འབད་ཟེར་བ་ཅིན་ཐུམ་སྒརིལ་%s་གི་འཐོན་རིམ་" "ཚུ་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་འཐོན་རིམ་དགོས་མཁོ་ཚུ་གི་རེ་བ་དོ་སྐོང་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:3096 +#: cmdline/apt-get.cc:3095 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "%sཐུམ་སྒྲིལ་འདི་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:3119 +#: cmdline/apt-get.cc:3118 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s: %s་གི་དོན་ལུ་་%s་རྟེན་འབྲེལ་འདི་ངལ་རངས་འབད་ནི་འཐུས་ཤོར་བྱུང་ནུག" -#: cmdline/apt-get.cc:3135 +#: cmdline/apt-get.cc:3133 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr " %s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་འདི་ངལ་རངས་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:3140 +#: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འདི་ལས་སྦྱོར་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།" -#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "%s (%s)་ལུ་མཐུད་དོ།" -#: cmdline/apt-get.cc:3368 +#: cmdline/apt-get.cc:3366 msgid "Supported modules:" msgstr "རྒྱབ་སྐྱོར་འབད་ཡོད་པའི་ཚད་གཞི་ཚུ:" -#: cmdline/apt-get.cc:3409 +#: cmdline/apt-get.cc:3407 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1105,7 +1113,7 @@ msgstr "" "ཤོག་ལེབ་ཚུ་ལུ་བལྟ།\n" " འ་ནི་ ཨེ་ཊི་པི་འདི་ལུ་ཡང་དག་ ཀའུ་ ནུས་ཤུགས་ཚུ་ཡོད།\n" -#: cmdline/apt-get.cc:3574 +#: cmdline/apt-get.cc:3572 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1176,7 +1184,7 @@ msgid "%s was already not hold.\n" msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རིམ་གསར་ཤོས་ཅིག་ཨིན།\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" @@ -1316,8 +1324,8 @@ msgstr "མཐུད་ལམ་ངལ་མཚམས" msgid "Server closed the connection" msgstr "སར་བར་གྱིས་མཐུད་ལམ་འདི་ཁ་བསྡམས་ཏེ་ཡོདཔ་ཨིན།" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 +#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 msgid "Read error" msgstr "འཛོལ་བ་ལྷབ།" @@ -1330,8 +1338,8 @@ msgid "Protocol corruption" msgstr "གནད་སྤེལ་ལམ་ལུགས་ ངན་ཅན།" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 +#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 msgid "Write error" msgstr "འཛོལ་བ་འབྲི།" @@ -1474,32 +1482,40 @@ msgstr "'%s:%s' (%i)་མོས་མཐུན་འབདཝ་ད་ངན་ msgid "Unable to connect to %s:%s:" msgstr "%s %s:ལུ་མཐུད་མ་ཚུགས།" -#: methods/gpgv.cc:169 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "ནང་འཁོད་འཛོལ་བ: མིང་རྟགས་འདི་ལེགས་ཤོམ་ཅིག་འདུག་ འདི་འབདཝ་ད་མཛུབ་རྗེས་ལྡེ་མིག་དེ་གཏན་འབེབས་བཟོ་" "མ་ཚུགས?!" -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "ཉུང་མཐའ་རང་ནུས་མེད་ཀྱི་མིང་རྟགས་ཅིག་གདོང་ཐུག་བྱུང་སྟེ་ཡོདཔ་ཨིན།" -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:172 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "མིང་རྟགས་བདེན་སྦྱོར་འབད་ནི་ལུ་'%s'འདི་ལག་ལེན་འཐབ་མ་ཚུགས། (gpgv་དེ་ཁཞི་བཙུགས་འབད་ཡོདཔ་ཨིན་ན།?)" -#: methods/gpgv.cc:183 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "gpgv་ལག་ལེན་འཐབ་ནི་ལུ་མ་ཤེས་པའི་འཛོལ་བ་།" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "འོག་གི་མིང་རྟགས་ཚུ་ནུས་མེད་ཨིན་པས།:\n" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1581,8 +1597,8 @@ msgstr "ནང་འཁོད་འཛོལ་བ།" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1611,7 +1627,12 @@ msgstr "" msgid "Can not read mirror file '%s'" msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།" + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "" @@ -1707,7 +1728,7 @@ msgstr "" " -o=? འདི་གིས་མཐུན་སྒྲིག་རིམ་སྒྲིག་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབདཝ་ཨིན་ དཔེར་ན་-o dir::cache=/tmp་" "བཟུམ།\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr " %sལུ་འབྲི་མ་ཚུགས།" @@ -2085,23 +2106,23 @@ msgstr "" " -o=? འདི་གིས་ མཐུན་སྒྲིག་ རིམ་སྒྲིག་གི་གདམ་ཁ་ཚུ་ཁཞི་སྒྲིག་འབདཝ་ཨིན་ དཔེར་ན་-o dir::cache=/" "tmp\n" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "རྒྱུད་དུང་ཚུ་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "ཇི་ཛིཔ་འདི་ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "ངན་ཅན་གྱི་ཡིག་མཛོད།" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "ཊར་ཅེག་སམ་དེ་འཐུས་ཤོར་བྱུང་ཡོད་ ཡིག་མཛོད་ངན་ཅན་བྱུང་ནུག" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "མ་ཤེས་པའི་ ཊཱར་་མགོ་ཡིག་་དབྱེ་བ་ %u་ འཐུས་མི་ %s།" @@ -2321,7 +2342,7 @@ msgstr "" msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1172 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "སེལ་འཐུ་%s ་མ་འཐོབ།" @@ -2461,112 +2482,112 @@ msgstr "སི་ཌི་རོམ་འདི་ངོ་བཤུས་འབ msgid "Problem closing the gzip file %s" msgstr "ཡིག་སྣོད་འདི་ཁ་བསྡམས་པའི་བསྒང་དཀའ་ངལ།" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "%s ལྷག་ནི་རྐྱངམ་ཅིག་འབད་མི་ལྡེ་མིག་ཡིག་སྣོད་འདི་གི་དོན་ལུ་ལྡེ་མིག་རྐྱབ་ནི་ལག་ལེན་མི་འཐབ་པས།" -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "ལྡེ་མིག་རྐྱབས་ཡོད་པའི་ཡིག་སྣོད་%s་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:249 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "ཨེན་ཨེཕ་ཨེསི་ %s སྦྱར་བརྩེགས་འབད་ཡོད་པའི་ལྡེ་མིག་ཡིག་སྣོད་ཀྱི་དོན་ལུ་ལྡེ་མིག་རྐྱབ་ནི་ལག་ལེན་མི་འཐབ་པས།" -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "%sལྡེ་མིག་རྐྱབ་ནི་ལེན་མ་ཚུགས།" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བགོས་ཀྱི་སྐྱོན་ཅིག་ཐོབ་ཡོདཔ་ཨིན།" -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:843 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བགོས་ཀྱི་སྐྱོན་ཅིག་ཐོབ་ཡོདཔ་ཨིན།" -#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "ཡན་ལག་ལས་སྦྱོར་%s་གིས་འཛོལ་བའི་ཨང་རྟགས་(%u)ཅིག་སླར་ལོག་འབད་ཡོདཔ་ཨིན།" -#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "ཡན་ལག་ལས་སྦྱོར་་%s་གིས་རེ་བ་མེད་པར་ཕྱིར་ཐོན་ཡོདཔ་ཨིན།" -#: apt-pkg/contrib/fileutl.cc:984 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Could not open file %s" msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1062 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "%s་གི་དོན་ལུ་རྒྱུད་དུང་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "ཡན་ལག་ལས་སྦྱོར་ ཨའི་པི་སི་ གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " msgstr "ཨེབ་འཕྲུལ་ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1297 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "ལྷག་ ད་ལྟོ་ཡང་ལྷག་ནི་ལུ་%lu་ཡོད་འདི་འབདཝ་ད་ཅི་ཡང་ལྷག་ལུས་མིན་འདུག" -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "འབྲི་ ད་ལྟོ་ཡང་འབྲི་ནི་ལུ་%lu་ཡོད་འདི་འདབཝ་ད་འབད་མ་ཚུགས།" -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1681 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "ཡིག་སྣོད་འདི་ཁ་བསྡམས་པའི་བསྒང་དཀའ་ངལ།" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1693 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1704 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "ཡིག་སྣོད་འདི་འབྲེལལམ་མེདཔ་བཟོ་བའི་བསྒང་དཀའ་ངལ།" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1717 msgid "Problem syncing the file" msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།" @@ -2765,19 +2786,19 @@ msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐི msgid "Type '%s' is not known on line %u in source list %s" msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2814,7 +2835,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "དཀའ་ངལ་འདི་ནོར་བཅོས་འབད་མ་ཚུགས་ ཁྱོད་ཀྱི་ཐུམ་སྒྲིལ་ཆད་པ་ཚུ་འཆང་འདི་འདུག" -#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 +#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2823,7 +2844,7 @@ msgstr "" "ཟུར་ཐོ་ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ནུག་ འདི་ཚུ་སྣང་མེད་སྦེ་བཞགཔ་མ་ཚད་ ཚབ་ལུ་" "རྙིངམ་འདི་ཚུ་ལག་ལེན་འཐབ་ནུག" -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "ཐོ་བཀོད་འབད་མི་སྣོད་ཐོ་%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་ཏེ་འདུག" @@ -2924,14 +2945,14 @@ msgstr "འདྲ་མཛོད་ལུ་མཐུན་འགྱུར་མ #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 -#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 -#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 -#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 -#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 -#: apt-pkg/pkgcachegen.cc:561 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "%s (པི་ཀེ་ཇི་འཚོལ་ནི)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག" @@ -2953,26 +2974,26 @@ msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊ msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་བརྟེན་པའི་ཨང་གྲངས་ལས་ལྷག་ནུག" -#: apt-pkg/pkgcachegen.cc:568 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "ཡིག་སྣོད་རྟེན་འབྲེལ་འདི་ཚུ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་ཐུམ་སྒྲིལ་ %s %s ་འདི་མ་ཐོབ་པས།" -#: apt-pkg/pkgcachegen.cc:1197 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས།" -#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 -#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" msgstr "ཐུམ་སྒྲིལ་ཐོ་ཡིག་ཚུ་ལྷག་དོ།" -#: apt-pkg/pkgcachegen.cc:1302 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "ཡིག་སྣོད་བྱིན་མི་ཚུ་བསྡུ་ལེན་འབད་དོ།" -#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "IO འཛོལ་བ་འབྱུང་ཁུངས་འདྲ་མཛོད་སྲུང་བཞག་འབད་དོ།" @@ -2985,41 +3006,41 @@ msgstr "%s (%s -> %s)བསྐྱར་མིང་བཏགས་ནི་འ msgid "MD5Sum mismatch" msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 #, fuzzy msgid "Hash Sum mismatch" msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "འོག་གི་ ཨའི་ཌི་་ ལྡེ་མིག་ཚུ་གི་དོན་ལུ་མི་དམང་གི་ལྡེ་མིག་འདི་འཐོབ་མི་ཚུགས་པས:\n" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3027,12 +3048,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3041,7 +3062,7 @@ msgstr "" " %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ " "འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག (arch འདི་བྱིག་སོངམ་ལས་བརྟེན།)" -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3050,14 +3071,14 @@ msgstr "" " %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ " "འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག " -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "ཐུམ་སྒྲིལ་ ཟུར་ཐོ་ཡིག་སྣོད་ཚུ་ངན་ཅན་འགྱོ་ནུག ཡིག་སྣོད་ཀྱི་མིང་མིན་འདུག: %s་ཐུམ་སྒྲིལ་གྱི་དོན་ལུ་ས་སྒོ།" -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "ཚད་མ་མཐུན།" @@ -3109,7 +3130,7 @@ msgstr "ངོས་འཛིན་འབད་དོ.." msgid "Stored label: %s\n" msgstr "གསོག་འཇོག་འབད་ཡོད་པའི་ཁ་ཡིག:%s \n" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "སི་ཌི་-རོམ་སྦྱར་བརྩེགས་མ་འབད་བར་བཞག་དོ..." @@ -3170,30 +3191,30 @@ msgstr "" msgid "Copying package lists..." msgstr "ཐུམ་སྒྲིལ་གྱིཐོ་ཡིག་ཚུ་འདྲ་བཤུས་རྐྱབ་དོ..." -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "འབྱུང་ཁུངས་ཀྱི་ཐོ་ཡིག་གསརཔ་ཅིག་འབྲི་དོ།\n" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "འ་ནི་ ཌིསིཀ་གི་དོན་ལུ་ འབྱུང་ཁུངས་ཧྲིལ་བུ་ཚུ་:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "%i་དྲན་མཐོ་དེ་ཚུ་བྲིས་ཡོད།\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i བྱིག་འགྱོ་ཡོད་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ %i དྲན་ཐོ་འདི་ཚུ་བྲིས་ཡོད།\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i་མཐུན་སྒྲིག་མེདཔ་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ %i་དྲན་ཐོ་ཚུ་བྲིས་བཞག་ཡོདཔ་ཨིན།\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/el.po b/po/el.po index 858175263..305e2f1d3 100644 --- a/po/el.po +++ b/po/el.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_el\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2008-08-26 18:25+0300\n" "Last-Translator: Θανάσης Νάτσης \n" "Language-Team: Greek \n" @@ -106,73 +106,73 @@ msgstr "Συνολικός Καταμετρημένος Χώρος: " msgid "Package file %s is out of sync." msgstr "Το αρχείο πακέτου %s δεν είναι ενημερωμένο." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Δε βρέθηκαν πακέτα" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1243 msgid "You must give at least one search pattern" msgstr "Πρέπει να δώσετε τουλάχιστον ένα μοτίβο αναζήτησης" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Αδυναμία εντοπισμού του πακέτου %s" -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1526 msgid "Package files:" msgstr "Αρχεία Πακέτου:" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Η cache δεν είναι ενημερωμένη, αδυναμία παραπομπής σε ένα αρχείο πακέτου" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1547 msgid "Pinned packages:" msgstr "Καθηλωμένα Πακέτα:" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "(δε βρέθηκαν)" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr " Εγκατεστημένα: " -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr " Υποψήφιο: " -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "(κανένα)" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr " Καθήλωση Πακέτου: " #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr " Πίνακας Έκδοσης:" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s για %s είναι μεταγλωττισμένο σε %s %s\n" -#: cmdline/apt-cache.cc:1690 +#: cmdline/apt-cache.cc:1730 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -247,21 +247,29 @@ msgstr "" " -o=? Χρήση μιας αυθαίρετη επιλογής ρυθμίσεων, πχ -o dir::cache=/tmp\n" "Δείτε τις σελίδες man του apt-cache(8) και apt.conf(5) για πληροφορίες.\n" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "" "Παρακαλώ δώστε ένα όνομα για αυτόν τον δίσκο, όπως 'Debian 5.0.3 Disk 1'" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" msgstr "Παρακαλώ εισάγετε το δίσκο στη συσκευή και πατήστε enter" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Αποτυχία σύνδεσης του %s σε %s" -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Επαναλάβετε την διαδικασία για τα υπόλοιπα CD από το σετ σας." @@ -501,7 +509,7 @@ msgstr "" msgid "%s is already the newest version.\n" msgstr "το %s είναι ήδη η τελευταία έκδοση.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "το %s έχει εγκατασταθεί με το χέρι\n" @@ -614,8 +622,8 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Μετά από αυτή τη λειτουργία, θα ελευθερωθούν %sB χώρου από το δίσκο.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 #, c-format msgid "Couldn't determine free space in %s" msgstr "Δεν μπόρεσα να προσδιορίσω τον ελεύθερο χώρο στο %s" @@ -654,7 +662,7 @@ msgstr "Εγκατάλειψη." msgid "Do you want to continue [Y/n]? " msgstr "Θέλετε να συνεχίσετε [Ν/ο]; " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Αποτυχία ανάκτησης του %s %s\n" @@ -663,7 +671,7 @@ msgstr "Αποτυχία ανάκτησης του %s %s\n" msgid "Some files failed to download" msgstr "Για μερικά αρχεία απέτυχε η μεταφόρτωση" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο" @@ -745,7 +753,7 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 msgid "The following information may help to resolve the situation:" msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:" @@ -795,7 +803,7 @@ msgstr "" "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε 'apt-get -f install' χωρίς να ορίσετε " "πακέτο (ή καθορίστε μια λύση)." -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1973 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" @@ -807,89 +815,89 @@ msgstr "" "διανομή, ότι μερικά από τα πακέτα δεν έχουν ακόμα δημιουργηθεί ή έχουν\n" "μετακινηθεί από τα εισερχόμενα." -#: cmdline/apt-get.cc:1995 +#: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "Χαλασμένα πακέτα" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2020 msgid "The following extra packages will be installed:" msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "Προτεινόμενα πακέτα:" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "Συνιστώμενα πακέτα:" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "Αδύνατη η εύρεση του πακέτου %s" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "το %s έχει εγκατασταθεί αυτόματα\n" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2184 msgid "Calculating upgrade... " msgstr "Υπολογισμός της αναβάθμισης... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Απέτυχε" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2192 msgid "Done" msgstr "Ετοιμο" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 msgid "Internal error, problem resolver broke stuff" msgstr "" "Εσωτερικό Σφάλμα, η προσπάθεια επίλυσης του προβλήματος \"έσπασε\" κάποιο " "υλικό" -#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης" -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2452 msgid "Must specify at least one package to fetch source for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον " "κωδικάτου" -#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, c-format msgid "Unable to find a source package for %s" msgstr "Αδυναμία εντοπισμού του κώδικά του πακέτου %s" -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2514 #, c-format msgid "" "Please use:\n" @@ -897,86 +905,86 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2567 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Παράκαμψη του ήδη μεταφορτωμένου αρχείου `%s`\n" -#: cmdline/apt-get.cc:2605 +#: cmdline/apt-get.cc:2604 #, c-format msgid "You don't have enough free space in %s" msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2613 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB πηγαίου κώδικα.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2618 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n" -#: cmdline/apt-get.cc:2625 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" msgstr "Μεταφόρτωση Κωδικα %s\n" -#: cmdline/apt-get.cc:2663 +#: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών." -#: cmdline/apt-get.cc:2694 +#: cmdline/apt-get.cc:2693 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n" -#: cmdline/apt-get.cc:2707 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2729 +#: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "Απέτυχε η εντολή χτισίματος %s.\n" -#: cmdline/apt-get.cc:2749 +#: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "Η απογονική διεργασία απέτυχε" -#: cmdline/apt-get.cc:2768 +#: cmdline/apt-get.cc:2767 msgid "Must specify at least one package to check builddeps for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του" -#: cmdline/apt-get.cc:2793 +#: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s" -#: cmdline/apt-get.cc:2840 +#: cmdline/apt-get.cc:2839 #, c-format msgid "%s has no build depends.\n" msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n" -#: cmdline/apt-get.cc:3010 +#: cmdline/apt-get.cc:3009 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -985,7 +993,7 @@ msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το %s δεν επιτρέπεται στο " "πακέτο %s" -#: cmdline/apt-get.cc:3028 +#: cmdline/apt-get.cc:3027 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -993,14 +1001,14 @@ msgid "" msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε" -#: cmdline/apt-get.cc:3051 +#: cmdline/apt-get.cc:3050 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s " "είναι νεώτερο" -#: cmdline/apt-get.cc:3090 +#: cmdline/apt-get.cc:3089 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1009,7 +1017,7 @@ msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες " "εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις της έκδοσης" -#: cmdline/apt-get.cc:3096 +#: cmdline/apt-get.cc:3095 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1018,30 +1026,30 @@ msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν έχει " "υποψήφιαέκδοση" -#: cmdline/apt-get.cc:3119 +#: cmdline/apt-get.cc:3118 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s" -#: cmdline/apt-get.cc:3135 +#: cmdline/apt-get.cc:3133 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται." -#: cmdline/apt-get.cc:3140 +#: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος" -#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, c-format msgid "Changelog for %s (%s)" msgstr "Changelog για %s (%s)" -#: cmdline/apt-get.cc:3368 +#: cmdline/apt-get.cc:3366 msgid "Supported modules:" msgstr "Υποστηριζόμενοι Οδηγοί:" -#: cmdline/apt-get.cc:3409 +#: cmdline/apt-get.cc:3407 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1126,7 +1134,7 @@ msgstr "" "για περισσότερες πληροφορίες και επιλογές.\n" " This APT has Super Cow Powers.\n" -#: cmdline/apt-get.cc:3574 +#: cmdline/apt-get.cc:3572 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1197,7 +1205,7 @@ msgid "%s was already not hold.\n" msgstr "το %s είναι ήδη η τελευταία έκδοση.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" @@ -1336,8 +1344,8 @@ msgstr "Λήξη χρόνου σύνδεσης" msgid "Server closed the connection" msgstr "Ο διακομιστής έκλεισε την σύνδεση" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 +#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 msgid "Read error" msgstr "Σφάλμα ανάγνωσης" @@ -1350,8 +1358,8 @@ msgid "Protocol corruption" msgstr "Αλλοίωση του πρωτοκόλλου" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 +#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 msgid "Write error" msgstr "Σφάλμα εγγραφής" @@ -1494,33 +1502,41 @@ msgstr "Κάτι παράξενο συνέβη κατά την εύρεση το msgid "Unable to connect to %s:%s:" msgstr "Αδύνατη η σύνδεση στο %s %s:" -#: methods/gpgv.cc:169 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Εσωτερικό σφάλμα: Η υπογραφή είναι καλή, αλλά αδυναμία προσδιορισμού του " "αποτυπώματος?!" -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Βρέθηκε τουλάχιστον μια μη έγκυρη υπογραφή." -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:172 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Αδυναμία εκτέλεσης του '%s' για την επαλήθευση της υπογραφής (είναι " "εγκατεστημένο το gpgv;)" -#: methods/gpgv.cc:183 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Άγνωστο σφάλμα κατά την εκτέλεση του gpgv" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Οι παρακάτω υπογραφές ήταν μη έγκυρες:\n" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1604,8 +1620,8 @@ msgstr "Εσωτερικό Σφάλμα" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1634,7 +1650,12 @@ msgstr "" msgid "Can not read mirror file '%s'" msgstr "Αδύνατο το άνοιγμα του αρχείου %s" -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "Αδύνατο το άνοιγμα του αρχείου %s" + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "" @@ -1730,7 +1751,7 @@ msgstr "" " -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n" " -o=? Καθορισμός αυθαίρετης επιλογής παραμέτρου, πχ -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Αδύνατη η εγγραφή στο %s" @@ -2107,23 +2128,23 @@ msgstr "" " -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n" " -o=? Θέσε μια αυθαίρετη παράμετρο,πχ -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "Αποτυχία κατά τη δημιουργία διασωληνώσεων" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "Αποτυχία κατά την εκτέλεση του gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "Κατεστραμμένη αρχειοθήκη" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "Το Checksum του tar απέτυχε, η αρχείοθήκη είναι κατεστραμμένη" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Άγνωστη επικεφαλίδα TAR τύπος %u, μέλος %s" @@ -2344,7 +2365,7 @@ msgstr "" msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1172 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "Η επιλογή %s δε βρέθηκε" @@ -2487,114 +2508,114 @@ msgstr "Αδύνατη η εύρεση της κατάστασης του cdrom" msgid "Problem closing the gzip file %s" msgstr "Πρόβλημα κατά το κλείσιμο του αρχείου" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Δε θα χρησιμοποιηθεί κλείδωμα για το ανάγνωσης μόνο αρχείο κλειδώματος %s" -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "Αδύνατο το άνοιγμα του αρχείου κλειδώματος %s" -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:249 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Δε θα χρησιμοποιηθεί κλείδωμα για το συναρμοσμένο από nfs αρχείο κλειδώματος " "%s" -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "Αδύνατο το κλείδωμα %s" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμερισμού (segfault)" -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:843 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμερισμού (segfault)" -#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Η υποδιεργασία %s επέστρεψε ένα κωδικός σφάλματος (%u)" -#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Η υποδιεργασία %s εγκατέλειψε απρόσμενα" -#: apt-pkg/contrib/fileutl.cc:984 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Could not open file %s" msgstr "Αδύνατο το άνοιγμα του αρχείου %s" -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1062 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "Αδύνατο το άνοιγμα διασωλήνωσης για το %s" -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "Αποτυχία δημιουργίας IPC στην υποδιεργασία" -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " msgstr "Αποτυχία εκτέλεσης του συμπιεστή " -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1297 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "αναγνώστηκαν, απομένουν ακόμη %lu για ανάγνωση αλλά δεν απομένουν άλλα" -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "γράφτηκαν, απομένουν %lu για εγγραφή αλλά χωρίς επιτυχία" -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1681 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Πρόβλημα κατά το κλείσιμο του αρχείου" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1693 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1704 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Πρόβλημα κατά την διαγραφή του αρχείου" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1717 msgid "Problem syncing the file" msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου" @@ -2792,19 +2813,19 @@ msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγ msgid "Type '%s' is not known on line %u in source list %s" msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος " -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Αδύνατο το άνοιγμα του αρχείου %s" -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2841,7 +2862,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Αδύνατη η διόρθωση προβλημάτων, έχετε κρατούμενα ελαττωματικά πακέτα." -#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 +#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2850,7 +2871,7 @@ msgstr "" "Μερικά αρχεία δεν μεταφορτώθηκαν, αγνοήθηκαν ή χρησιμοποιήθηκαν παλαιότερα " "στη θέση τους." -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "Ο φάκελος λιστών %spartial αγνοείται." @@ -2955,14 +2976,14 @@ msgstr "Η cache έχει ασύμβατο σύστημα απόδοσης έκ #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 -#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 -#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 -#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 -#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 -#: apt-pkg/pkgcachegen.cc:561 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (FindPkg)" @@ -2987,26 +3008,26 @@ msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Εκπληκτικό, υπερβήκατε τον αριθμό των εξαρτήσεων που υποστηρίζει το APT." -#: apt-pkg/pkgcachegen.cc:568 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Το πακέτο %s %s δε βρέθηκε κατά την επεξεργασία εξαρτήσεων του αρχείου" -#: apt-pkg/pkgcachegen.cc:1197 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "Αδύνατη η εύρεση της κατάστασης της λίστας πηγαίων πακέτων %s" -#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 -#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" msgstr "Ανάγνωση Λιστών Πακέτων" -#: apt-pkg/pkgcachegen.cc:1302 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "Συλλογή Παροχών Αρχείου" -#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγών" @@ -3019,40 +3040,40 @@ msgstr "απέτυχε η μετονομασία, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "Ανόμοιο MD5Sum" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 msgid "Hash Sum mismatch" msgstr "Ανόμοιο MD5Sum" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "Δεν υπάρχει διαθέσιμο δημόσιο κλειδί για τα ακολουθα κλειδιά:\n" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3060,12 +3081,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3074,7 +3095,7 @@ msgstr "" "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)" -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3083,7 +3104,7 @@ msgstr "" "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο." -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3091,7 +3112,7 @@ msgstr "" "Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο " "πακέτο %s." -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "Ανόμοιο μέγεθος" @@ -3143,7 +3164,7 @@ msgstr "Αναγνώριση..." msgid "Stored label: %s\n" msgstr "Αποθήκευση Ετικέτας: %s \n" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 msgid "Unmounting CD-ROM...\n" msgstr "Αποπροσάρτηση του CD-ROM...\n" @@ -3205,30 +3226,30 @@ msgstr "" msgid "Copying package lists..." msgstr "Αντιγραφή λιστών πακέτων..." -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "Eγγραφή νέας λίστας πηγών\n" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "Οι κατάλογοι με τις πηγές αυτού του δίσκου είναι: \n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "Εγιναν %i εγγραφές.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Εγιναν %i εγγραφές με %i ασύμβατα αρχεία.\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία και %i ασύμβατα αρχεία\n" diff --git a/po/es.po b/po/es.po index df7ad92e1..dea136d4d 100644 --- a/po/es.po +++ b/po/es.po @@ -33,7 +33,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.10\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2011-01-24 11:47+0100\n" "Last-Translator: Javier Fernández-Sanguino Peña \n" "Language-Team: Debian Spanish \n" @@ -151,73 +151,73 @@ msgstr "Espacio registrado total: " msgid "Package file %s is out of sync." msgstr "El archivo de paquetes %s está desincronizado." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "No se encontró ningún paquete" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1243 msgid "You must give at least one search pattern" msgstr "Debe proporcionar al menos un patrón de búsqueda" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "No se ha podido localizar el paquete %s" -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1526 msgid "Package files:" msgstr "Archivos de paquetes:" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Caché fuera de sincronismo, no se puede hacer x-ref a un archivo de paquetes" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1547 msgid "Pinned packages:" msgstr "Paquetes con pin:" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "(no encontrado)" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr " Instalados: " -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr " Candidato: " -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "(ninguno)" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr " Pin del paquete: " #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr " Tabla de versión:" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s para %s compilado en %s %s\n" -#: cmdline/apt-cache.cc:1690 +#: cmdline/apt-cache.cc:1730 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -295,21 +295,29 @@ msgstr "" " p.ej. -o dir::cache=/tmp\n" "Vea las páginas del manual apt-cache(8) y apt.conf(5) para más información.\n" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "" "Proporcione un nombre para este disco, como pueda ser «Debian 5.0.3 Disco 1»" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" msgstr "Por favor, introduzca un disco en la unidad y pulse Intro" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "No se pudo montar «%s» como «%s»" -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Repita este proceso para el resto de los CDs del conjunto." @@ -545,7 +553,7 @@ msgstr "No es posible reinstalar el paquete %s, no se puede descargar.\n" msgid "%s is already the newest version.\n" msgstr "%s ya está en su versión más reciente.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "fijado %s como instalado manualmente.\n" @@ -657,8 +665,8 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Se liberarán %sB después de esta operación.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 #, c-format msgid "Couldn't determine free space in %s" msgstr "No pude determinar el espacio libre en %s" @@ -697,7 +705,7 @@ msgstr "Abortado." msgid "Do you want to continue [Y/n]? " msgstr "¿Desea continuar [S/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Imposible obtener %s %s\n" @@ -706,7 +714,7 @@ msgstr "Imposible obtener %s %s\n" msgid "Some files failed to download" msgstr "No se pudieron descargar algunos archivos" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "Descarga completa y en modo de sólo descarga" @@ -791,7 +799,7 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 msgid "The following information may help to resolve the situation:" msgstr "La siguiente información puede ayudar a resolver la situación:" @@ -844,7 +852,7 @@ msgstr "" "Dependencias incumplidas. Intente «apt-get -f install» sin paquetes (o " "especifique una solución)." -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1973 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" @@ -856,79 +864,79 @@ msgstr "" "inestable, que algunos paquetes necesarios no han sido creados o han\n" "sido movidos fuera de Incoming." -#: cmdline/apt-get.cc:1995 +#: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "Paquetes rotos" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2020 msgid "The following extra packages will be installed:" msgstr "Se instalarán los siguientes paquetes extras:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "Paquetes sugeridos:" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "Paquetes recomendados:" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "No se pudo encontrar el paquete %s" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "fijado %s como instalado automáticamente.\n" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2184 msgid "Calculating upgrade... " msgstr "Calculando la actualización... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Falló" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2192 msgid "Done" msgstr "Listo" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 msgid "Internal error, problem resolver broke stuff" msgstr "" "Error interno, el sistema de solución de problemas rompió algunas cosas" -#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "No se puede bloquear el directorio de descarga" -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2452 msgid "Must specify at least one package to fetch source for" msgstr "Debe especificar al menos un paquete para obtener su código fuente" -#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, 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:2510 +#: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -938,7 +946,7 @@ msgstr "" "versiones «%s» en:\n" "%s\n" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2514 #, fuzzy, c-format msgid "" "Please use:\n" @@ -950,87 +958,87 @@ msgstr "" "para obtener las últimas actualizaciones (posiblemente no publicadas aún) " "del paquete.\n" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2567 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Omitiendo el fichero ya descargado «%s»\n" -#: cmdline/apt-get.cc:2605 +#: cmdline/apt-get.cc:2604 #, c-format msgid "You don't have enough free space in %s" msgstr "No tiene suficiente espacio libre en %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2613 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Necesito descargar %sB/%sB de archivos fuente.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2618 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Necesito descargar %sB de archivos fuente.\n" -#: cmdline/apt-get.cc:2625 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" msgstr "Fuente obtenida %s\n" -#: cmdline/apt-get.cc:2663 +#: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "No se pudieron obtener algunos archivos." -#: cmdline/apt-get.cc:2694 +#: cmdline/apt-get.cc:2693 #, 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:2706 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Falló la orden de desempaquetamiento «%s».\n" -#: cmdline/apt-get.cc:2707 +#: cmdline/apt-get.cc:2706 #, 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:2729 +#: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "Falló la orden de construcción «%s».\n" -#: cmdline/apt-get.cc:2749 +#: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "Falló el proceso hijo" -#: cmdline/apt-get.cc:2768 +#: cmdline/apt-get.cc:2767 msgid "Must specify at least one package to check builddeps for" msgstr "" "Debe especificar al menos un paquete para verificar sus dependencias de " "construcción" -#: cmdline/apt-get.cc:2793 +#: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "No se pudo obtener información de dependencias de construcción para %s" -#: cmdline/apt-get.cc:2840 +#: cmdline/apt-get.cc:2839 #, c-format msgid "%s has no build depends.\n" msgstr "%s no tiene dependencias de construcción.\n" -#: cmdline/apt-get.cc:3010 +#: cmdline/apt-get.cc:3009 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -1039,7 +1047,7 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque no se puede encontrar " "el paquete %s" -#: cmdline/apt-get.cc:3028 +#: cmdline/apt-get.cc:3027 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1048,14 +1056,14 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque no se puede encontrar " "el paquete %s" -#: cmdline/apt-get.cc:3051 +#: cmdline/apt-get.cc:3050 #, 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:3090 +#: cmdline/apt-get.cc:3089 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1064,7 +1072,7 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque ninguna versión " "disponible del paquete %s satisface los requisitos de versión" -#: cmdline/apt-get.cc:3096 +#: cmdline/apt-get.cc:3095 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1073,30 +1081,30 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque no se puede encontrar " "el paquete %s" -#: cmdline/apt-get.cc:3119 +#: cmdline/apt-get.cc:3118 #, 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:3135 +#: cmdline/apt-get.cc:3133 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "No se pudieron satisfacer las dependencias de construcción de %s." -#: cmdline/apt-get.cc:3140 +#: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "No se pudieron procesar las dependencias de construcción" -#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Conectando a %s (%s)" -#: cmdline/apt-get.cc:3368 +#: cmdline/apt-get.cc:3366 msgid "Supported modules:" msgstr "Módulos soportados:" -#: cmdline/apt-get.cc:3409 +#: cmdline/apt-get.cc:3407 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1187,7 +1195,7 @@ msgstr "" "para más información y opciones.\n" " Este APT tiene poderes de Super Vaca.\n" -#: cmdline/apt-get.cc:3574 +#: cmdline/apt-get.cc:3572 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1262,7 +1270,7 @@ msgid "%s was already not hold.\n" msgstr "%s ya está en su versión más reciente.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" @@ -1401,8 +1409,8 @@ msgstr "La conexión expiró" msgid "Server closed the connection" msgstr "El servidor cerró la conexión" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 +#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 msgid "Read error" msgstr "Error de lectura" @@ -1415,8 +1423,8 @@ msgid "Protocol corruption" msgstr "Fallo del protocolo" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 +#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 msgid "Write error" msgstr "Error de escritura" @@ -1559,31 +1567,39 @@ msgstr "Algo raro pasó al resolver «%s:%s» (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "No se pudo conectar a %s:%s:" -#: methods/gpgv.cc:169 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Error interno: Firma correcta, ¡¿pero no se pudo determinar su huella " "digital?!" -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Se encontró al menos una firma inválida." -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "No se pudo ejecutar «gpgv» para verificar la firma (¿está instalado gpgv?)" -#: methods/gpgv.cc:183 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Error desconocido ejecutando gpgv" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Las siguientes firms fueron inválidas:\n" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1666,8 +1682,8 @@ msgstr "Error interno" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1696,7 +1712,12 @@ msgstr "No se encontró un archivo de réplica «%s»" msgid "Can not read mirror file '%s'" msgstr "No se encontró un archivo de réplica «%s»" -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "No se encontró un archivo de réplica «%s»" + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "[Réplica: %s]" @@ -1797,7 +1818,7 @@ msgstr "" " -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::" "cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "No se puede escribir en %s" @@ -2175,24 +2196,24 @@ msgstr "" " -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::\n" "cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "No pude crear las tuberías" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "No pude ejecutar gzip" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "Archivo dañado" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "" "Se produjo un fallo al calcular la suma de control de tar, archive dañado" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Cabecera del TAR tipo %u desconocida, miembro %s" @@ -2415,7 +2436,7 @@ msgstr "%limin. %liseg." msgid "%lis" msgstr "%liseg." -#: apt-pkg/contrib/strutl.cc:1172 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "Selección %s no encontrada" @@ -2561,111 +2582,111 @@ msgstr "No pude montar el cdrom" msgid "Problem closing the gzip file %s" msgstr "Se produjo un problema al cerrar el fichero gzip %s" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "No se utiliza bloqueos para el fichero de bloqueo de sólo lectura %s" -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "No se pudo abrir el fichero de bloqueo «%s»" -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:249 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "No se utilizan bloqueos para el fichero de bloqueo de montaje nfs %s" -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "No se pudo bloquear %s" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "El subproceso %s recibió un fallo de segmentación." -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:843 #, c-format msgid "Sub-process %s received signal %u." msgstr "El subproceso %s recibió la señal %u." -#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "El subproceso %s devolvió un código de error (%u)" -#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "El subproceso %s terminó de forma inesperada" -#: apt-pkg/contrib/fileutl.cc:984 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Could not open file %s" msgstr "No pude abrir el fichero %s" -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1062 #, c-format msgid "Could not open file descriptor %d" msgstr "No se pudo abrir el descriptor de fichero %d" -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "No se pudo crear el subproceso IPC" -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " msgstr "No se pudo ejecutar el compresor " -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1297 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "leídos, todavía debía leer %lu pero no queda nada" -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "escritos, todavía tenía que escribir %lu pero no pude hacerlo" -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1681 #, c-format msgid "Problem closing the file %s" msgstr "Se produjo un problema al cerrar el fichero %s" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1693 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Se produjo un problema al renombrar el fichero %s a %s" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1704 #, c-format msgid "Problem unlinking the file %s" msgstr "Se produjo un problema al desligar el fichero %s" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1717 msgid "Problem syncing the file" msgstr "Se produjo un problema al sincronizar el fichero" @@ -2869,7 +2890,7 @@ msgstr "Línea %u mal formada en la lista de fuentes %s (tipo)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipo «%s» desconocido en la línea %u de lista de fuentes %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2879,12 +2900,12 @@ msgstr "" "de manual con «man 5 apt.conf» bajo «APT::Immediate-Configure» para más " "información. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "No pude abrir el fichero «%s»" -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2922,7 +2943,7 @@ msgid "Unable to correct problems, you have held broken packages." msgstr "" "No se pudieron corregir los problemas, usted ha retenido paquetes rotos." -#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 +#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2931,7 +2952,7 @@ msgstr "" "No se han podido descargar algunos archivos de índice, se han ignorado, o se " "ha utilizado unos antiguos en su lugar." -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, c-format msgid "List directory %spartial is missing." msgstr "Falta el directorio de listas %spartial." @@ -3034,14 +3055,14 @@ msgstr "La caché tiene una versión incompatible de sistema de versiones" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 -#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 -#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 -#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 -#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 -#: apt-pkg/pkgcachegen.cc:561 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Se produjo un error mientras se procesaba %s (FindPkg)" @@ -3066,27 +3087,27 @@ msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Vaya, excedió el número de dependencias que este APT es capaz de manejar." -#: apt-pkg/pkgcachegen.cc:568 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Al procesar las dependencias de archivos no se encontró el paquete %s %s" -#: apt-pkg/pkgcachegen.cc:1197 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "No se puede leer la lista de paquetes fuente %s" -#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 -#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" msgstr "Leyendo lista de paquetes" -#: apt-pkg/pkgcachegen.cc:1302 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "Recogiendo archivos que proveen" -#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "Error de E/S guardando caché fuente" @@ -3099,42 +3120,42 @@ msgstr "falló el cambio de nombre, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "La suma MD5 difiere" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 msgid "Hash Sum mismatch" msgstr "La suma hash difiere" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "No se pudo leer el archivo «Release» %s" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "" "No existe ninguna clave pública disponible para los siguientes " "identificadores de clave:\n" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribución conflictiva: %s (se esperaba %s, pero se obtuvo %s)" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3145,12 +3166,12 @@ msgstr "" "GPG es: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "Error de GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3160,7 +3181,7 @@ msgstr "" "que necesita arreglar manualmente este paquete (debido a que falta una " "arquitectura)" -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3169,7 +3190,7 @@ msgstr "" "No se pudo localizar un archivo para el paquete %s. Esto puede significar " "que necesita arreglar manualmente este paquete." -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3177,7 +3198,7 @@ msgstr "" "Los archivos de índice de paquetes están dañados. No existe un campo " "«Filename:» para el paquete %s." -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "El tamaño difiere" @@ -3229,7 +3250,7 @@ msgstr "Identificando.. " msgid "Stored label: %s\n" msgstr "Etiqueta guardada: %s \n" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 msgid "Unmounting CD-ROM...\n" msgstr "Desmontando el CD-ROM...\n" @@ -3293,30 +3314,30 @@ msgstr "" msgid "Copying package lists..." msgstr "Copiando las listas de paquetes..." -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "Escribiendo nueva lista de fuente\n" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "Las entradas de la lista de fuentes para este disco son:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "%i registros escritos.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i registros escritos con %i fichero de menos.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i registros escritos con %i fichero mal emparejado\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/eu.po b/po/eu.po index 3e5e3f87a..8cea79e8f 100644 --- a/po/eu.po +++ b/po/eu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_eu\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2009-05-17 00:41+0200\n" "Last-Translator: Piarres Beobide \n" "Language-Team: Euskara \n" @@ -97,75 +97,75 @@ msgstr "Guztira erregistratutako lekua: " msgid "Package file %s is out of sync." msgstr "%s pakete fitxategia ez dago sinkronizatuta." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Ez da paketerik aurkitu" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1243 #, fuzzy msgid "You must give at least one search pattern" msgstr "Zehazki eredu bat eman behar duzu." -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Ezin da %s paketea lokalizatu" -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1526 msgid "Package files:" msgstr "Pakete Fitxategiak:" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Katxea ez dago sinkronizatuta, ezin zaio erreferentziarik (x-ref) egin " "pakete fitxategi bati" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1547 msgid "Pinned packages:" msgstr "Pin duten Paketeak:" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "(ez da aurkitu)" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr " Instalatuta: " -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr " Hautagaia: " -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "(bat ere ez)" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr " Paketearen pin-a:" #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr " Bertsio taula:" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s %s-rentzat %s %s-ean konpilatua\n" -#: cmdline/apt-cache.cc:1690 +#: cmdline/apt-cache.cc:1730 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -237,22 +237,30 @@ msgstr "" " -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n" "Informazio gehiago nahi izanez gero: ikus apt-cache(8) eta apt.conf(5).\n" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 #, fuzzy msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "" "Mesedez idatzi izen bat diska honentzat, 'Debian 2.1r1 1 Diska' antzerakoan" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" msgstr "Mesedez sar diska bat gailuan eta enter sakatu" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Huts egin du %s izenaren ordez %s ipintzean" -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Prozesu hau bildumako beste CD guztiekin errepikatu." @@ -486,7 +494,7 @@ msgstr "%s berriro instalatzea ez da posible; ezin da deskargatu.\n" msgid "%s is already the newest version.\n" msgstr "%s bertsiorik berriena da jada.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s eskuz instalatua bezala ezarri.\n" @@ -595,8 +603,8 @@ msgstr "Ekintza honen ondoren, %sB gehiago erabiliko dira diskoan.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Ekintza honen ondoren, %sB libratuko dira diskoan.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 #, c-format msgid "Couldn't determine free space in %s" msgstr "Ezin da %s(e)n duzun leku librea atzeman." @@ -635,7 +643,7 @@ msgstr "Abortatu." msgid "Do you want to continue [Y/n]? " msgstr "Aurrera jarraitu nahi al duzu [B/e]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ezin da lortu %s %s\n" @@ -644,7 +652,7 @@ msgstr "Ezin da lortu %s %s\n" msgid "Some files failed to download" msgstr "Fitxategi batzuk ezin izan dira deskargatu" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "Deskarga amaituta eta deskarga soileko moduan" @@ -724,7 +732,7 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 msgid "The following information may help to resolve the situation:" msgstr "Informazio honek arazoa konpontzen lagun dezake:" @@ -781,7 +789,7 @@ msgstr "" "Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo " "zehaztu konponbide bat)." -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1973 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" @@ -793,85 +801,85 @@ msgstr "" "beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n" "Sarrerakoetan (Incoming) egoten jarraituko dute." -#: cmdline/apt-get.cc:1995 +#: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "Hautsitako paketeak" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2020 msgid "The following extra packages will be installed:" msgstr "Ondorengo pakete gehigarriak instalatuko dira:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "Iradokitako paketeak:" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "Gomendatutako paketeak:" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "Ezin izan da %s paketea aurkitu" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "%s eskuz instalatua bezala ezarri.\n" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2184 msgid "Calculating upgrade... " msgstr "Berriketak kalkulatzen... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Huts egin du" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2192 msgid "Done" msgstr "Eginda" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 msgid "Internal error, problem resolver broke stuff" msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du" -#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "Ezin da deskarga direktorioa blokeatu" -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2452 msgid "Must specify at least one package to fetch source for" msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko" -#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, c-format msgid "Unable to find a source package for %s" msgstr "Ezin da iturburu paketerik aurkitu %s(r)entzat" -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2514 #, c-format msgid "" "Please use:\n" @@ -879,87 +887,87 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2567 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n" -#: cmdline/apt-get.cc:2605 +#: cmdline/apt-get.cc:2604 #, c-format msgid "You don't have enough free space in %s" msgstr "Ez daukazu nahikoa leku libre %s(e)n." #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2613 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Iturburu artxiboetako %sB/%sB eskuratu behar dira.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2618 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Iturburu artxiboetako %sB eskuratu behar dira.\n" -#: cmdline/apt-get.cc:2625 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" msgstr "Eskuratu %s iturburua\n" -#: cmdline/apt-get.cc:2663 +#: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "Huts egin du zenbat artxibo lortzean." -#: cmdline/apt-get.cc:2694 +#: cmdline/apt-get.cc:2693 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n" -#: cmdline/apt-get.cc:2707 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n" -#: cmdline/apt-get.cc:2729 +#: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "Eraikitzeko '%s' komandoak huts egin du.\n" -#: cmdline/apt-get.cc:2749 +#: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "Prozesu umeak huts egin du" -#: cmdline/apt-get.cc:2768 +#: cmdline/apt-get.cc:2767 msgid "Must specify at least one package to check builddeps for" msgstr "" "Gutxienez pakete bat zehaztu behar duzu eraikitze mendekotasunak egiaztatzeko" -#: cmdline/apt-get.cc:2793 +#: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ezin izan da %s(r)en eraikitze mendekotasunen informazioa eskuratu" -#: cmdline/apt-get.cc:2840 +#: cmdline/apt-get.cc:2839 #, c-format msgid "%s has no build depends.\n" msgstr "%s: ez du eraikitze mendekotasunik.\n" -#: cmdline/apt-get.cc:3010 +#: cmdline/apt-get.cc:3009 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -967,7 +975,7 @@ msgid "" msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" -#: cmdline/apt-get.cc:3028 +#: cmdline/apt-get.cc:3027 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -975,14 +983,14 @@ msgid "" msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" -#: cmdline/apt-get.cc:3051 +#: cmdline/apt-get.cc:3050 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: instalatutako %3$s " "paketea berriegia da" -#: cmdline/apt-get.cc:3090 +#: cmdline/apt-get.cc:3089 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -991,7 +999,7 @@ msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, ez baitago bertsio-eskakizunak " "betetzen dituen %3$s paketearen bertsio erabilgarririk" -#: cmdline/apt-get.cc:3096 +#: cmdline/apt-get.cc:3095 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -999,30 +1007,30 @@ msgid "" msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" -#: cmdline/apt-get.cc:3119 +#: cmdline/apt-get.cc:3118 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: %3$s" -#: cmdline/apt-get.cc:3135 +#: cmdline/apt-get.cc:3133 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s(r)en eraikitze mendekotasunak ezin izan dira bete." -#: cmdline/apt-get.cc:3140 +#: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "Huts egin du eraikitze mendekotasunak prozesatzean" -#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Konektatzen -> %s.(%s)" -#: cmdline/apt-get.cc:3368 +#: cmdline/apt-get.cc:3366 msgid "Supported modules:" msgstr "Onartutako Moduluak:" -#: cmdline/apt-get.cc:3409 +#: cmdline/apt-get.cc:3407 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1109,7 +1117,7 @@ msgstr "" "sources.list(5) eta apt.conf(5) orrialdeak eskuliburuan.\n" " APT honek Super Behiaren Ahalmenak ditu.\n" -#: cmdline/apt-get.cc:3574 +#: cmdline/apt-get.cc:3572 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1180,7 +1188,7 @@ msgid "%s was already not hold.\n" msgstr "%s bertsiorik berriena da jada.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" @@ -1322,8 +1330,8 @@ msgstr "Konexioa denboraz kanpo" msgid "Server closed the connection" msgstr "Zerbitzariak konexioa itxi du" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 +#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 msgid "Read error" msgstr "Irakurketa errorea" @@ -1336,8 +1344,8 @@ msgid "Protocol corruption" msgstr "Protokolo hondatzea" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 +#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 msgid "Write error" msgstr "Idazketa errorea" @@ -1482,29 +1490,37 @@ msgstr "Zerbait arraroa pasatu da '%s:%s' (%i) ebaztean" msgid "Unable to connect to %s:%s:" msgstr "Ezin da konektatu -> %s %s:" -#: methods/gpgv.cc:169 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Barne errorea: Sinadura zuzena, baina ezin da egiaztapen marka zehaztu" -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Beintza sinadura baliogabe bat aurkitu da." -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:172 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Ezin da %s abiarazi sinadura egiaztatzeko (gpgv instalaturik al dago?)" -#: methods/gpgv.cc:183 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Errore ezezaguna gpgv exekutatzean" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Ondorengo sinadurak baliogabeak dira:\n" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1587,8 +1603,8 @@ msgstr "Barne errorea" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1617,7 +1633,12 @@ msgstr "" msgid "Can not read mirror file '%s'" msgstr "%s fitxategia ezin izan da ireki" -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "%s fitxategia ezin izan da ireki" + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "" @@ -1711,7 +1732,7 @@ msgstr "" " -c=? Irakurri konfigurazio fitxategi hau\n" " -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "%s : ezin da idatzi" @@ -2082,23 +2103,23 @@ msgstr "" " -c=? Irakurri konfigurazio fitxategi hau\n" " -o=? Ezarri konfigurazio aukera arbitrario bat. Adib: -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "Huts egin du kanalizazioak sortzean" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "Huts egin du gzip exekutatzean " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "Hondatutako artxiboa" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "Tar egiaztapenak huts egin, hondatutakofitxategia" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "%u TAR goiburu mota ezezaguna, %s kidea" @@ -2320,7 +2341,7 @@ msgstr "" msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1172 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "%s hautapena ez da aurkitu" @@ -2461,114 +2482,114 @@ msgstr "Huts egin du CDROMa atzitzean" msgid "Problem closing the gzip file %s" msgstr "Arazoa fitxategia ixtean" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Ez da blokeorik erabiltzen ari irakurtzeko soilik den %s blokeo " "fitxategiarentzat" -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "Ezin izan da %s blokeo fitxategia ireki" -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:249 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Ez da blokeorik erabiltzen ari nfs %s muntatutako blokeo fitxategiarentzat" -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "Ezin izan da %s blokeoa hartu" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "%s azpiprozesuak segmentaziuo hutsegitea jaso du." -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:843 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "%s azpiprozesuak segmentaziuo hutsegitea jaso du." -#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "%s azpiprozesuak errore kode bat itzuli du (%u)" -#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "%s azpiprozesua ustekabean amaitu da" -#: apt-pkg/contrib/fileutl.cc:984 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Could not open file %s" msgstr "%s fitxategia ezin izan da ireki" -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1062 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "Ezin izan da %s(r)en kanalizazioa ireki" -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "Huts egin du IPC azpiprozesua sortzean" -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " msgstr "Huts egin du konpresorea exekutatzean " -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1297 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "irakurrita; oraindik %lu irakurtzeke, baina ez da ezer geratzen" -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "idatzita; oraindik %lu idazteke, baina ezin da" -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1681 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Arazoa fitxategia ixtean" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1693 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Arazoa fitxategia sinkronizatzean" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1704 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Arazoa fitxategia desestekatzean" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1717 msgid "Problem syncing the file" msgstr "Arazoa fitxategia sinkronizatzean" @@ -2766,19 +2787,19 @@ msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (type)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "'%s' mota ez da ezagutzen %u lerroan %s Iturburu zerrendan" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "%s fitxategia ezin izan da ireki" -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2814,7 +2835,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Ezin dira arazoak konpondu; hautsitako paketeak atxiki dituzu." -#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 +#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2823,7 +2844,7 @@ msgstr "" "Indize fitxategi batzuk ezin izan dira deskargatu; ez ikusi egin zaie, edo " "zaharrak erabili dira haien ordez." -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "%spartial zerrenda-direktorioa falta da." @@ -2923,14 +2944,14 @@ msgstr "Katxearen bertsio sistema ez da bateragarria" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 -#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 -#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 -#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 -#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 -#: apt-pkg/pkgcachegen.cc:561 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Errorea gertatu da %s prozesatzean (FindPkg)" @@ -2951,26 +2972,26 @@ msgstr "APT honek maneia dezakeen azalpen kopurua gainditu duzu." msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "APT honek maneia dezakeen mendekotasun muga gainditu duzu." -#: apt-pkg/pkgcachegen.cc:568 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "%s %s paketea ez da aurkitu fitxategi mendekotasunak prozesatzean" -#: apt-pkg/pkgcachegen.cc:1197 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "Ezin da atzitu %s iturburu paketeen zerrenda" -#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 -#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" msgstr "Pakete Zerrenda irakurtzen" -#: apt-pkg/pkgcachegen.cc:1302 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "Fitxategiaren erreferentziak biltzen" -#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "S/I errorea iturburu katxea gordetzean" @@ -2983,40 +3004,40 @@ msgstr "huts egin du izen-aldaketak, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "MD5Sum ez dator bat" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 msgid "Hash Sum mismatch" msgstr "Egiaztapena ez dator bat" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Ezin da %s pakete fitxategia analizatu (1)" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "Ez dago gako publiko erabilgarririk hurrengo gako ID hauentzat:\n" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3024,12 +3045,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3038,7 +3059,7 @@ msgstr "" "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu " "beharko duzu paketea. (arkitektura falta delako)" -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3047,7 +3068,7 @@ msgstr "" "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu " "beharko duzu paketea." -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3055,7 +3076,7 @@ msgstr "" "Paketearen indize fitxategiak hondatuta daude. 'Filename:' eremurik ez %s " "paketearentzat." -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "Tamaina ez dator bat" @@ -3107,7 +3128,7 @@ msgstr "Egiaztatzen... " msgid "Stored label: %s\n" msgstr "Gordetako Etiketa: %s \n" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 msgid "Unmounting CD-ROM...\n" msgstr "CD-ROM Desmuntatzen...\n" @@ -3169,30 +3190,30 @@ msgstr "" msgid "Copying package lists..." msgstr "Pakete zerrendak kopiatzen..." -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "Jatorri zerrenda berria idazten\n" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "Diskoarentzako jatorri sarrerak:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "%i erregistro grabaturik.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i erregistro eta %i galdutako fitxategi grabaturik.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i erregistro eta %i okerreko fitxategi grabaturik\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/fi.po b/po/fi.po index 9ca60943b..36a96a4be 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2008-12-11 14:52+0200\n" "Last-Translator: Tapio Lehtonen \n" "Language-Team: Finnish \n" @@ -97,73 +97,73 @@ msgstr "Käytetty tila yhteensä: " msgid "Package file %s is out of sync." msgstr "Pakettitiedosto %s ei ole ajan tasalla." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Yhtään pakettia ei löytynyt" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1243 #, fuzzy msgid "You must give at least one search pattern" msgstr "On annettava täsmälleen yksi lauseke" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Pakettia %s ei löydy" -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1526 msgid "Package files:" msgstr "Pakettitiedostot:" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Varasto ei ole ajan tasalla, pakettitiedostoa ei löydy kansiosta" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1547 msgid "Pinned packages:" msgstr "Paketit joissa tunniste:" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "(ei löydy)" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr " Asennettu: " -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr " Ehdokas: " -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "(ei mitään)" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr " Paketin tunnistenumero: " #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr " Versiotaulukko:" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s laitealustalle %s käännöksen päiväys %s %s\n" -#: cmdline/apt-cache.cc:1690 +#: cmdline/apt-cache.cc:1730 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -235,21 +235,29 @@ msgstr "" " -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n" "Lisätietoja apt-cache(8) ja apt.conf(5) käsikirjasivuilla.\n" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 #, fuzzy msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Kirjoita levylle nimi, kuten \"Debian 2.1r1 Levy 1\"" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" msgstr "Aseta levy asemaan ja paina Enter" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Nimen muuttaminen %s -> %s ei onnistunut" -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Toista tämä lopuille rompuille kasassasi." @@ -483,7 +491,7 @@ msgstr "Paketin %s uudelleenasennus ei ole mahdollista, sitä ei voi noutaa.\n" msgid "%s is already the newest version.\n" msgstr "%s on jo uusin versio.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n" @@ -591,8 +599,8 @@ 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:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kansion %s vapaan tilan määrä ei selvinnyt" @@ -632,7 +640,7 @@ msgstr "Keskeytä." msgid "Do you want to continue [Y/n]? " msgstr "Haluatko jatkaa [K/e]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Tiedoston %s nouto ei onnistunut %s\n" @@ -641,7 +649,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:1375 cmdline/apt-get.cc:2668 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "Nouto on valmis ja määrätty vain nouto" @@ -722,7 +730,7 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 msgid "The following information may help to resolve the situation:" msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:" @@ -779,7 +787,7 @@ msgstr "" "Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" " "ilmanpaketteja (tai ratkaise itse)." -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1973 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" @@ -790,85 +798,85 @@ msgstr "" "jos käytetään epävakaata jakelua, joitain vaadittuja paketteja ei ole\n" "vielä luotu tai siirretty Incoming-kansiosta." -#: cmdline/apt-get.cc:1995 +#: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "Rikkinäiset paketit" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2020 msgid "The following extra packages will be installed:" msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "Ehdotetut paketit:" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "Suositellut paketit:" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "Pakettia %s ei löytynyt" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2184 msgid "Calculating upgrade... " msgstr "Käsitellään päivitystä ... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Ei onnistunut" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2192 msgid "Done" msgstr "Valmis" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 msgid "Internal error, problem resolver broke stuff" msgstr "Sisäinen virhe, resolver rikkoi jotain" -#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "Noutokansiota ei saatu lukittua" -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2452 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:2493 cmdline/apt-get.cc:2805 +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, c-format msgid "Unable to find a source package for %s" msgstr "Paketin %s lähdekoodipakettia ei löytynyt" -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2514 #, c-format msgid "" "Please use:\n" @@ -876,86 +884,86 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2567 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Ohitetaan jo noudettu tiedosto \"%s\"\n" -#: cmdline/apt-get.cc:2605 +#: cmdline/apt-get.cc:2604 #, c-format msgid "You don't have enough free space in %s" msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2613 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2618 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "On noudettava %st lähdekoodiarkistoja.\n" -#: cmdline/apt-get.cc:2625 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" msgstr "Nouda lähdekoodi %s\n" -#: cmdline/apt-get.cc:2663 +#: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "Joidenkin arkistojen noutaminen ei onnistunut." -#: cmdline/apt-get.cc:2694 +#: cmdline/apt-get.cc:2693 #, 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:2706 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Purkukomento \"%s\" ei onnistunut.\n" -#: cmdline/apt-get.cc:2707 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n" -#: cmdline/apt-get.cc:2729 +#: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "Paketointikomento \"%s\" ei onnistunut.\n" -#: cmdline/apt-get.cc:2749 +#: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "Lapsiprosessi kaatui" -#: cmdline/apt-get.cc:2768 +#: cmdline/apt-get.cc:2767 msgid "Must specify at least one package to check builddeps for" msgstr "" "On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan" -#: cmdline/apt-get.cc:2793 +#: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Paketille %s ei ole saatavilla riippuvuustietoja" -#: cmdline/apt-get.cc:2840 +#: cmdline/apt-get.cc:2839 #, c-format msgid "%s has no build depends.\n" msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n" -#: cmdline/apt-get.cc:3010 +#: cmdline/apt-get.cc:3009 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -963,7 +971,7 @@ msgid "" msgstr "" "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy" -#: cmdline/apt-get.cc:3028 +#: cmdline/apt-get.cc:3027 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -971,14 +979,14 @@ msgid "" msgstr "" "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy" -#: cmdline/apt-get.cc:3051 +#: cmdline/apt-get.cc:3050 #, 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:3090 +#: cmdline/apt-get.cc:3089 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -987,7 +995,7 @@ msgstr "" "%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio " "ei vastaa versioriippuvuuksia" -#: cmdline/apt-get.cc:3096 +#: cmdline/apt-get.cc:3095 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -995,30 +1003,30 @@ msgid "" msgstr "" "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy" -#: cmdline/apt-get.cc:3119 +#: cmdline/apt-get.cc:3118 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s" -#: cmdline/apt-get.cc:3135 +#: cmdline/apt-get.cc:3133 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää." -#: cmdline/apt-get.cc:3140 +#: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "Paketointiriippuvuuksien käsittely ei onnistunut" -#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Avataan yhteys %s (%s)" -#: cmdline/apt-get.cc:3368 +#: cmdline/apt-get.cc:3366 msgid "Supported modules:" msgstr "Tuetut moduulit:" -#: cmdline/apt-get.cc:3409 +#: cmdline/apt-get.cc:3407 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1104,7 +1112,7 @@ msgstr "" "lisätietoja ja lisää valitsimia.\n" " This APT has Super Cow Powers.\n" -#: cmdline/apt-get.cc:3574 +#: cmdline/apt-get.cc:3572 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1175,7 +1183,7 @@ msgid "%s was already not hold.\n" msgstr "%s on jo uusin versio.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" @@ -1314,8 +1322,8 @@ msgstr "Yhteys aikakatkaistiin" msgid "Server closed the connection" msgstr "Palvelin sulki yhteyden" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 +#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 msgid "Read error" msgstr "Lukuvirhe" @@ -1328,8 +1336,8 @@ msgid "Protocol corruption" msgstr "Yhteyskäytäntö on turmeltunut" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 +#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 msgid "Write error" msgstr "Virhe kirjoitettaessa" @@ -1472,31 +1480,39 @@ 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:169 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Sisäinen virhe: Allekirjoitus kelpaa, mutta avaimen sormenjälki tuntematon?!" -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "LÖytyi ainakin yksi kelvoton allekirjoitus." -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:172 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Ei käynnistynyt \"%s\" allekirjoitusta tarkistamaan (onko gpgv asennettu?)" -#: methods/gpgv.cc:183 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Tapahtui tuntematon virhe suoritettaessa gpgv" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Seuraavat allekirjoitukset eivät olleet kelvollisia:\n" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1579,8 +1595,8 @@ msgstr "Sisäinen virhe" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1609,7 +1625,12 @@ msgstr "" msgid "Can not read mirror file '%s'" msgstr "Tiedostoa %s ei voitu avata" -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "Tiedostoa %s ei voitu avata" + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "" @@ -1704,7 +1725,7 @@ msgstr "" " -c=? Lue tämä asetustiedosto\n" " -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Tiedostoon %s kirjoittaminen ei onnistu" @@ -2079,23 +2100,23 @@ msgstr "" " -c=? Lue tämä asetustiedosto\n" " -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "Putkien luonti ei onnistunut" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "exec gzip ei onnistunut" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "Arkisto on turmeltunut" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "Tar-ohjelman laskema tarkistussumma ei täsmää, arkisto on turmeltunut" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Tuntematon TAR-otsikon tyyppi %u, tiedosto %s" @@ -2316,7 +2337,7 @@ msgstr "" msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1172 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "Valintaa %s ei löydy" @@ -2456,111 +2477,111 @@ msgstr "Komento stat ei toiminut rompulle" msgid "Problem closing the gzip file %s" msgstr "Pulmia tiedoston sulkemisessa" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Lukkoa ei käytetä kirjoitussuojatulle tiedostolle %s" -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "Lukkotiedostoa %s ei voitu avata" -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:249 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Lukitusta ei käytetä NFS-liitetylle tiedostolle %s" -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "Lukkoa %s ei saada" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Aliprosessi %s aiheutti suojausvirheen." -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:843 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Aliprosessi %s aiheutti suojausvirheen." -#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Aliprosessi %s palautti virhekoodin (%u)" -#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Aliprosessi %s lopetti odottamatta" -#: apt-pkg/contrib/fileutl.cc:984 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Could not open file %s" msgstr "Tiedostoa %s ei voitu avata" -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1062 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "Putkea %s ei voitu avata" -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "Prosessien välistä kommunikaatiota aliprosessiin ei saatu luotua" -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " msgstr "Pakkaajan käynnistäminen ei onnistunut" -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1297 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "read, vielä %lu lukematta mutta tiedosto loppui" -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "write, vielä %lu kirjoittamatta mutta epäonnistui" -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1681 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Pulmia tiedoston sulkemisessa" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1693 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Pulmia tehtäessä tiedostolle sync" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1704 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Pulmia tehtäessä tiedostolle unlink" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1717 msgid "Problem syncing the file" msgstr "Pulmia tehtäessä tiedostolle sync" @@ -2758,19 +2779,19 @@ msgstr "Rivi %u on väärän muotoinen lähdeluettelossa %s (tyyppi)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Tiedostoa %s ei voitu avata" -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2804,7 +2825,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Pulmia ei voi korjata, rikkinäisiä paketteja on pysytetty." -#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 +#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2813,7 +2834,7 @@ msgstr "" "Joidenkin hakemistotiedostojen nouto ei onnistunut, ne on ohitettu tai " "käytetty vanhoja. " -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "Luettelokansio %spartial puuttuu." @@ -2914,14 +2935,14 @@ msgstr "Pakettivaraston versionhallintajärjestelmä ei ole yhteensopiva" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 -#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 -#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 -#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 -#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 -#: apt-pkg/pkgcachegen.cc:561 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Tapahtui virhe käsiteltäessä %s (FindPkg)" @@ -2943,26 +2964,26 @@ msgstr "Jummijammi, tämä APT ei osaa käsitellä noin montaa kuvausta." msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Jummijammi, annoit enemmän riippuvuuksia kuin tämä APT osaa käsitellä." -#: apt-pkg/pkgcachegen.cc:568 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Pakettia %s %s ei löytynyt käsiteltäessä tiedostojen riippuvuuksia." -#: apt-pkg/pkgcachegen.cc:1197 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "stat ei toiminut lähdepakettiluettelolle %s" -#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 -#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" msgstr "Luetaan pakettiluetteloita" -#: apt-pkg/pkgcachegen.cc:1302 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "Kootaan tiedostojen tarjoamistietoja" -#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa" @@ -2975,40 +2996,40 @@ msgstr "nimen vaihto ei onnistunut, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "MD5Sum ei täsmää" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 msgid "Hash Sum mismatch" msgstr "Tarkistussumma ei täsmää" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Pakettitiedostoa %s (1) ei voi jäsentää" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "Julkisia avaimia ei ole saatavilla, avainten ID:t ovat:\n" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3016,12 +3037,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3030,7 +3051,7 @@ msgstr "" "En löytänyt pakettia %s vastaavaa tiedostoa. Voit ehkä joutua korjaamaan " "tämän paketin itse (puuttuvan arkkitehtuurin vuoksi)" -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3039,7 +3060,7 @@ msgstr "" "Pakettia %s vastaavaa tiedostoa ei löytynyt. Voit ehkä joutua korjaamaan " "tämän paketin itse." -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3047,7 +3068,7 @@ msgstr "" "Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-" "kenttää." -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "Koko ei täsmää" @@ -3099,7 +3120,7 @@ msgstr "Tunnistetaan... " msgid "Stored label: %s\n" msgstr "Tallennettu nimio: %s \n" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 msgid "Unmounting CD-ROM...\n" msgstr "Irrotetaan romppu...\n" @@ -3161,30 +3182,30 @@ msgstr "" msgid "Copying package lists..." msgstr "Kopioidaan pakettiluetteloita..." -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "Kirjoitetaan uusi lähdeluettelo\n" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "Tämän levyn lähdekoodipakettien luettelon tietueita ovat:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "Kirjoitettiin %i tietuetta.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Kirjoitettiin %i tietuetta joissa oli %i puuttuvaa tiedostoa.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Kirjoitettiin %i tietuetta joissa oli %i paritonta tiedostoa\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/fr.po b/po/fr.po index 181735457..45b16cb5a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-08 18:12+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2013-04-09 07:58+0200\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" @@ -97,72 +97,72 @@ msgstr "Total de l'espace attribué : " msgid "Package file %s is out of sync." msgstr "Fichier %s désynchronisé." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Aucun paquet n'a été trouvé" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1243 msgid "You must give at least one search pattern" msgstr "Vous devez fournir au moins un motif de recherche" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "Cette commande est obsolète. Veuillez utiliser « apt-mark showauto »." -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Impossible de trouver le paquet %s" -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1526 msgid "Package files:" msgstr "Fichiers du paquet :" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Le cache est désynchronisé, impossible de référencer un fichier" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1547 msgid "Pinned packages:" msgstr "Paquets épinglés :" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "(non trouvé)" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr " Installé : " -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr " Candidat : " -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "(aucun)" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr " Épinglage de paquet : " #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr " Table de version :" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s pour %s compilé sur %s %s\n" -#: cmdline/apt-cache.cc:1690 +#: cmdline/apt-cache.cc:1730 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -236,22 +236,30 @@ msgstr "" "plus\n" "d'informations.\n" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "" "Veuillez indiquer le nom de ce disque, par exemple « Debian 5.0.3 Disk 1 »" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" msgstr "" "Veuillez insérer un disque dans le lecteur et appuyez sur la touche Entrée" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Impossible de monter « %s » sur « %s »" -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" "Veuillez répéter cette opération pour tous les disques de votre jeu de " @@ -493,7 +501,7 @@ msgstr "" msgid "%s is already the newest version.\n" msgstr "%s est déjà la plus récente version disponible.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s passé en « installé manuellement ».\n" @@ -604,8 +612,8 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Après cette opération, %so d'espace disque seront libérés.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossible de déterminer l'espace disponible sur %s" @@ -648,7 +656,7 @@ msgstr "Annulation." msgid "Do you want to continue [Y/n]? " msgstr "Souhaitez-vous continuer [O/n] ? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossible de récupérer %s %s\n" @@ -657,7 +665,7 @@ msgstr "Impossible de récupérer %s %s\n" msgid "Some files failed to download" msgstr "Certains fichiers n'ont pu être téléchargés." -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "Téléchargement achevé et dans le mode téléchargement uniquement" @@ -747,7 +755,7 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 msgid "The following information may help to resolve the situation:" msgstr "L'information suivante devrait vous aider à résoudre la situation : " @@ -801,7 +809,7 @@ msgstr "" "Dépendances non satisfaites. Essayez « apt-get -f install » sans paquet\n" "(ou indiquez une solution)." -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1973 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" @@ -813,33 +821,33 @@ msgstr "" "la distribution unstable, que certains paquets n'ont pas encore\n" "été créés ou ne sont pas sortis d'Incoming." -#: cmdline/apt-get.cc:1995 +#: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "Paquets défectueux" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2020 msgid "The following extra packages will be installed:" msgstr "Les paquets supplémentaires suivants seront installés : " -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "Paquets suggérés :" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "Paquets recommandés :" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "Impossible de trouver le paquet %s" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s passé en « installé automatiquement ».\n" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -847,50 +855,50 @@ msgstr "" "Cette commande est obsolète. Veuillez utiliser « apt-mark auto » et « apt-" "mark manual »." -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2184 msgid "Calculating upgrade... " msgstr "Calcul de la mise à jour... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Échec" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2192 msgid "Done" msgstr "Fait" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 msgid "Internal error, problem resolver broke stuff" msgstr "" "Erreur interne, la tentative de résolution du problème a cassé certaines " "parties" -#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "Impossible de verrouiller le répertoire de téléchargement" -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" "Impossible de trouver une source de téléchargement de la version « %s » de " "« %s »" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "Téléchargement de %s %s" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2452 msgid "Must specify at least one package to fetch source for" msgstr "Vous devez spécifier au moins un paquet source" -#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossible de trouver une source de paquet pour %s" -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -900,7 +908,7 @@ msgstr "" "suivi de versions « %s » à l'adresse :\n" "%s\n" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2514 #, c-format msgid "" "Please use:\n" @@ -912,70 +920,70 @@ msgstr "" "pour récupérer les dernières mises à jour (éventuellement non encore " "publiées) du paquet.\n" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2567 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Saut du téléchargement du fichier « %s », déjà téléchargé\n" -#: cmdline/apt-get.cc:2605 +#: cmdline/apt-get.cc:2604 #, c-format msgid "You don't have enough free space in %s" msgstr "Pas assez d'espace disponible sur %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2613 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Nécessité de prendre %so/%so dans les sources.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2618 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Nécessité de prendre %so dans les sources.\n" -#: cmdline/apt-get.cc:2625 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" msgstr "Récupération des sources %s\n" -#: cmdline/apt-get.cc:2663 +#: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "Échec lors de la récupération de quelques archives." -#: cmdline/apt-get.cc:2694 +#: cmdline/apt-get.cc:2693 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Saut du décompactage des paquets sources déjà décompactés dans %s\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "La commande de décompactage « %s » a échoué.\n" -#: cmdline/apt-get.cc:2707 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Veuillez vérifier si le paquet dpkg-dev est installé.\n" -#: cmdline/apt-get.cc:2729 +#: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "La commande de construction « %s » a échoué.\n" -#: cmdline/apt-get.cc:2749 +#: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "Échec du processus fils" -#: cmdline/apt-get.cc:2768 +#: cmdline/apt-get.cc:2767 msgid "Must specify at least one package to check builddeps for" msgstr "" "Il faut spécifier au moins un paquet pour vérifier les dépendances de " "construction" -#: cmdline/apt-get.cc:2793 +#: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -985,17 +993,17 @@ msgstr "" "consulter la section à propos de APT::Architectures dans la page de manuel " "apt.conf(5)." -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossible d'obtenir les dépendances de construction pour %s" -#: cmdline/apt-get.cc:2840 +#: cmdline/apt-get.cc:2839 #, c-format msgid "%s has no build depends.\n" msgstr "%s n'a pas de dépendance de construction.\n" -#: cmdline/apt-get.cc:3010 +#: cmdline/apt-get.cc:3009 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -1004,7 +1012,7 @@ msgstr "" "La dépendance %s vis-à-vis de %s ne peut être satisfaite car %s n'est pas " "autorisé avec les paquets « %s »." -#: cmdline/apt-get.cc:3028 +#: cmdline/apt-get.cc:3027 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1013,14 +1021,14 @@ msgstr "" "La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s ne " "peut être trouvé" -#: cmdline/apt-get.cc:3051 +#: cmdline/apt-get.cc:3050 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Impossible de satisfaire la dépendance %s pour %s : le paquet installé %s " "est trop récent" -#: cmdline/apt-get.cc:3090 +#: cmdline/apt-get.cc:3089 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1029,7 +1037,7 @@ msgstr "" "La dépendance %s vis-à-vis de %s ne peut être satisfaite car aucune version " "disponible du paquet %s ne peut satisfaire les prérequis de version." -#: cmdline/apt-get.cc:3096 +#: cmdline/apt-get.cc:3095 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1038,31 +1046,31 @@ msgstr "" "La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s " "n'a pas de version disponible." -#: cmdline/apt-get.cc:3119 +#: cmdline/apt-get.cc:3118 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Impossible de satisfaire les dépendances %s pour %s : %s" -#: cmdline/apt-get.cc:3135 +#: cmdline/apt-get.cc:3133 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" "Les dépendances de compilation pour %s ne peuvent pas être satisfaites." -#: cmdline/apt-get.cc:3140 +#: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "Impossible d'activer les dépendances de construction" -#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, c-format msgid "Changelog for %s (%s)" msgstr "Journal des modifications pour %s (%s)" -#: cmdline/apt-get.cc:3368 +#: cmdline/apt-get.cc:3366 msgid "Supported modules:" msgstr "Modules reconnus :" -#: cmdline/apt-get.cc:3409 +#: cmdline/apt-get.cc:3407 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1152,7 +1160,7 @@ msgstr "" "apt.conf(5) pour plus d'informations et d'options.\n" " Cet APT a les « Super Cow Powers »\n" -#: cmdline/apt-get.cc:3574 +#: cmdline/apt-get.cc:3572 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1229,7 +1237,7 @@ msgid "%s was already not hold.\n" msgstr "%s était déjà marqué comme non figé.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" @@ -1395,8 +1403,8 @@ msgstr "Dépassement du délai de connexion" msgid "Server closed the connection" msgstr "Le serveur a fermé la connexion" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 +#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 msgid "Read error" msgstr "Erreur de lecture" @@ -1409,8 +1417,8 @@ msgid "Protocol corruption" msgstr "Corruption du protocole" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 +#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 msgid "Write error" msgstr "Erreur d'écriture" @@ -1556,32 +1564,40 @@ msgstr "" msgid "Unable to connect to %s:%s:" msgstr "Impossible de se connecter à %s:%s :" -#: methods/gpgv.cc:169 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Erreur interne : signature correcte, mais il est impossible de déterminer " "l'empreinte de la clé." -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Au moins une signature non valable a été rencontrée." -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Impossible d'exécuter « gpgv » pour contrôler la signature (veuillez " "vérifier si gpgv est installé)." -#: methods/gpgv.cc:183 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Erreur inconnue à l'exécution de gpgv" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Les signatures suivantes ne sont pas valables :\n" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1664,8 +1680,8 @@ msgstr "Erreur interne" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1694,7 +1710,12 @@ msgstr "Aucun fichier miroir « %s » n'a été trouvé" msgid "Can not read mirror file '%s'" msgstr "Impossible de lire le fichier de miroir « %s »." -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "Impossible de lire le fichier de miroir « %s »." + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "[Miroir : %s]" @@ -1793,7 +1814,7 @@ msgstr "" " -c=? Lit ce fichier de configuration\n" " -o=? Spécifie une option de configuration, p. ex. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Impossible d'écrire sur %s" @@ -2172,23 +2193,23 @@ msgstr "" " -o=? Place une option de configuration arbitraire, p. ex. -o dir::cache=/" "tmp\n" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "Échec de création de tubes" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "Impossible d'exécuter gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "Archive corrompue" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "Échec dans la somme de contrôle de tar, l'archive est corrompue" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Type d'en-tête %u inconnu pour TAR, partie %s" @@ -2414,7 +2435,7 @@ msgstr "%limin %lis" msgid "%lis" msgstr "%lis" -#: apt-pkg/contrib/strutl.cc:1172 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "La sélection %s n'a pu être trouvée" @@ -2558,48 +2579,48 @@ msgstr "Impossible d'accéder au cédérom." msgid "Problem closing the gzip file %s" msgstr "Problème de fermeture du fichier gzip %s" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Verrou non utilisé pour le fichier %s en lecture seule" -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "Impossible d'ouvrir le fichier verrou %s" -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:249 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Verrou non utilisé pour le fichier %s se situant sur une partition nfs" -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "Impossible d'obtenir le verrou %s" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" "La liste des fichiers ne peut pas être créée car « %s » n'est pas un " "répertoire" -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" "« %s » dans le répertoire « %s » a été ignoré car ce n'est pas un fichier " "ordinaire" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" "« %s » dans le répertoire « %s » a été ignoré car il n'utilise pas " "d'extension" -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" @@ -2607,70 +2628,70 @@ msgstr "" "« %s » dans le répertoire « %s » a été ignoré car il utilise une extension " "non valable" -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Le sous-processus %s a commis une violation d'accès mémoire" -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:843 #, c-format msgid "Sub-process %s received signal %u." msgstr "Le sous-processus %s a reçu le signal %u" -#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Le sous-processus %s a renvoyé un code d'erreur (%u)" -#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Le sous-processus %s s'est arrêté prématurément" -#: apt-pkg/contrib/fileutl.cc:984 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Could not open file %s" msgstr "Impossible d'ouvrir le fichier %s" -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1062 #, c-format msgid "Could not open file descriptor %d" msgstr "Impossible d'ouvrir le descripteur de fichier %d" -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "Impossible de créer un sous-processus IPC" -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " msgstr "Impossible d'exécuter la compression " -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1297 #, c-format msgid "read, still have %llu to read but none left" msgstr "lu(s), %llu restant à lire, mais rien n'est disponible" -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "écrit(s), %llu restant à écrire, mais l'écriture est impossible" -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1681 #, c-format msgid "Problem closing the file %s" msgstr "Problème de fermeture du fichier %s" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1693 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problème de renommage du fichier %s en %s" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1704 #, c-format msgid "Problem unlinking the file %s" msgstr "Problème de suppression du lien %s" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1717 msgid "Problem syncing the file" msgstr "Problème de synchronisation du fichier" @@ -2878,7 +2899,7 @@ msgid "Type '%s' is not known on line %u in source list %s" msgstr "" "Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2888,12 +2909,12 @@ msgstr "" "consulter la page de manuel apt.conf(5) et notamment la section à propos de " "APT::Immediate-Configure, pour plus d'informations. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, c-format msgid "Could not configure '%s'. " msgstr "Impossible de configurer « %s »." -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2932,7 +2953,7 @@ msgstr "" "Impossible de corriger les problèmes, des paquets défectueux sont en mode " "« garder en l'état »." -#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 +#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2940,7 +2961,7 @@ msgstr "" "Le téléchargement de quelques fichiers d'index a échoué, ils ont été " "ignorés, ou les anciens ont été utilisés à la place." -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, c-format msgid "List directory %spartial is missing." msgstr "Le répertoire %spartial pour les listes n'existe pas." @@ -3049,14 +3070,14 @@ msgstr "Le cache possède un système de version incompatible" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 -#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 -#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 -#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 -#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 -#: apt-pkg/pkgcachegen.cc:561 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Erreur apparue lors du traitement de %s (%s%d)" @@ -3085,28 +3106,28 @@ msgstr "" "Vous avez dépassé le nombre de dépendances que cette version d'APT est " "capable de traiter." -#: apt-pkg/pkgcachegen.cc:568 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Le paquet %s %s n'a pu être trouvé lors du traitement des dépendances des " "fichiers" -#: apt-pkg/pkgcachegen.cc:1197 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "Impossible de localiser la liste des paquets sources %s" -#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 -#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" msgstr "Lecture des listes de paquets" -#: apt-pkg/pkgcachegen.cc:1302 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "Assemblage des fichiers listés dans les champs Provides" -#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "" "Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources" @@ -3120,12 +3141,12 @@ msgstr "impossible de changer le nom, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "Somme de contrôle MD5 incohérente" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 msgid "Hash Sum mismatch" msgstr "Somme de contrôle de hachage incohérente" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3134,18 +3155,18 @@ msgstr "" "Impossible de trouver l'entrée « %s » attendue dans le fichier « Release » : " " ligne non valable dans sources.list ou fichier corrompu" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "" "Impossible de trouver la comme de contrôle de « %s » dans le fichier Release" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Aucune clé publique n'est disponible pour la/les clé(s) suivante(s) :\n" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3154,12 +3175,12 @@ msgstr "" "Le fichier « Release » pour %s a expiré (plus valable depuis %s). Les mises " "à jour depuis ce dépôt ne s'effectueront pas." -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribution en conflit : %s (%s attendu, mais %s obtenu)" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3170,12 +3191,12 @@ msgstr "" "GPG : %s : %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "Erreur de GPG : %s : %s" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3184,7 +3205,7 @@ msgstr "" "Impossible de localiser un fichier du paquet %s. Cela signifie que vous " "devrez corriger ce paquet vous-même (absence d'architecture)." -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3193,7 +3214,7 @@ msgstr "" "Impossible de localiser un fichier du paquet %s. Cela signifie que vous " "devrez corriger ce paquet vous-même." -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3201,7 +3222,7 @@ msgstr "" "Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » " "pour le paquet %s." -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "Taille incohérente" @@ -3253,7 +3274,7 @@ msgstr "Identification..." msgid "Stored label: %s\n" msgstr "Étiquette stockée : %s\n" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 msgid "Unmounting CD-ROM...\n" msgstr "Démontage du cédérom...\n" @@ -3317,30 +3338,30 @@ msgstr "" msgid "Copying package lists..." msgstr "Copie des listes de paquets..." -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "Écriture de la nouvelle liste de sources\n" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "Les entrées de listes de sources pour ce disque sont :\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "%i enregistrements écrits.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i enregistrements écrits avec %i fichiers manquants.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i enregistrements écrits avec %i fichiers qui ne correspondent pas\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/gl.po b/po/gl.po index 7b2965759..dc776f9e2 100644 --- a/po/gl.po +++ b/po/gl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_gl\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2011-05-12 15:28+0100\n" "Last-Translator: Miguel Anxo Bouzada \n" "Language-Team: galician \n" @@ -100,74 +100,74 @@ msgstr "Espazo total contabilizado: " msgid "Package file %s is out of sync." msgstr "O ficheiro de paquete %s está sen sincronizar." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Non se atopou ningún paquete" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1243 msgid "You must give at least one search pattern" msgstr "Debe fornecer cando menos un patrón de busca" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Non foi posíbel atopar o paquete %s" -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1526 msgid "Package files:" msgstr "Ficheiros de paquetes:" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "A caché está sen sincronizar, non se pode facer referencia a un ficheiro de " "paquetes" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1547 msgid "Pinned packages:" msgstr "Paquetes inmobilizados:" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "(non se atopou)" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr " Instalado: " -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr " Candidato: " -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "(ningún)" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr " Inmobilizado: " #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr " Táboa de versións:" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s para %s compilado en %s %s\n" -#: cmdline/apt-cache.cc:1690 +#: cmdline/apt-cache.cc:1730 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -241,20 +241,28 @@ msgstr "" "Vexa a páxina de manual apt-cache(8) e apt.conf(5) para obter mais " "información.\n" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Forneza un nome para este disco, como «Debian 5.0.3 Disco 1»" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" msgstr "Insira un disco na unidade e prema Intro" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Produciuse un fallo ao montar «%s» en «%s»" -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Repita este proceso para o resto de CD do seu conxunto." @@ -488,7 +496,7 @@ msgstr "A reinstalación de %s non é posíbel, non se pode descargar.\n" msgid "%s is already the newest version.\n" msgstr "%s xa é a versión máis recente.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s cambiado a instalado manualmente.\n" @@ -599,8 +607,8 @@ msgstr "Despois desta operación ocuparanse %sB de disco adicionais.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Despois desta operación liberaranse %sB de espazo de disco.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 #, c-format msgid "Couldn't determine free space in %s" msgstr "Non foi posíbel determinar o espazo libre en %s" @@ -639,7 +647,7 @@ msgstr "Interromper." msgid "Do you want to continue [Y/n]? " msgstr "Quere continuar [S/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Non foi posíbel obter %s %s\n" @@ -648,7 +656,7 @@ msgstr "Non foi posíbel obter %s %s\n" msgid "Some files failed to download" msgstr "Non foi posíbel descargar algúns ficheiros" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "Completouse a descarga no modo de só descargas" @@ -735,7 +743,7 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 msgid "The following information may help to resolve the situation:" msgstr "A seguinte información pode axudar a solucionar a situación:" @@ -787,7 +795,7 @@ msgstr "" "Dependencias incumpridas. Probe «apt-get -f install» sen paquetes (ou " "especifique unha solución)." -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1973 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" @@ -800,78 +808,78 @@ msgstr "" "algúns paquetes solicitados aínda non se creasen ou que se movesen da " "entrada." -#: cmdline/apt-get.cc:1995 +#: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "Paquetes estragados" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2020 msgid "The following extra packages will be installed:" msgstr "Instalaranse os seguintes paquetes extra:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "Paquetes suxeridos:" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "Paquetes recomendados:" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "Non foi posíbel atopar o paquete %s" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s está estabelecido para a súa instalación automática.\n" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2184 msgid "Calculating upgrade... " msgstr "Calculando a anovación... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Fallou" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2192 msgid "Done" msgstr "Feito" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 msgid "Internal error, problem resolver broke stuff" msgstr "Produciuse un erro interno, o solucionador interno estragou cousas" -#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "Non é posíbel bloquear o directorio de descargas" -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "Descargando %s %s" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2452 msgid "Must specify at least one package to fetch source for" msgstr "Ten que especificar polo menos un paquete para obter o código fonte" -#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, c-format msgid "Unable to find a source package for %s" msgstr "Non sé posíbel atopar un paquete fonte para %s" -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -880,7 +888,7 @@ msgstr "" "AVISO: o paquete «%s» mantense no sistema de control de versións «%s» en:\n" "%s\n" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2514 #, fuzzy, c-format msgid "" "Please use:\n" @@ -892,87 +900,87 @@ msgstr "" "para obter as últimas actualizacións (posibelmente non publicadas) do " "paquete.\n" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2567 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Omítese o ficheiro xa descargado «%s»\n" -#: cmdline/apt-get.cc:2605 +#: cmdline/apt-get.cc:2604 #, c-format msgid "You don't have enough free space in %s" msgstr "Non hai espazo libre abondo en %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2613 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Ten que recibir %sB/%sB de arquivos de fonte.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2618 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Ten que recibir %sB de arquivos de fonte.\n" -#: cmdline/apt-get.cc:2625 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" msgstr "Obter fonte %s\n" -#: cmdline/apt-get.cc:2663 +#: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "Non se puideron obter algúns arquivos." -#: cmdline/apt-get.cc:2694 +#: cmdline/apt-get.cc:2693 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Omítese o desempaquetado do código fonte xa desempaquetado en %s\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Fallou a orde de desempaquetado «%s».\n" -#: cmdline/apt-get.cc:2707 +#: cmdline/apt-get.cc:2706 #, 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:2729 +#: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "Fallou a orde de construción de «%s».\n" -#: cmdline/apt-get.cc:2749 +#: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "O proceso fillo fallou" -#: cmdline/apt-get.cc:2768 +#: cmdline/apt-get.cc:2767 msgid "Must specify at least one package to check builddeps for" msgstr "" "Ten que especificar polo menos un paquete para comprobarlle as dependencias " "de compilación" -#: cmdline/apt-get.cc:2793 +#: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Non é posíbel obter a información de dependencias de compilación de %s" -#: cmdline/apt-get.cc:2840 +#: cmdline/apt-get.cc:2839 #, c-format msgid "%s has no build depends.\n" msgstr "%s non ten dependencias de compilación.\n" -#: cmdline/apt-get.cc:3010 +#: cmdline/apt-get.cc:3009 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -981,7 +989,7 @@ msgstr "" "A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o " "paquete %s" -#: cmdline/apt-get.cc:3028 +#: cmdline/apt-get.cc:3027 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -990,14 +998,14 @@ msgstr "" "A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o " "paquete %s" -#: cmdline/apt-get.cc:3051 +#: cmdline/apt-get.cc:3050 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Non foi posíbel satisfacer a dependencia «%s» de %s: O paquete instalado %s " "é novo de máis" -#: cmdline/apt-get.cc:3090 +#: cmdline/apt-get.cc:3089 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1006,7 +1014,7 @@ msgstr "" "A dependencia «%s» de %s non se pode satisfacer porque ningunha versión " "dispoñíbel do paquete %s satisfai os requirimentos de versión" -#: cmdline/apt-get.cc:3096 +#: cmdline/apt-get.cc:3095 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1015,30 +1023,30 @@ msgstr "" "A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o " "paquete %s" -#: cmdline/apt-get.cc:3119 +#: cmdline/apt-get.cc:3118 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Non foi posíbel satisfacer a dependencia «%s» de %s: %s" -#: cmdline/apt-get.cc:3135 +#: cmdline/apt-get.cc:3133 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Non se puideron satisfacer as dependencias de construción de %s." -#: cmdline/apt-get.cc:3140 +#: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "Non se puideron procesar as dependencias de construción" -#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, c-format msgid "Changelog for %s (%s)" msgstr "Rexistro de cambios de %s (%s)" -#: cmdline/apt-get.cc:3368 +#: cmdline/apt-get.cc:3366 msgid "Supported modules:" msgstr "Módulos admitidos:" -#: cmdline/apt-get.cc:3409 +#: cmdline/apt-get.cc:3407 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1131,7 +1139,7 @@ msgstr "" "para obter mais información e opcións\n" " Este APT ten poderes da Super Vaca.\n" -#: cmdline/apt-get.cc:3574 +#: cmdline/apt-get.cc:3572 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1207,7 +1215,7 @@ msgid "%s was already not hold.\n" msgstr "%s xa é a versión máis recente.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" @@ -1346,8 +1354,8 @@ msgstr "Esgotouse o tempo para a conexión" msgid "Server closed the connection" msgstr "O servidor pechou a conexión" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 +#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 msgid "Read error" msgstr "Produciuse un erro de lectura" @@ -1360,8 +1368,8 @@ msgid "Protocol corruption" msgstr "Dano no protocolo" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 +#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 msgid "Write error" msgstr "Produciuse un erro de escritura" @@ -1505,32 +1513,40 @@ msgstr "Aconteceu algo malo, buscando «%s:%s» (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Non é posíbel conectar %s:%s:" -#: methods/gpgv.cc:169 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Erro interno: Sinatura correcta, pero non foi posíbel determinar a pegada " "dixital da chave" -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Atopouse polo menos unha sinatura incorrecta." -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Non é posíbel executar «gpgv» para verificar a sinatura (Está instalado " "gpgv?)" -#: methods/gpgv.cc:183 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Produciuse un erro descoñecido ao executar gpgv" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "As seguintes sinaturas non eran correctas:\n" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1615,8 +1631,8 @@ msgstr "Produciuse un erro interno" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1645,7 +1661,12 @@ msgstr "Non se atopou ningún ficheiro de replica «%s» " msgid "Can not read mirror file '%s'" msgstr "Non é posíbel ler o ficheiro de replica «%s»" -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "Non é posíbel ler o ficheiro de replica «%s»" + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "[Replica: %s]" @@ -1743,7 +1764,7 @@ msgstr "" " -o=? Estabelece unha opción de configuración, por exemplo: -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Non é posíbel escribir en %s" @@ -2119,23 +2140,23 @@ msgstr "" " -o=? Estabelece unha opción de configuración; por exemplo, -o dir::cache=/" "tmp\n" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "Non foi posíbel crear as canles" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "Non foi posíbel executar gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "Arquivo danado" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "A suma de comprobación do arquivo tar non coincide, está danado" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Tipo de cabeceira TAR %u descoñecido, membro %s" @@ -2359,7 +2380,7 @@ msgstr "%limin %lis" msgid "%lis" msgstr "%lis" -#: apt-pkg/contrib/strutl.cc:1172 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "Non se atopou a selección %s" @@ -2504,43 +2525,43 @@ msgstr "Non foi posíbel analizar o CD-ROM" msgid "Problem closing the gzip file %s" msgstr "Produciuse un problema ao pechar o arquivo gzip %s" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Non se empregan bloqueos para o ficheiro de bloqueo de só lectura %s" -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "Non foi posíbel abrir o ficheiro de bloqueo %s" -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:249 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Non se empregan bloqueos para o ficheiro de bloqueo montado por NFS %s" -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "Non foi posíbel obter o bloqueo %s" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "A lista de ficheiros non pode ser creada como «%s» non é un directorio" -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "Ignorando «%s» no directorio «%s» xa que non é un ficheiro regular" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" "Ignorando o ficheiro «%s» no directorio «%s» xa que non ten extensión de nome" -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" @@ -2548,70 +2569,70 @@ msgstr "" "Ignorando o ficheiro «%s» no directorio «%s» xa que ten unha extensión de " "nome incorrecta" -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "O subproceso %s recibiu un fallo de segmento." -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:843 #, c-format msgid "Sub-process %s received signal %u." msgstr "O subproceso %s recibiu o sinal %u." -#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "O subproceso %s devolveu un código de erro (%u)" -#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "O subproceso %s saíu de xeito inesperado" -#: apt-pkg/contrib/fileutl.cc:984 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Could not open file %s" msgstr "Non foi posíbel abrir o ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1062 #, c-format msgid "Could not open file descriptor %d" msgstr "Non foi posíbel abrir o descritor de ficheiro %d" -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "Non foi posíbel crear o IPC do subproceso" -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " msgstr "Non foi posíbel executar o compresor " -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1297 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "lectura, aínda hai %lu para ler pero non queda ningún" -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "escritura, aínda hai %lu para escribir pero non se puido" -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1681 #, c-format msgid "Problem closing the file %s" msgstr "Produciuse un problema ao pechar o ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1693 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Produciuse un problema ao renomear o ficheiro %s a %s" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1704 #, c-format msgid "Problem unlinking the file %s" msgstr "Produciuse un problema ao desligar o ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1717 msgid "Problem syncing the file" msgstr "Produciuse un problema ao sincronizar o ficheiro" @@ -2813,7 +2834,7 @@ msgstr "Liña %u mal construída na lista de orixes %s (tipo)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "O tipo «%s» non se coñece na liña %u da lista de orixes %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2822,12 +2843,12 @@ msgstr "" "Non foi posíbel facer a configuración inmediata en «%s». Vexa man 5 apt.conf " "baixo APT::Immediate-Configure para obter máis detalles. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Non foi posíbel abrir o ficheiro «%s»" -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2863,7 +2884,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Non é posíbel solucionar os problemas, ten retidos paquetes rotos." -#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 +#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2872,7 +2893,7 @@ msgstr "" "Algúns ficheiros de índice fallaron durante a descarga. Ignoráronse, ou " "foron utilizados algúns antigos no seu lugar" -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, c-format msgid "List directory %spartial is missing." msgstr "Non se atopa a lista de directorios %sparcial." @@ -2976,14 +2997,14 @@ msgstr "A caché ten un sistema de versionado incompatíbel" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 -#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 -#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 -#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 -#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 -#: apt-pkg/pkgcachegen.cc:561 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Produciuse un erro ao procesar %s (FindPkg)" @@ -3005,28 +3026,28 @@ msgstr "Vaites!, superou o número de descricións que este APT pode manexar." msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Vaites!, superou o número de dependencias que este APT pode manexar." -#: apt-pkg/pkgcachegen.cc:568 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Non foi posíbel atopar o paquete %s %s ao procesar as dependencias de " "ficheiros" -#: apt-pkg/pkgcachegen.cc:1197 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "Non foi posíbel atopar a lista de paquetes fonte %s" -#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 -#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" msgstr "Lendo as listas de paquetes" -#: apt-pkg/pkgcachegen.cc:1302 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "Recollendo as provisións de ficheiros" -#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "Produciuse un erro de E/S ao gravar a caché de fontes" @@ -3039,12 +3060,12 @@ msgstr "non foi posíbel cambiar o nome, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "A MD5Sum non coincide" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 msgid "Hash Sum mismatch" msgstr "A sumas «hash» non coinciden" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3053,29 +3074,29 @@ msgstr "" "Non é posíbel atopar a entrada agardada «%s» no ficheiro de publicación " "(entrada sources.list incorrecta ou ficheiro con formato incorrecto)" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "" "Non é posíbel ler a suma de comprobación para «%s» no ficheiro de publicación" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "Non hai unha chave pública dispoñíbel para os seguintes ID de chave:\n" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Conflito na distribución: %s (agardábase %s mais obtívose %s)" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3086,12 +3107,12 @@ msgstr "" "%s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "Produciuse un erro de GPG: %s %s" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3100,7 +3121,7 @@ msgstr "" "Non é posíbel atopar un ficheiro para o paquete %s. Isto pode significar que " "ten que arranxar este paquete a man. (Falta a arquitectura)" -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3109,7 +3130,7 @@ msgstr "" "Non é posíbel atopar un ficheiro para o paquete %s. Isto pode significar que " "ten que arranxar este paquete a man." -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3117,7 +3138,7 @@ msgstr "" "Os ficheiros de índices de paquetes están danados. Non hai un campo " "Filename: para o paquete %s." -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "Os tamaños non coinciden" @@ -3169,7 +3190,7 @@ msgstr "Identificando... " msgid "Stored label: %s\n" msgstr "Etiqueta almacenada: %s\n" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 msgid "Unmounting CD-ROM...\n" msgstr "Desmontando o CD-ROM...\n" @@ -3233,30 +3254,30 @@ msgstr "" msgid "Copying package lists..." msgstr "Copiando as listas de paquetes..." -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "Escribindo a nova lista de orixes\n" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "As entradas da lista de orixes deste disco son:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "Escribíronse %i rexistros.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Escribíronse %i rexistros con %i ficheiros que faltan.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Escribíronse %i rexistros con %i ficheiros que non coinciden\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/hu.po b/po/hu.po index a9f18732b..38c30018d 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt trunk\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2012-06-25 17:09+0200\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -99,73 +99,73 @@ msgstr "Nyilvántartott terület összesen: " msgid "Package file %s is out of sync." msgstr "%s csomagfájl nincs szinkronban." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Nem találhatók csomagok" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1243 msgid "You must give at least one search pattern" msgstr "Legalább egy keresési mintát meg kell adnia" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "Ez a parancs elavult. Használja helyette az „apt-mark showauto”-t." -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Ez a csomag nem található: %s" -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1526 msgid "Package files:" msgstr "Csomagfájlok:" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "A gyorsítótár nincs szinkronban, nem lehet kereszthivatkozni a csomagfájlra" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1547 msgid "Pinned packages:" msgstr "Rögzített csomagok:" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "(nem található)" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr " Telepítve: " -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr " Jelölt: " -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "(nincs)" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr " Csomagrögzítés: " #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr " Verziótáblázat:" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s erre: %s lefordítva ekkor: %s %s\n" -#: cmdline/apt-cache.cc:1690 +#: cmdline/apt-cache.cc:1730 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -236,20 +236,28 @@ msgstr "" "Lásd az apt-cache(8) és apt.conf(5) kézikönyvlapokat további " "információkért.\n" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Adja meg a lemez nevét, mint például „Debian 5.0.3 1. lemez”" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" msgstr "Helyezzen be egy lemezt a meghajtóba, és nyomja meg az Entert" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "„%s” csatolása a(z) „%s” könyvtárba meghiúsult" -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Ismételje meg a folyamatot készlete többi CD-jével is." @@ -481,7 +489,7 @@ msgstr "%s újratelepítése nem lehetséges, mert nem lehet letölteni.\n" msgid "%s is already the newest version.\n" msgstr "%s már a legújabb verzió.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s kézi telepítésűre állítva.\n" @@ -588,8 +596,8 @@ msgstr "A művelet után %sB lemezterület kerül felhasználásra.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "A művelet után %sB lemezterület szabadul fel.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nem határozható meg a szabad hely mennyisége itt: %s" @@ -628,7 +636,7 @@ msgstr "Megszakítva." msgid "Do you want to continue [Y/n]? " msgstr "Folytatni akarja [I/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Sikertelen letöltés: %s %s\n" @@ -637,7 +645,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:1375 cmdline/apt-get.cc:2668 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "A letöltés befejeződött a „csak letöltés” módban" @@ -724,7 +732,7 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 msgid "The following information may help to resolve the situation:" msgstr "Az alábbi információk segíthetnek megoldani a problémát:" @@ -776,7 +784,7 @@ msgstr "" "Teljesítetlen függőségek. Próbálja kiadni az „apt-get -f install” parancsot " "csomagok nélkül (vagy telepítse a függőségeket is!)." -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1973 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" @@ -788,33 +796,33 @@ msgstr "" "használja, 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:1995 +#: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "Törött csomagok" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2020 msgid "The following extra packages will be installed:" msgstr "Az alábbi extra csomagok kerülnek telepítésre:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "Javasolt csomagok:" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "Ajánlott csomagok:" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "Az alábbi csomag nem található: %s" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s megjelölve automatikusan telepítettként.\n" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -822,47 +830,47 @@ msgstr "" "Ez a parancs elavult. Használja helyette az „apt-mark auto” és az „apt-mark " "auto” parancsokat." -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2184 msgid "Calculating upgrade... " msgstr "Frissítés kiszámítása... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Sikertelen" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2192 msgid "Done" msgstr "Kész" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 msgid "Internal error, problem resolver broke stuff" msgstr "Belső hiba, a problémamegoldó hibát okozott" -#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "Nem lehet zárolni a letöltési könyvtárat" -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Nem található forrás a(z) „%2$s” „%1$s” verziójának letöltéséhez" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "Letöltés: %s %s" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2452 msgid "Must specify at least one package to fetch source for" msgstr "" "Legalább egy csomagot meg kell adni, amelynek a forrását le kell tölteni" -#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, c-format msgid "Unable to find a source package for %s" msgstr "Nem található forráscsomag ehhez: %s" -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -872,7 +880,7 @@ msgstr "" "karbantartva:\n" "%s\n" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2514 #, c-format msgid "" "Please use:\n" @@ -883,70 +891,70 @@ msgstr "" "bzr branch %s\n" "a csomag legújabb (esetleg kiadatlan) frissítéseinek letöltéséhez.\n" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2567 #, 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:2605 +#: cmdline/apt-get.cc:2604 #, c-format msgid "You don't have enough free space in %s" msgstr "Nincs elég szabad hely itt: %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2613 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Letöltendő forrásadat-mennyiség: %sB/%sB.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2618 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Letöltendő forrásadat-mennyiség: %sB.\n" -#: cmdline/apt-get.cc:2625 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" msgstr "Forrás letöltése: %s\n" -#: cmdline/apt-get.cc:2663 +#: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "Nem sikerült néhány archívumot letölteni." -#: cmdline/apt-get.cc:2694 +#: cmdline/apt-get.cc:2693 #, 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:2706 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "„%s” kibontási parancs nem sikerült.\n" -#: cmdline/apt-get.cc:2707 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Ellenőrizze, hogy a „dpkg-dev” csomag telepítve van-e.\n" -#: cmdline/apt-get.cc:2729 +#: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "„%s” elkészítési parancs nem sikerült.\n" -#: cmdline/apt-get.cc:2749 +#: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "Hiba a gyermekfolyamatnál" -#: cmdline/apt-get.cc:2768 +#: cmdline/apt-get.cc:2767 msgid "Must specify at least one package to check builddeps for" msgstr "" "Legalább egy csomagot adjon meg, amelynek fordítási függőségeit ellenőrizni " "kell" -#: cmdline/apt-get.cc:2793 +#: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -955,17 +963,17 @@ msgstr "" "Nem érhetők el architektúrainformációk ehhez: %s. A beállításokkal " "kapcsolatban lásd az apt.conf(5) APT::Architectures részét." -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nem lehet %s fordítási függőségeinek információit letölteni" -#: cmdline/apt-get.cc:2840 +#: cmdline/apt-get.cc:2839 #, 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:3010 +#: cmdline/apt-get.cc:3009 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -974,7 +982,7 @@ msgstr "" "%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s nem " "engedélyezett a(z) „%4$s” csomagokon" -#: cmdline/apt-get.cc:3028 +#: cmdline/apt-get.cc:3027 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -983,14 +991,14 @@ msgstr "" "%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s csomag nem " "található" -#: cmdline/apt-get.cc:3051 +#: cmdline/apt-get.cc:3050 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%2$s csomag %1$s függősége nem elégíthető ki: a telepített %3$s csomag túl " "friss" -#: cmdline/apt-get.cc:3090 +#: cmdline/apt-get.cc:3089 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -999,7 +1007,7 @@ msgstr "" "%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s csomag elérhető " "verziója nem elégíti ki a verziókövetelményeket" -#: cmdline/apt-get.cc:3096 +#: cmdline/apt-get.cc:3095 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1008,30 +1016,30 @@ msgstr "" "%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s csomagnak nincs " "jelölt verziója" -#: cmdline/apt-get.cc:3119 +#: cmdline/apt-get.cc:3118 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s csomag %1$s függősége nem elégíthető ki: %3$s" -#: cmdline/apt-get.cc:3135 +#: cmdline/apt-get.cc:3133 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s építési függőségei nem elégíthetők ki." -#: cmdline/apt-get.cc:3140 +#: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "Nem sikerült az építési függőségeket feldolgozni" -#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, c-format msgid "Changelog for %s (%s)" msgstr "Változási napló ehhez: %s (%s)" -#: cmdline/apt-get.cc:3368 +#: cmdline/apt-get.cc:3366 msgid "Supported modules:" msgstr "Támogatott modulok:" -#: cmdline/apt-get.cc:3409 +#: cmdline/apt-get.cc:3407 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1120,7 +1128,7 @@ msgstr "" "információkért és opciókért.\n" " Ez az APT a SzuperTehén Hatalmával rendelkezik.\n" -#: cmdline/apt-get.cc:3574 +#: cmdline/apt-get.cc:3572 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1195,7 +1203,7 @@ msgid "%s was already not hold.\n" msgstr "%s eddig sem volt visszafogva.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" @@ -1357,8 +1365,8 @@ msgstr "Időtúllépés a kapcsolatban" msgid "Server closed the connection" msgstr "A kiszolgáló lezárta a kapcsolatot" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 +#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 msgid "Read error" msgstr "Olvasási hiba" @@ -1371,8 +1379,8 @@ msgid "Protocol corruption" msgstr "Protokollhiba" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 +#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 msgid "Write error" msgstr "Írási hiba" @@ -1516,29 +1524,37 @@ msgstr "Hiba történt „%s:%s” feloldásakor (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Nem lehet csatlakozni ehhez: %s:%s:" -#: methods/gpgv.cc:169 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Belső hiba: Jó aláírás, de nem állapítható meg a kulcs ujjlenyomata." -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Legalább egy aláírás érvénytelen." -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Nem indítható el a „gpgv” az aláírás ellenőrzéséhez (telepítve van a gpgv?)" -#: methods/gpgv.cc:183 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Ismeretlen gpgv futtatási hiba" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Az alábbi aláírások érvénytelenek voltak:\n" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1621,8 +1637,8 @@ msgstr "Belső hiba" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1651,7 +1667,12 @@ msgstr "Nem található a(z) „%s” tükörfájl " msgid "Can not read mirror file '%s'" msgstr "A(z) „%s” tükörfájl nem olvasható" -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "A(z) „%s” tükörfájl nem olvasható" + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "[Tükör: %s]" @@ -1748,7 +1769,7 @@ msgstr "" " -c=? Ezt a konfigurációs fájlt olvassa be\n" " -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Nem lehet írni ebbe: %s" @@ -2122,23 +2143,23 @@ msgstr "" " -c=? Ezt a konfigurációs fájlt olvassa be\n" " -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "Nem sikerült adatcsatornákat létrehozni" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "Nem sikerült a gzipet futtatni " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "Hibás archívum" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "Tar ellenőrzőösszeg nem egyezik, az archívum megsérült" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Ismeretlen a(z) %u TAR fejléctípus, %s tag" @@ -2361,7 +2382,7 @@ msgstr "%lip %limp" msgid "%lis" msgstr "%limp" -#: apt-pkg/contrib/strutl.cc:1172 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "%s kiválasztás nem található" @@ -2504,45 +2525,45 @@ msgstr "Nem sikerült elérni a CD-ROM-ot." msgid "Problem closing the gzip file %s" msgstr "Hiba a(z) %s gzip fájl bezárásakor" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Nem lesz zárolva a(z) „%s” csak olvasható zárolási fájl" -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "%s zárolási fájl nem nyitható meg" -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:249 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Nem lesz zárolva a(z) %s NFS-csatolású zárolási fájl" -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "Nem sikerült zárolni: %s" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "A fájlok listáját nem lehetett létrehozni, mert „%s” nem könyvtár" -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" "„%s” figyelmen kívül hagyása a(z) „%s” könyvtárban, mert nem szabályos fájl" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" "„%s” fájl figyelmen kívül hagyása a(z) „%s” könyvtárban, mert nincs " "fájlkiterjesztése" -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" @@ -2550,70 +2571,70 @@ msgstr "" "„%s” fájl figyelmen kívül hagyása a(z) „%s” könyvtárban, mert érvénytelen " "fájlkiterjesztése van" -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "%s alfolyamat szegmentálási hibát okozott." -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:843 #, c-format msgid "Sub-process %s received signal %u." msgstr "A(z) %s alfolyamat %u számú szignált kapott." -#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "%s alfolyamat hibakóddal tért vissza (%u)" -#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "%s alfolyamat váratlanul kilépett" -#: apt-pkg/contrib/fileutl.cc:984 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Could not open file %s" msgstr "Nem lehet megnyitni a(z) %s fájlt" -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1062 #, c-format msgid "Could not open file descriptor %d" msgstr "Nem lehet megnyitni a(z) %d fájlleírót" -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "Nem sikerült az alfolyamat IPC-t létrehozni" -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " msgstr "Nem sikerült elindítani a tömörítőt " -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1297 #, c-format msgid "read, still have %llu to read but none left" msgstr "olvasás, még kellene %llu, de már az összes elfogyott" -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "írás, még kiírandó %llu, de ez nem lehetséges" -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1681 #, c-format msgid "Problem closing the file %s" msgstr "Hiba a(z) %s fájl bezárásakor" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1693 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Hiba a(z) %s fájl átnevezésekor erre: %s" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1704 #, c-format msgid "Problem unlinking the file %s" msgstr "Hiba a(z) %s fájl törlésekor" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1717 msgid "Problem syncing the file" msgstr "Hiba a fájl szinkronizálásakor" @@ -2820,7 +2841,7 @@ msgstr "A(z) %u. sor hibás a(z) %s forráslistában (típus)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "„%1$s” típus nem ismert a(z) %3$s forráslista %2$u. sorában" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2829,12 +2850,12 @@ msgstr "" "Nem lehetett a(z) „%s” közvetlen beállítását végrehajtani. A részletekért " "lásd a man 5 apt.conf oldalt az APT::Immediate-Configure címszó alatt. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, c-format msgid "Could not configure '%s'. " msgstr "A(z) „%s” beállítása sikertelen" -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2869,7 +2890,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "A problémák nem javíthatók, sérült csomagokat fogott vissza." -#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 +#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2877,7 +2898,7 @@ msgstr "" "Néhány indexfájlt nem sikerült letölteni. Figyelmen kívül lettek hagyva, " "vagy régebbiek lettek felhasználva." -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, c-format msgid "List directory %spartial is missing." msgstr "A(z) %spartial listakönyvtár hiányzik." @@ -2983,14 +3004,14 @@ msgstr "A gyorsítótárnak inkompatibilis verziórendszere van" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 -#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 -#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 -#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 -#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 -#: apt-pkg/pkgcachegen.cc:561 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Hiba történt a(z) %s feldolgozása során (%s%d)" @@ -3011,29 +3032,29 @@ msgstr "Az APT által kezelhető csomagleírások száma túllépve." msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Az APT által kezelhető függőségek száma túllépve." -#: apt-pkg/pkgcachegen.cc:568 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "A(z) %s %s csomag nem volt megtalálható a fájl függőségeinek feldolgozása " "közben" -#: apt-pkg/pkgcachegen.cc:1197 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nem lehet a(z) %s forrás csomaglistáját elérni" -#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 -#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" msgstr "Csomaglisták olvasása" # FIXME -#: apt-pkg/pkgcachegen.cc:1302 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "„Biztosítja” kapcsolatok összegyűjtése" -#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "IO hiba a forrás-gyorsítótár mentésekor" @@ -3046,12 +3067,12 @@ msgstr "sikertelen átnevezés, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "Az MD5Sum nem megfelelő" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 msgid "Hash Sum mismatch" msgstr "A Hash Sum nem megfelelő" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3060,16 +3081,16 @@ msgstr "" "A várt „%s” bejegyzés nem található a Release fájlban (Rossz sources.list " "bejegyzés vagy helytelenül formázott fájl)" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nem található a(z) „%s” ellenőrzőösszege a Release fájlban" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "Nem érhető el nyilvános kulcs az alábbi kulcsazonosítókhoz:\n" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3078,12 +3099,12 @@ msgstr "" "A Release fájl elavult ehhez: %s (érvénytelen ez óta: %s). A tároló " "frissítései nem kerülnek alkalmazásra." -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Ütköző disztribúció: %s (a várt %s helyett %s érkezett)" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3093,12 +3114,12 @@ msgstr "" "előző indexfájl lesz használva. GPG hiba: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "GPG hiba: %s: %s" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3107,7 +3128,7 @@ msgstr "" "Egy fájl nem található a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel " "kell kijavítani a csomagot. (hiányzó arch. miatt)" -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3116,14 +3137,14 @@ msgstr "" "Egy fájl nem található a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel " "kell kijavítani a csomagot." -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "A csomagindexfájlok megsérültek. Nincs Filename: mező a(z) %s csomaghoz." -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "A méret nem megfelelő" @@ -3175,7 +3196,7 @@ msgstr "Azonosítás... " msgid "Stored label: %s\n" msgstr "Tárolt címke: %s\n" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 msgid "Unmounting CD-ROM...\n" msgstr "CD-ROM leválasztása...\n" @@ -3239,30 +3260,30 @@ msgstr "" msgid "Copying package lists..." msgstr "Csomaglisták másolása..." -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "Új forráslista írása\n" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "A lemezhez tartozó forráslistabejegyzések a következők:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "%i rekord kiírva.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i rekord kiírva, %i hiányzó fájllal.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i rekord kiírva %i eltérő fájllal\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "%i rekord kiírva %i hiányzó és %i eltérő fájllal\n" diff --git a/po/it.po b/po/it.po index 183cc7df5..216616a48 100644 --- a/po/it.po +++ b/po/it.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2012-06-25 21:54+0200\n" "Last-Translator: Milo Casagrande \n" "Language-Team: Italian \n" @@ -98,74 +98,74 @@ msgstr "Totale spazio occupato: " msgid "Package file %s is out of sync." msgstr "Il file dei pacchetti %s non è sincronizzato." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Nessun pacchetto trovato" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1243 msgid "You must give at least one search pattern" msgstr "È necessario specificare almeno un modello per la ricerca" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" "Questo comando è deprecato. Utilizzare \"apt-mark showauto\" al suo posto." -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Impossibile trovare il pacchetto %s" -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1526 msgid "Package files:" msgstr "File dei pacchetti:" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "La cache non è sincronizzata, impossibile referenziare un file di pacchetti" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1547 msgid "Pinned packages:" msgstr "Pacchetti con gancio:" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "(non trovato)" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr " Installato: " -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr " Candidato: " -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "(nessuno)" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr " Gancio del pacchetto: " #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr " Tabella versione:" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s per %s compilato il %s %s\n" -#: cmdline/apt-cache.cc:1690 +#: cmdline/apt-cache.cc:1730 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -238,20 +238,28 @@ msgstr "" "Per maggiori informazioni, consultare le pagine di manuale apt-cache(8) e \n" "apt.conf(5).\n" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Dare un nome a questo disco, tipo \"Debian 5.0.3 Disco 1\"" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" msgstr "Inserire un disco nell'unità e premere Invio" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Mount di \"%s\" su \"%s\" non riuscito" -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Ripetere questo processo per il resto dei CD." @@ -490,7 +498,7 @@ msgstr "La reinstallazione di %s non è possibile, non può essere scaricato.\n" msgid "%s is already the newest version.\n" msgstr "%s è già alla versione più recente.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "È stato impostato %s per l'installazione manuale.\n" @@ -601,8 +609,8 @@ msgstr "Dopo quest'operazione, verranno occupati %sB di spazio su disco.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Dopo quest'operazione, verranno liberati %sB di spazio su disco.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossibile determinare lo spazio libero in %s" @@ -643,7 +651,7 @@ msgstr "Interrotto." msgid "Do you want to continue [Y/n]? " msgstr "Continuare [S/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossibile recuperare %s %s\n" @@ -652,7 +660,7 @@ msgstr "Impossibile recuperare %s %s\n" msgid "Some files failed to download" msgstr "Scaricamento di alcuni file non riuscito" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "Scaricamento completato e in modalità solo scaricamento" @@ -737,7 +745,7 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 msgid "The following information may help to resolve the situation:" msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione:" @@ -792,7 +800,7 @@ msgstr "" "Dipendenze non soddisfatte. Provare \"apt-get -f install\" senza pacchetti " "(o specificare una soluzione)." -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1973 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" @@ -804,33 +812,33 @@ msgstr "" "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:1995 +#: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "Pacchetti danneggiati" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2020 msgid "The following extra packages will be installed:" msgstr "I seguenti pacchetti saranno inoltre installati:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "Pacchetti suggeriti:" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "Pacchetti raccomandati:" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "Impossibile trovare il pacchetto %s" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s impostato automaticamente come installato.\n" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -838,48 +846,48 @@ msgstr "" "Questo comando è deprecato. Utilizzare \"apt-mark auto\" e \"apt-mark manual" "\" al suo posto." -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2184 msgid "Calculating upgrade... " msgstr "Calcolo dell'aggiornamento... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Non riuscito" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2192 msgid "Done" msgstr "Eseguito" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 msgid "Internal error, problem resolver broke stuff" msgstr "Errore interno, \"problem resolver\" ha rovinato qualcosa" -#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "Impossibile bloccare la directory di scaricamento" -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" "Impossibile trovare una sorgente per scaricare la versione \"%s\" di \"%s\"" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "Scaricamento di %s %s" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2452 msgid "Must specify at least one package to fetch source for" msgstr "" "È necessario specificare almeno un pacchetto di cui recuperare il sorgente" -#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossibile trovare un pacchetto sorgente per %s" -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -889,7 +897,7 @@ msgstr "" "all'interno del sistema di controllo della versione \"%s\" presso:\n" "%s\n" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2514 #, c-format msgid "" "Please use:\n" @@ -901,70 +909,70 @@ msgstr "" "per recuperare gli ultimi (forse non rilasciati) aggiornamenti del " "pacchetto.\n" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2567 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Il pacchetto \"%s\" già scaricato viene saltato\n" -#: cmdline/apt-get.cc:2605 +#: cmdline/apt-get.cc:2604 #, c-format msgid "You don't have enough free space in %s" msgstr "Lo spazio libero in %s è insufficiente" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2613 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "È necessario recuperare %sB/%sB di sorgenti.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2618 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "È necessario scaricare %sB di sorgenti.\n" -#: cmdline/apt-get.cc:2625 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" msgstr "Recupero sorgente %s\n" -#: cmdline/apt-get.cc:2663 +#: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "Recupero di alcuni archivi non riuscito." -#: cmdline/apt-get.cc:2694 +#: cmdline/apt-get.cc:2693 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Estrazione del pacchetto sorgente già estratto in %s saltata\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando di estrazione \"%s\" non riuscito.\n" -#: cmdline/apt-get.cc:2707 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Verificare che il pacchetto \"dpkg-dev\" sia installato.\n" -#: cmdline/apt-get.cc:2729 +#: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando \"%s\" di generazione non riuscito.\n" -#: cmdline/apt-get.cc:2749 +#: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "Creazione processo figlio non riuscita" -#: cmdline/apt-get.cc:2768 +#: cmdline/apt-get.cc:2767 msgid "Must specify at least one package to check builddeps for" msgstr "" "È necessario specificare almeno un pacchetto di cui controllare le " "dipendenze di generazione" -#: cmdline/apt-get.cc:2793 +#: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -973,17 +981,17 @@ msgstr "" "Informazioni sull'architettura non disponibili per %s. Consultare apt.conf" "(5) APT::Architectures per l'impostazione" -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossibile ottenere informazioni di dipendenza di generazione per %s" -#: cmdline/apt-get.cc:2840 +#: cmdline/apt-get.cc:2839 #, c-format msgid "%s has no build depends.\n" msgstr "%s non ha dipendenze di generazione.\n" -#: cmdline/apt-get.cc:3010 +#: cmdline/apt-get.cc:3009 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -992,7 +1000,7 @@ msgstr "" "La dipendenza %s per %s non può essere soddisfatta perché %s non è " "consentito su pacchetti \"%s\"" -#: cmdline/apt-get.cc:3028 +#: cmdline/apt-get.cc:3027 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1001,14 +1009,14 @@ msgstr "" "%s dipendenze per %s non possono essere soddisfatte perché il pacchetto %s " "non può essere trovato" -#: cmdline/apt-get.cc:3051 +#: cmdline/apt-get.cc:3050 #, 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 recente" -#: cmdline/apt-get.cc:3090 +#: cmdline/apt-get.cc:3089 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1017,7 +1025,7 @@ msgstr "" "La dipendenza %s per %s non può essere soddisfatta perché la versione " "candidata del pacchetto %s non può soddisfare i requisiti di versione" -#: cmdline/apt-get.cc:3096 +#: cmdline/apt-get.cc:3095 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1026,30 +1034,30 @@ msgstr "" "La dipendenza %s per %s non può essere soddisfatta perché il pacchetto %s " "non ha una versione candidata" -#: cmdline/apt-get.cc:3119 +#: cmdline/apt-get.cc:3118 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "La dipendenza %s per %s non è stata soddisfatta: %s" -#: cmdline/apt-get.cc:3135 +#: cmdline/apt-get.cc:3133 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Le dipendenze di generazione per %s non sono state soddisfatte." -#: cmdline/apt-get.cc:3140 +#: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "Elaborazione delle dipendenze di generazione non riuscita" -#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, c-format msgid "Changelog for %s (%s)" msgstr "Changelog per %s (%s)" -#: cmdline/apt-get.cc:3368 +#: cmdline/apt-get.cc:3366 msgid "Supported modules:" msgstr "Moduli supportati:" -#: cmdline/apt-get.cc:3409 +#: cmdline/apt-get.cc:3407 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1139,7 +1147,7 @@ msgstr "" "apt-get(8), sources.list(5) e apt.conf(5).\n" " Questo APT ha i poteri della Super Mucca.\n" -#: cmdline/apt-get.cc:3574 +#: cmdline/apt-get.cc:3572 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1215,7 +1223,7 @@ msgid "%s was already not hold.\n" msgstr "%s era già non bloccato.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" @@ -1376,8 +1384,8 @@ msgstr "Connessione scaduta" msgid "Server closed the connection" msgstr "Il server ha chiuso la connessione" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 +#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 msgid "Read error" msgstr "Errore di lettura" @@ -1390,8 +1398,8 @@ msgid "Protocol corruption" msgstr "Protocollo danneggiato" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 +#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 msgid "Write error" msgstr "Errore di scrittura" @@ -1537,32 +1545,40 @@ msgstr "" msgid "Unable to connect to %s:%s:" msgstr "Impossibile connettersi a %s:%s:" -#: methods/gpgv.cc:169 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Errore interno: firma corretta, ma non è possibile determinare l'impronta " "della chiave." -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "È stata trovata almeno una firma non valida." -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Impossibile eseguire \"gpgv\" per verificare la firma (forse gpgv non è " "installato)" -#: methods/gpgv.cc:183 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Errore sconosciuto durante l'esecuzione di gpgv" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Le seguenti firme non erano valide:\n" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1645,8 +1661,8 @@ msgstr "Errore interno" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1675,7 +1691,12 @@ msgstr "Nessun file mirror \"%s\" trovato " msgid "Can not read mirror file '%s'" msgstr "Impossibile leggere il file mirror \"%s\"" -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "Impossibile leggere il file mirror \"%s\"" + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "[Mirror: %s]" @@ -1776,7 +1797,7 @@ msgstr "" " -c=? Legge come configurazione il file specificato\n" " -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Impossibile scrivere in %s" @@ -2150,23 +2171,23 @@ msgstr "" " -c=? Legge come configurazione il file specificato\n" " -o=? Imposta un'opzione di configurazione, es. -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "Creazione delle pipe non riuscita" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "Esecuzione di gzip non riuscita " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "Archivio danneggiato" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "Checksum di tar non riuscito, archivio danneggiato" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Intestazione TAR di tipo %u sconosciuta, member %s" @@ -2392,7 +2413,7 @@ msgstr "%limin %lis" msgid "%lis" msgstr "%lis" -#: apt-pkg/contrib/strutl.cc:1172 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "Selezione %s non trovata" @@ -2539,46 +2560,46 @@ msgstr "Esecuzione di stat sul CD-ROM non riuscita" msgid "Problem closing the gzip file %s" msgstr "Si è verificato un problema nel chiudere il file gzip %s" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Blocco disabilitato per il file di blocco in sola lettura %s" -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "Impossibile aprire il file di blocco %s" -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:249 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Blocco disabilitato per il file di blocco %s montato via nfs" -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "Impossibile impostare il blocco %s" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" "L'elenco dei file non può essere creato poiché \"%s\" non è una directory" -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" "Viene ignorato \"%s\" nella directory \"%s\" poiché non è un file regolare" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" "Viene ignorato il file \"%s\" nella directory \"%s\" poiché non ha " "un'estensione" -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" @@ -2586,70 +2607,70 @@ msgstr "" "Viene ignorato il file \"%s\" nella directory \"%s\" poiché ha un'estensione " "non valida" -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Il sottoprocesso %s ha ricevuto un segmentation fault." -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:843 #, c-format msgid "Sub-process %s received signal %u." msgstr "Il sottoprocesso %s ha ricevuto il segnale %u." -#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Il sottoprocesso %s ha restituito un codice d'errore (%u)" -#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Il sottoprocesso %s è uscito inaspettatamente" -#: apt-pkg/contrib/fileutl.cc:984 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Could not open file %s" msgstr "Impossibile aprire il file %s" -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1062 #, c-format msgid "Could not open file descriptor %d" msgstr "Impossibile aprire il descrittore del file %d" -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "Creazione di un sottoprocesso IPC non riuscita" -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " msgstr "Esecuzione non riuscita del compressore " -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1297 #, c-format msgid "read, still have %llu to read but none left" msgstr "lettura, ancora %llu da leggere, ma non è stato trovato nulla" -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "scrittura, ancora %llu da scrivere, ma non è possibile" -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1681 #, c-format msgid "Problem closing the file %s" msgstr "Si è verificato un problema nel chiudere il file %s" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1693 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Si è verificato un problema nel rinominare il file %s in %s" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1704 #, c-format msgid "Problem unlinking the file %s" msgstr "Si è verificato un problema nell'eseguire l'unlink del file %s" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1717 msgid "Problem syncing the file" msgstr "Si è verificato un problema nel sincronizzare il file" @@ -2857,7 +2878,7 @@ msgstr "La riga %u nel file %s non è corretta (type)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipo \"%s\" non riconosciuto alla riga %u nel file %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2867,12 +2888,12 @@ msgstr "" "maggiori informazioni, consultare \"man 5 apt.conf\" alla sezione \"APT::" "Immediate-Configure\" (%d)." -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, c-format msgid "Could not configure '%s'. " msgstr "Impossibile configurare \"%s\". " -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2910,7 +2931,7 @@ msgid "Unable to correct problems, you have held broken packages." msgstr "" "Impossibile correggere i problemi, ci sono pacchetti danneggiati bloccati." -#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 +#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2919,7 +2940,7 @@ msgstr "" "usati quelli vecchi." # (ndt) sarebbe da controllare meglio assieme a quella dopo -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, c-format msgid "List directory %spartial is missing." msgstr "Manca la directory di liste %spartial." @@ -3026,14 +3047,14 @@ msgstr "La cache ha un sistema di gestione delle versioni incompatibile" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 -#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 -#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 -#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 -#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 -#: apt-pkg/pkgcachegen.cc:561 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Si è verificato un errore nell'elaborare %s (%s%d)" @@ -3056,29 +3077,29 @@ msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "È stato superato il numero di dipendenze che questo APT può gestire." # (ndt) il primo è il nome del pacchetto, il secondo la versione -#: apt-pkg/pkgcachegen.cc:568 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Il pacchetto %s v.%s non è stato trovato durante l'elaborazione delle " "dipendenze" -#: apt-pkg/pkgcachegen.cc:1197 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "Impossibile eseguire stat sull'elenco dei pacchetti sorgente %s" -#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 -#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" msgstr "Lettura elenco dei pacchetti" # (ndt) non mi convince per niente, ma vediamo cosa salta fuori -#: apt-pkg/pkgcachegen.cc:1302 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "Il file fornisce" -#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "Errore di I/O nel salvare la cache sorgente" @@ -3091,12 +3112,12 @@ msgstr "rename() non riuscita: %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "MD5sum non corrispondente" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 msgid "Hash Sum mismatch" msgstr "Somma hash non corrispondente" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3105,17 +3126,17 @@ msgstr "" "Impossibile trovare la voce \"%s\" nel file Release (voce in sources.list " "errata o file danneggiato)" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Impossibile trovare la somma hash per \"%s\" nel file Release" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Non è disponibile alcuna chiave pubblica per i seguenti ID di chiavi:\n" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3124,12 +3145,12 @@ msgstr "" "Il file Release per %s è scaduto (non valido dal %s). Gli aggiornamenti per " "questo repository non verranno applicati." -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribuzione in conflitto: %s (atteso %s ma ottenuto %s)" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3139,12 +3160,12 @@ msgstr "" "aggiornato e verranno usati i file indice precedenti. Errore GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "Errore GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3153,7 +3174,7 @@ msgstr "" "Impossibile trovare un file per il pacchetto %s. Potrebbe essere necessario " "sistemare manualmente questo pacchetto (a causa dell'architettura mancante)." -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3163,7 +3184,7 @@ msgstr "" "correggere manualmente questo pacchetto." # (ndt) sarebbe da controllare se veramente possono esistere più file indice -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3171,7 +3192,7 @@ msgstr "" "I file indice del pacchetto sono danneggiati. Manca il campo \"Filename:\" " "per il pacchetto %s." -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "Le dimensioni non corrispondono" @@ -3223,7 +3244,7 @@ msgstr "Identificazione... " msgid "Stored label: %s\n" msgstr "Etichette archiviate: %s\n" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 msgid "Unmounting CD-ROM...\n" msgstr "Smontaggio CD-ROM...\n" @@ -3287,30 +3308,30 @@ msgstr "" msgid "Copying package lists..." msgstr "Copia elenco pacchetti..." -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "Scrittura nuovo elenco sorgenti\n" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "Le voci dell'elenco sorgenti per questo disco sono:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "Scritti %i record.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Scritti %i record con %i file mancanti.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Scritti %i record con %i file senza corrispondenze\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/ja.po b/po/ja.po index 344adfd21..20a1162bc 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.1\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2012-07-01 00:14+0900\n" "Last-Translator: Kenshi Muto \n" "Language-Team: Debian Japanese List \n" @@ -96,73 +96,73 @@ msgstr "総占有容量: " msgid "Package file %s is out of sync." msgstr "Package ファイル %s が同期していません。" -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "パッケージが見つかりません" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1243 msgid "You must give at least one search pattern" msgstr "検索パターンはちょうど 1 つだけ指定してください" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" "このコマンドは時代遅れです。'apt-mark showauto' を代わりに使用してください。" -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "パッケージ %s が見つかりません" -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1526 msgid "Package files:" msgstr "パッケージファイル:" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "キャッシュが同期しておらず、パッケージファイルを相互参照できません" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1547 msgid "Pinned packages:" msgstr "Pin されたパッケージ:" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "(見つかりません)" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr " インストールされているバージョン: " -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr " 候補: " -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "(なし)" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr " パッケージ Pin: " #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr " バージョンテーブル:" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s for %s コンパイル日時: %s %s\n" -#: cmdline/apt-cache.cc:1690 +#: cmdline/apt-cache.cc:1730 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -232,20 +232,28 @@ msgstr "" " -o=? 指定した設定オプションを読み込む (例: -o dir::cache=/tmp)\n" "詳細は、apt-cache(8) や apt.conf(5) のマニュアルページを参照してください。\n" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "このディスクに、'Debian 5.0.3 Disk 1' のような名前を付けてください" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" msgstr "ディスクをドライブに入れて Enter キーを押してください" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "'%s' を '%s' にマウントできませんでした" -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" "あなたの持っている CD セットの残り全部に、この手順を繰り返してください。" @@ -485,7 +493,7 @@ msgstr "ダウンロードできないため、%s の再インストールは不 msgid "%s is already the newest version.\n" msgstr "%s はすでに最新バージョンです。\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s は手動でインストールしたと設定されました。\n" @@ -595,8 +603,8 @@ msgstr "この操作後に追加で %sB のディスク容量が消費されま msgid "After this operation, %sB disk space will be freed.\n" msgstr "この操作後に %sB のディスク容量が解放されます。\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s の空き領域を測定できません" @@ -635,7 +643,7 @@ msgstr "中断しました。" msgid "Do you want to continue [Y/n]? " msgstr "続行しますか [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s の取得に失敗しました %s\n" @@ -644,7 +652,7 @@ msgstr "%s の取得に失敗しました %s\n" msgid "Some files failed to download" msgstr "いくつかのファイルの取得に失敗しました" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "ダウンロードオンリーモードでパッケージのダウンロードが完了しました" @@ -726,7 +734,7 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 msgid "The following information may help to resolve the situation:" msgstr "以下の情報がこの問題を解決するために役立つかもしれません:" @@ -775,7 +783,7 @@ msgstr "" "未解決の依存関係です。'apt-get -f install' を実行してみてください (または解法" "を明示してください)。" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1973 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" @@ -787,33 +795,33 @@ msgstr "" "であれば) 必要なパッケージがまだ作成されていなかったり Incoming から移\n" "動されていないことが考えられます。" -#: cmdline/apt-get.cc:1995 +#: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "壊れたパッケージ" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2020 msgid "The following extra packages will be installed:" msgstr "以下の特別パッケージがインストールされます:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "提案パッケージ:" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "推奨パッケージ:" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "パッケージ %s が見つかりません" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s は自動でインストールしたと設定されました。\n" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -821,47 +829,47 @@ msgstr "" "このコマンドは時代遅れです。'apt-mark auto' および 'apt-mark manual' を代わり" "に使用してください。" -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2184 msgid "Calculating upgrade... " msgstr "アップグレードパッケージを検出しています ... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "失敗" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2192 msgid "Done" msgstr "完了" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 msgid "Internal error, problem resolver broke stuff" msgstr "内部エラー、問題リゾルバが何かを破壊しました" -#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "ダウンロードディレクトリをロックできません" -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "'%2$s' のバージョン '%1$s' をダウンロードするソースが見つかりません" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "%s %s をダウンロードしています" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2452 msgid "Must specify at least one package to fetch source for" msgstr "" "ソースを取得するには少なくとも 1 つのパッケージ名を指定する必要があります" -#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, c-format msgid "Unable to find a source package for %s" msgstr "%s のソースパッケージが見つかりません" -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -871,7 +879,7 @@ msgstr "" "ます:\n" "%s\n" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2514 #, c-format msgid "" "Please use:\n" @@ -883,70 +891,70 @@ msgstr "" "bzr branch %s\n" "を使用してください。\n" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2567 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "すでにダウンロードされたファイル '%s' をスキップします\n" -#: cmdline/apt-get.cc:2605 +#: cmdline/apt-get.cc:2604 #, c-format msgid "You don't have enough free space in %s" msgstr "%s に充分な空きスペースがありません" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2613 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%2$sB 中 %1$sB のソースアーカイブを取得する必要があります。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2618 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB のソースアーカイブを取得する必要があります。\n" -#: cmdline/apt-get.cc:2625 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" msgstr "ソース %s を取得\n" -#: cmdline/apt-get.cc:2663 +#: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "いくつかのアーカイブの取得に失敗しました。" -#: cmdline/apt-get.cc:2694 +#: cmdline/apt-get.cc:2693 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "すでに %s に展開されたソースがあるため、展開をスキップします\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "展開コマンド '%s' が失敗しました。\n" -#: cmdline/apt-get.cc:2707 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" "'dpkg-dev' パッケージがインストールされていることを確認してください。\n" -#: cmdline/apt-get.cc:2729 +#: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "ビルドコマンド '%s' が失敗しました。\n" -#: cmdline/apt-get.cc:2749 +#: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "子プロセスが失敗しました" -#: cmdline/apt-get.cc:2768 +#: cmdline/apt-get.cc:2767 msgid "Must specify at least one package to check builddeps for" msgstr "" "ビルド依存関係をチェックするパッケージを少なくとも 1 つ指定する必要があります" -#: cmdline/apt-get.cc:2793 +#: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -955,17 +963,17 @@ msgstr "" "%s に利用可能なアーキテクチャ情報がありません。セットアップのために apt.conf" "(5) の APT::Architectures を参照してください。" -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s のビルド依存情報を取得できません" -#: cmdline/apt-get.cc:2840 +#: cmdline/apt-get.cc:2839 #, c-format msgid "%s has no build depends.\n" msgstr "%s にはビルド依存情報が指定されていません。\n" -#: cmdline/apt-get.cc:3010 +#: cmdline/apt-get.cc:3009 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -974,7 +982,7 @@ msgstr "" "パッケージ %3$s が '%4$s' パッケージで許されていないため、%2$s に対する %1$s " "の依存関係を満たすことができません" -#: cmdline/apt-get.cc:3028 +#: cmdline/apt-get.cc:3027 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -983,14 +991,14 @@ msgstr "" "パッケージ %3$s が見つからないため、%2$s に対する %1$s の依存関係を満たすこと" "ができません" -#: cmdline/apt-get.cc:3051 +#: cmdline/apt-get.cc:3050 #, 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:3090 +#: cmdline/apt-get.cc:3089 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -999,7 +1007,7 @@ msgstr "" "パッケージ %3$s の候補バージョンはバージョンについての要求を満たせないた" "め、%2$s に対する %1$s の依存関係を満たすことができません" -#: cmdline/apt-get.cc:3096 +#: cmdline/apt-get.cc:3095 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1008,30 +1016,30 @@ msgstr "" "パッケージ %3$s の候補バージョンが存在しないため、%2$s に対する %1$s の依存関" "係を満たすことができません" -#: cmdline/apt-get.cc:3119 +#: cmdline/apt-get.cc:3118 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s の依存関係 %1$s を満たすことができません: %3$s" -#: cmdline/apt-get.cc:3135 +#: cmdline/apt-get.cc:3133 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s のビルド依存関係を満たすことができませんでした。" -#: cmdline/apt-get.cc:3140 +#: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "ビルド依存関係の処理に失敗しました" -#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, c-format msgid "Changelog for %s (%s)" msgstr "%s (%s) の変更履歴" -#: cmdline/apt-get.cc:3368 +#: cmdline/apt-get.cc:3366 msgid "Supported modules:" msgstr "サポートされているモジュール:" -#: cmdline/apt-get.cc:3409 +#: cmdline/apt-get.cc:3407 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1123,7 +1131,7 @@ msgstr "" "apt-get(8)、sources.list(5)、apt.conf(5) を参照してください。\n" " この APT は Super Cow Powers 化されています。\n" -#: cmdline/apt-get.cc:3574 +#: cmdline/apt-get.cc:3572 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1198,7 +1206,7 @@ msgid "%s was already not hold.\n" msgstr "%s はすでに保留されていません。\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" @@ -1356,8 +1364,8 @@ msgstr "接続タイムアウト" msgid "Server closed the connection" msgstr "サーバが接続を切断しました" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 +#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 msgid "Read error" msgstr "読み込みエラー" @@ -1370,8 +1378,8 @@ msgid "Protocol corruption" msgstr "プロトコルが壊れています" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 +#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 msgid "Write error" msgstr "書き込みエラー" @@ -1514,30 +1522,38 @@ msgstr "'%s:%s' (%i - %s) の解決中に何か問題が起こりました" msgid "Unable to connect to %s:%s:" msgstr "%s:%s へ接続できません:" -#: methods/gpgv.cc:169 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "内部エラー: 正しい署名ですが、鍵指紋を確定できません?!" -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "少なくとも 1 つの不正な署名が発見されました。" -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "署名を検証するための 'gpgv' の実行ができませんでした (gpgv はインストールされ" "ていますか?)" -#: methods/gpgv.cc:183 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "gpgv の実行中に未知のエラーが発生" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "以下の署名が無効です:\n" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1618,8 +1634,8 @@ msgstr "内部エラー" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1648,7 +1664,12 @@ msgstr "ミラーファイル '%s' が見つかりません " msgid "Can not read mirror file '%s'" msgstr "ミラーファイル '%s' を読み込めません" -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "ミラーファイル '%s' を読み込めません" + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "[ミラー: %s]" @@ -1742,7 +1763,7 @@ msgstr "" " -c=? 指定した設定ファイルを読み込む\n" " -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "%s に書き込めません" @@ -2114,23 +2135,23 @@ msgstr "" " -c=? 指定した設定ファイルを読み込む\n" " -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "パイプの生成に失敗しました" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "gzip の実行に失敗しました" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "壊れたアーカイブ" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "tar チェックサム検証が失敗しました。アーカイブが壊れています" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "未知の TAR ヘッダタイプ %u、メンバー %s" @@ -2353,7 +2374,7 @@ msgstr "%li分 %li秒" msgid "%lis" msgstr "%li秒" -#: apt-pkg/contrib/strutl.cc:1172 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "選択された %s が見つかりません" @@ -2495,43 +2516,43 @@ msgstr "CD-ROM の状態を取得するのに失敗しました" msgid "Problem closing the gzip file %s" msgstr "gzip ファイル %s のクローズ中に問題が発生しました" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "読み込み専用のロックファイル %s にロックは使用しません" -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "ロックファイル %s をオープンできません" -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:249 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "nfs マウントされたロックファイル %s にはロックを使用しません" -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "ロック %s が取得できませんでした" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "'%s' がディレクトリではないため、ファイルの一覧を作成できません" -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "ディレクトリ '%2$s' の '%1$s' が通常ファイルではないため、無視します" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" "ディレクトリ '%2$s' の '%1$s' がファイル名拡張子を持たないため、無視します" -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" @@ -2539,70 +2560,70 @@ msgstr "" "ディレクトリ '%2$s' の '%1$s' が無効なファイル名拡張子を持っているため、無視" "します" -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "子プロセス %s がセグメンテーション違反を受け取りました。" -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:843 #, c-format msgid "Sub-process %s received signal %u." msgstr "子プロセス %s がシグナル %u を受け取りました。" -#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "子プロセス %s がエラーコード (%u) を返しました" -#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "子プロセス %s が予期せず終了しました" -#: apt-pkg/contrib/fileutl.cc:984 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Could not open file %s" msgstr "ファイル %s をオープンできませんでした" -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1062 #, c-format msgid "Could not open file descriptor %d" msgstr "ファイルデスクリプタ %d を開けませんでした" -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "子プロセス IPC の生成に失敗しました" -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " msgstr "以下の圧縮ツールの実行に失敗しました: " -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1297 #, c-format msgid "read, still have %llu to read but none left" msgstr "読み込みが %llu 残っているはずですが、何も残っていません" -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "あと %llu 書き込む必要がありますが、書き込むことができませんでした" -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1681 #, c-format msgid "Problem closing the file %s" msgstr "ファイル %s のクローズ中に問題が発生しました" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1693 #, c-format msgid "Problem renaming the file %s to %s" msgstr "%s から %s へのファイル名変更中に問題が発生しました" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1704 #, c-format msgid "Problem unlinking the file %s" msgstr "ファイル %s の削除中に問題が発生しました" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1717 msgid "Problem syncing the file" msgstr "ファイルの同期中に問題が発生しました" @@ -2803,7 +2824,7 @@ msgstr "ソースリスト %2$s の %1$u 行目が不正です (type)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "ソースリスト %3$s の %2$u 行にあるタイプ '%1$s' は不明です" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2812,12 +2833,12 @@ msgstr "" "'%s' の即時設定は動作しません。詳細については man 5 apt.conf の APT::" "Immediate-Configure の項を参照してください。(%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, c-format msgid "Could not configure '%s'. " msgstr "'%s' を設定できませんでした。" -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2853,7 +2874,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "問題を解決することができません。壊れた変更禁止パッケージがあります。" -#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 +#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2861,7 +2882,7 @@ msgstr "" "いくつかのインデックスファイルのダウンロードに失敗しました。これらは無視され" "るか、古いものが代わりに使われます。" -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, c-format msgid "List directory %spartial is missing." msgstr "リストディレクトリ %spartial が見つかりません。" @@ -2971,14 +2992,14 @@ msgstr "キャッシュに非互換なバージョニングシステムがあり #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 -#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 -#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 -#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 -#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 -#: apt-pkg/pkgcachegen.cc:561 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "%s を処理中にエラーが発生しました (%s%d)" @@ -2999,26 +3020,26 @@ msgstr "この APT が対応している以上の数の説明が要求されま msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "この APT が対応している以上の数の依存関係が発生しました。" -#: apt-pkg/pkgcachegen.cc:568 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "パッケージ %s %s がファイル依存の処理中に見つかりませんでした" -#: apt-pkg/pkgcachegen.cc:1197 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "ソースパッケージリスト %s の状態を取得できません" -#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 -#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" msgstr "パッケージリストを読み込んでいます" -#: apt-pkg/pkgcachegen.cc:1302 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "ファイル提供情報を収集しています" -#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "ソースキャッシュの保存中に IO エラーが発生しました" @@ -3031,12 +3052,12 @@ msgstr "名前の変更に失敗しました。%s (%s -> %s)" msgid "MD5Sum mismatch" msgstr "MD5Sum が適合しません" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 msgid "Hash Sum mismatch" msgstr "ハッシュサムが適合しません" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3045,16 +3066,16 @@ msgstr "" "期待されるエントリ '%s' が Release ファイル内に見つかりません (誤った " "sources.list エントリか、壊れたファイル)" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Release ファイル中の '%s' のハッシュサムを見つけられません" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "以下の鍵 ID に対して利用可能な公開鍵がありません:\n" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3063,14 +3084,14 @@ msgstr "" "%s の Release ファイルは期限切れ (%s 以来無効) です。このリポジトリからの更新" "物は適用されません。" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" "ディストリビューションが競合しています: %s (%s を期待していたのに %s を取得し" "ました)" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3080,12 +3101,12 @@ msgstr "" "ファイルが使われます。GPG エラー: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "GPG エラー: %s: %s" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3094,7 +3115,7 @@ msgstr "" "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動" "で修正する必要があります (存在しないアーキテクチャのため)。" -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3103,7 +3124,7 @@ msgstr "" "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動" "で修正する必要があります。" -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3111,7 +3132,7 @@ msgstr "" "パッケージインデックスファイルが壊れています。パッケージ %s に Filename: " "フィールドがありません。" -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "サイズが適合しません" @@ -3163,7 +3184,7 @@ msgstr "確認しています.. " msgid "Stored label: %s\n" msgstr "格納されたラベル: %s \n" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 msgid "Unmounting CD-ROM...\n" msgstr "CD-ROM をアンマウントしています ...\n" @@ -3227,30 +3248,30 @@ msgstr "" msgid "Copying package lists..." msgstr "パッケージリストをコピーしています ..." -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "新しいソースリストを書き込んでいます\n" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "このディスクのソースリストのエントリ:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "%i レコードを書き込みました。\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i レコードを書き込みました。%i 個のファイルが存在しません。\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i レコードを書き込みました。%i 個の適合しないファイルがあります。\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/km.po b/po/km.po index 5000daf79..7dbd640b6 100644 --- a/po/km.po +++ b/po/km.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_km\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2006-10-10 09:48+0700\n" "Last-Translator: Khoem Sokhem \n" "Language-Team: Khmer \n" @@ -101,73 +101,73 @@ msgstr "ទំហំ​សរុប​ដែល​ទុក​សម្រាប msgid "Package file %s is out of sync." msgstr "ឯកសារ​កញ្ចប់ %s នៅ​ខាងក្រៅ​ការ​ធ្វើសមកាលកម្ម ។" -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "រក​កញ្ចប់​មិន​ឃើញ" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1243 #, fuzzy msgid "You must give at least one search pattern" msgstr "អ្នក​ត្រូវ​តែ​ផ្ដល់​លំនាំ​មួយ​ដែល​ពិត​ប្រាកដ" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "មិន​អាច​កំណត់​ទីតាំង​កញ្ចប់ %s បានឡើយ" -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1526 msgid "Package files:" msgstr "ឯកសារ​កញ្ចប់ ៖" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "ឃ្លាំង​សម្ងាត់​ឋិតនៅ​ក្រៅ​ការ​ធ្វើ​សមកាល​កម្ម ដែលមិន​អាច x-ref ឯកសារ​កញ្ចប់​បាន​ទេ" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1547 msgid "Pinned packages:" msgstr "កញ្ចប់​ដែល​បាន​ខ្ទាស់ ៖" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "(រក​មិន​ឃើញ)" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr " បាន​ដំឡើង ៖ " -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr " សាកល្បង ៖ " -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "(គ្មាន)" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr " ខ្ទាស់​កញ្ចប់ ៖ " #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr " តារាង​កំណែ ៖" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s សម្រាប់ %s %s បាន​ចងក្រងនៅលើ​%s %s\n" -#: cmdline/apt-cache.cc:1690 +#: cmdline/apt-cache.cc:1730 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -240,21 +240,29 @@ msgstr "" " -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. eg -o dir::cache=/tmp\n" "មើល​ apt-cache(8) និង​ apt.conf(5) សម្រាប់​ព័ត៌មាន​បន្ថែម​​មាន​ក្នុង​ទំព័រ​សៀវភៅដៃ​ ។\n" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 #, fuzzy msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "សូម​ផ្ដល់​ឈ្មោះ​ឲ្យ​ថាស​នេះ ឧទាហរណ៍​ដូចជា 'ដេបៀន 2.1r1 ថាស​ទី ១' ជាដើម" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" msgstr "សូម​បញ្ចូល​ថាស​ក្នុង​ដ្រាយ​ហើយ​ចុច​បញ្ចូល​" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ្មោះ %s ទៅ %s" -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "ធ្វើដំណើរការ​នេះ​ម្តង​ទៀត​ សម្រាប់​ស៊ីឌី​ទាំងអស់​​ក្នុង​សំណុំ​របស់​អ្នក ។" @@ -488,7 +496,7 @@ msgstr "មិនអាចធ្វើការដំឡើង %s ឡើងវ msgid "%s is already the newest version.\n" msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទៅហើយ ។\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង" @@ -595,8 +603,8 @@ msgstr "បន្ទាប់​ពី​ពន្លា​ %sB នៃ​កា msgid "After this operation, %sB disk space will be freed.\n" msgstr "បន្ទាប់​ពី​ពន្លា​ %sB ទំហំ​ថាសនឹង​​ទំនេរ ។ \n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 #, c-format msgid "Couldn't determine free space in %s" msgstr "មិន​អាច​កំណត់​ទំហំ​ទំនេរ​ក្នុង​ %s បានឡើយ" @@ -635,7 +643,7 @@ msgstr "បោះបង់ ។" msgid "Do you want to continue [Y/n]? " msgstr "តើ​អ្នក​ចង់​បន្តឬ​ [បាទ ចាស/ទេ​] ? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ %s %s\n" @@ -644,7 +652,7 @@ msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រម msgid "Some files failed to download" msgstr "ឯកសារ​មួយ​ចំនួន​បាន​បរាជ័យ​ក្នុង​ការ​ទាញ​យក​" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "បានបញ្ចប់ការទាញ​យក​ ហើយ​តែ​ក្នុង​របៀប​​ទាញ​យក​ប៉ុណ្ណោះ" @@ -722,7 +730,7 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 msgid "The following information may help to resolve the situation:" msgstr "ព័ត៌មាន​ដូចតទៅនេះ អាចជួយ​ដោះស្រាយ​ស្ថានភាព​បាន ៖" @@ -770,7 +778,7 @@ msgid "" msgstr "" "ភាពអស្រ័យ​ដែល​ខុស​គ្នា ។ ព្យាយាម​ 'apt-get -f install' ដោយ​គ្មាន​កញ្ចប់ (ឬ បញ្ជាក់​ដំណោះស្រាយ) ។" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1973 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" @@ -782,85 +790,85 @@ msgstr "" "ដែលបាន​ទាមទារនឹងមិនទាន់បានបង្កើត​ឡើយ​\n" " ឬ ​បានយក​ចេញ​ពីការមកដល់ ។" -#: cmdline/apt-get.cc:1995 +#: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "កញ្ចប់​ដែល​បាន​ខូច​" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2020 msgid "The following extra packages will be installed:" msgstr "កញ្ចប់​បន្ថែម​ដូចតទៅនេះ នឹងត្រូវបាន​ដំឡើង ៖" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​យោបល់ ៖" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​អនុសាសន៍ ៖" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2184 msgid "Calculating upgrade... " msgstr "កំពុង​គណនា​ការ​ធ្វើ​ឲ្យ​ប្រសើរ... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "បាន​បរាជ័យ" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2192 msgid "Done" msgstr "ធ្វើរួច​" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 msgid "Internal error, problem resolver broke stuff" msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យខូច​ឧបករណ៍" -#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "មិន​អាច​ចាក់​សោ​ថត​ទាញ​យក​បាន​ឡើយ" -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2452 msgid "Must specify at least one package to fetch source for" msgstr "យ៉ាងហោចណាស់​ត្រូវ​​បញ្ជាក់​​កញ្ចប់​មួយ ​ដើម្បី​ទៅ​​ប្រមូល​យក​ប្រភព​សម្រាប់" -#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, c-format msgid "Unable to find a source package for %s" msgstr "មិន​អាច​រក​កញ្ចប់ប្រភព​​សម្រាប់ %s បានឡើយ" -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2514 #, c-format msgid "" "Please use:\n" @@ -868,104 +876,104 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2567 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "កំពុង​រំលង​ឯកសារ​ដែល​បាន​ទាញយក​រួច​ '%s'\n" -#: cmdline/apt-get.cc:2605 +#: cmdline/apt-get.cc:2604 #, c-format msgid "You don't have enough free space in %s" msgstr "អ្នក​ពុំ​មាន​ទំហំ​ទំនេរ​គ្រប់គ្រាន់​ទេ​នៅក្នុង​ %s ឡើយ" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2613 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "ត្រូវការ​យក​ %sB/%sB នៃ​ប័ណ្ណសារ​ប្រភព ។\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2618 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "ត្រូវការ​យក​ %sB នៃ​ប័ណ្ណសារ​ប្រភព​ ។\n" -#: cmdline/apt-get.cc:2625 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" msgstr "ទៅប្រមូល​ប្រភព​ %s\n" -#: cmdline/apt-get.cc:2663 +#: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "បរាជ័យ​ក្នុងការទៅប្រមូលយក​ប័ណ្ណសារ​មួយចំនួន ។" -#: cmdline/apt-get.cc:2694 +#: cmdline/apt-get.cc:2693 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "កំពុង​រំលង​ការស្រាយ​នៃប្រភព​ដែលបានស្រាយរួច​នៅក្នុង %s\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "ពាក្យ​បញ្ជា​ស្រាយ '%s' បាន​បរាជ័យ​ ។\n" -#: cmdline/apt-get.cc:2707 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "ពិនិត្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n" -#: cmdline/apt-get.cc:2729 +#: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "សាងសង​ពាក្យ​បញ្ជា​ '%s' បានបរាជ័យ​ ។\n" -#: cmdline/apt-get.cc:2749 +#: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "ដំណើរ​ការ​កូន​បាន​បរាជ័យ​" -#: cmdline/apt-get.cc:2768 +#: cmdline/apt-get.cc:2767 msgid "Must specify at least one package to check builddeps for" msgstr "ត្រូវតែ​បញ្ជាក់​យ៉ាងហោចណាស់​មួយកញ្ចប់ដើម្បីពិនិត្យ builddeps សម្រាប់" -#: cmdline/apt-get.cc:2793 +#: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "មិន​អាច​សាងសង់​​ព័ត៌មាន​ភាពអស្រ័យ​សម្រាប់ %s" -#: cmdline/apt-get.cc:2840 +#: cmdline/apt-get.cc:2839 #, c-format msgid "%s has no build depends.\n" msgstr "%s មិនមានភាពអាស្រ័យ​ស្ថាបនាឡើយ​ ។\n" -#: cmdline/apt-get.cc:3010 +#: cmdline/apt-get.cc:3009 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "%s ភាពអស្រ័យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ពេញចិត្ត​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ " -#: cmdline/apt-get.cc:3028 +#: cmdline/apt-get.cc:3027 #, 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:3051 +#: cmdline/apt-get.cc:3050 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s ៖ កញ្ចប់ %s ដែលបានដំឡើង គឺថ្មីពេក" -#: cmdline/apt-get.cc:3090 +#: cmdline/apt-get.cc:3089 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -974,37 +982,37 @@ msgstr "" "ភាពអាស្រ័យ %s សម្រាប់ %s មិនអាច​តម្រូវចិត្តបានទេ ព្រោះ មិនមាន​កំណែ​នៃកញ្ចប់ %s ដែលអាច​តម្រូវចិត្ត​" "តម្រូវការ​កំណែបានឡើយ" -#: cmdline/apt-get.cc:3096 +#: cmdline/apt-get.cc:3095 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "%s ភាពអស្រ័យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ពេញចិត្ត​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ " -#: cmdline/apt-get.cc:3119 +#: cmdline/apt-get.cc:3118 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s: %s" -#: cmdline/apt-get.cc:3135 +#: cmdline/apt-get.cc:3133 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "ភាពអាស្រ័យ​ដែល​បង្កើត​ %s មិន​អាច​បំពេញ​សេចក្ដី​ត្រូវការ​បាន​ទេ ។" -#: cmdline/apt-get.cc:3140 +#: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ដំណើរ​​ការ​បង្កើត​ភាព​អាស្រ័យ" -#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "កំពុង​តភ្ជាប់​ទៅ​កាន់​ %s (%s)" -#: cmdline/apt-get.cc:3368 +#: cmdline/apt-get.cc:3366 msgid "Supported modules:" msgstr "ម៉ូឌុល​ដែល​គាំទ្រ ៖ " -#: cmdline/apt-get.cc:3409 +#: cmdline/apt-get.cc:3407 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1089,7 +1097,7 @@ msgstr "" "pages for more information and options.\n" " This APT has Super Cow Powers.\n" -#: cmdline/apt-get.cc:3574 +#: cmdline/apt-get.cc:3572 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1160,7 +1168,7 @@ msgid "%s was already not hold.\n" msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទៅហើយ ។\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" @@ -1298,8 +1306,8 @@ msgstr "អស់ពេល​ក្នុងការតភ្ជាប់​" msgid "Server closed the connection" msgstr "ម៉ាស៊ីន​បម្រើ​បាន​បិទ​ការតភ្ជាប់​" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 +#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 msgid "Read error" msgstr "ការអាន​មានកំហុស" @@ -1312,8 +1320,8 @@ msgid "Protocol corruption" msgstr "ការបង្ខូច​ពិធីការ​" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 +#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 msgid "Write error" msgstr "ការសរសេរ​មានកំហុស" @@ -1456,29 +1464,37 @@ msgstr "ការ​ដោះស្រាយ​អ្វី​អាក្រក msgid "Unable to connect to %s:%s:" msgstr "មិន​អាច​តភ្ជាប់​ទៅកាន់​​ %s %s ៖" -#: methods/gpgv.cc:169 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "កំហុស​ខាងក្នុង​ ៖ ហត្ថលេខា​​ល្អ ប៉ុន្តែ ​មិន​អាច​កំណត់​កូនសោ​ស្នាម​ម្រាមដៃ ?!" -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "​បានជួប​ប្រទះ​​​​ហត្ថលេខា​យ៉ាងហោចណាស់មួយ ដែ​លត្រឹមត្រូវ​ ។" -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:172 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "មិន​អាច​ប្រតិបត្តិ '%s' ដើម្បី​ផ្ទៀងផ្ទាត់​ហត្ថលេខា (តើ gpgv ត្រូវ​បាន​ដំឡើង​ឬនៅ ?)" -#: methods/gpgv.cc:183 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "មិនស្គាល់កំហុស ក្នុងការប្រតិបត្តិ gpgv" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "ហត្ថលេខា​ខាង​ក្រោម​មិន​ត្រឹមត្រូវ ៖\n" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1559,8 +1575,8 @@ msgstr "កំហុស​ខាង​ក្នុង​" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1589,7 +1605,12 @@ msgstr "" msgid "Can not read mirror file '%s'" msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ" -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ" + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "" @@ -1681,7 +1702,7 @@ msgstr "" " -c=? អាន​ឯកសារ​ការ​កំណត់​រចនាស្ព័ន្ធ​នេះ\n" " -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. eg -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "មិន​អាច​សរសេរ​ទៅ %s" @@ -2054,23 +2075,23 @@ msgstr "" " -c=? អាន​ឯកសារ​កំណត់​រចនាសម្ព័ន្ធនេះ​\n" " -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "បាន​បរាជ័យក្នុង​ការ​បង្កើត​បំពង់​" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "បាន​បរាជ័យក្នុង​ការ​ប្រតិបត្តិ gzip" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "ប័ណ្ណសារ​បាន​ខូច​" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "Tar ឆេកសាំ​បាន​បរាជ័យ ប័ណ្ណសារ​បាន​ខូច" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "មិន​ស្គាល់​ប្រភេទ​បឋមកថា​ TAR %u ដែលជា​សមាជិក​ %s" @@ -2290,7 +2311,7 @@ msgstr "" msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1172 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "ជម្រើស​ %s រក​មិន​ឃើញ​ឡើយ" @@ -2430,111 +2451,111 @@ msgstr "បរាជ័យក្នុងការ​ថ្លែង ស៊ី msgid "Problem closing the gzip file %s" msgstr "មាន​បញ្ហា​ក្នុងការ​បិទ​ឯកសារ" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "មិន​ប្រើប្រាស់​ការចាក់សោ សម្រាប់តែឯកសារចាក់សោ​ដែលបានតែអានប៉ុណ្ណោះ %s" -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "មិន​អាច​បើក​ឯកសារ​ចាក់សោ​ %s បានឡើយ" -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:249 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "មិនប្រើ​ការចាក់សោ សម្រាប់ nfs ឯកសារ​ចាក់សោដែលបានម៉ោន%s" -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "មិន​អាច​ចាក់សោ %s បានឡើយ" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "ដំណើរការ​រង​ %s បាន​ទទួល​កំហុស​ការ​ចែកជាចម្រៀក​ ។" -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:843 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "ដំណើរការ​រង​ %s បាន​ទទួល​កំហុស​ការ​ចែកជាចម្រៀក​ ។" -#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "ដំណើរការ​រង​ %s បានត្រឡប់​ទៅកាន់​កូដ​មាន​កំហុស​ (%u)" -#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "ដំណើរការ​រង​ %s បានចេញ ដោយ​មិន​រំពឹង​ទុក​ " -#: apt-pkg/contrib/fileutl.cc:984 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Could not open file %s" msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ" -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1062 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "មិន​អាច​បើក​បំពុង​សម្រាប់​ %s បានឡើយ" -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​ដំណើរការ​រង​ IPC" -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " msgstr "បរាជ័យ​ក្នុង​ការ​ប្រតិបត្តិ​កម្មវិធី​បង្ហាប់ " -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1297 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "អាន​, នៅតែ​មាន %lu ដើម្បី​អាន​ ប៉ុន្តែ​គ្មាន​អ្វី​នៅសល់" -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "សរសេរ​, នៅតែមាន​ %lu ដើម្បី​សរសេរ​ ប៉ុន្តែ​មិន​អាច​" -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1681 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "មាន​បញ្ហា​ក្នុងការ​បិទ​ឯកសារ" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1693 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1704 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់តំណ​ឯកសារ" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1717 msgid "Problem syncing the file" msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​" @@ -2733,19 +2754,19 @@ msgstr "បន្ទាត់​ Malformed %u ក្នុង​បញ្ជី msgid "Type '%s' is not known on line %u in source list %s" msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ" -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2779,7 +2800,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "មិន​អាច​កែ​បញ្ហាបានទេេ អ្កបានទុក​កញ្ចប់​ដែល​ខូច ។។" -#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 +#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2787,7 +2808,7 @@ msgid "" msgstr "" "ឯកសារ​លិបិក្រម​មួយ​ចំនួន​បាន​បរាជ័យ​ក្នុង​ការ​​ទាញ​យក ​ពួកវាត្រូវបាន​មិន​អើពើ​ ឬ ប្រើ​​ឯកសារ​ចាស់​ជំនួសវិញ ​​។" -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "រាយបញ្ជី​ថត​ %spartial គឺ​បាត់បង់​ ។" @@ -2887,14 +2908,14 @@ msgstr "ឃ្លាំងសម្ងាត់​មិន​ត្រូវ​ #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 -#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 -#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 -#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 -#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 -#: apt-pkg/pkgcachegen.cc:561 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "កំហុស​បានកើតឡើង​ខណៈពេល​កំពុង​ដំណើរការ​ %s (FindPkg)" @@ -2916,26 +2937,26 @@ msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​ល msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "អស្ចារ្យ​, អ្នក​មាន​ភាពអាស្រ័យ​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​ ។" -#: apt-pkg/pkgcachegen.cc:568 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "កញ្ចប់​ %s %s រក​មិន​ឃើញ​ខណៈ​ពេល​កំពុង​ដំណើរការ​ភាពអាស្រ័យ​​ឯកសារ" -#: apt-pkg/pkgcachegen.cc:1197 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "មិនអាចថ្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s" -#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 -#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" msgstr "កំពុង​អាន​បញ្ជី​កញ្ចប់" -#: apt-pkg/pkgcachegen.cc:1302 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "ការផ្ដល់​ឯកសារ​ប្រមូលផ្ដុំ" -#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "IO កំហុសក្នុងការររក្សាទុក​ឃ្លាំង​សម្ងាត់​ប្រភព​" @@ -2948,41 +2969,41 @@ msgstr "ប្តូរ​ឈ្មោះ​បានបរាជ័យ​, %s ( msgid "MD5Sum mismatch" msgstr "MD5Sum មិន​ផ្គួផ្គង​" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 #, fuzzy msgid "Hash Sum mismatch" msgstr "MD5Sum មិន​ផ្គួផ្គង​" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "គ្មាន​កូនសោ​សាធារណៈ​អាច​រក​បាន​ក្នុងកូនសោ IDs ខាងក្រោម​នេះទេ ៖\n" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2990,12 +3011,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3004,7 +3025,7 @@ msgstr "" "ខ្ញុំ​មិន​អាច​រកទីតាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បាន​ទេ ។ ​មាន​ន័យ​ថា​អ្នក​ត្រូវការ​ជួសជុល​កញ្ចប់​នេះ​ដោយ​ដៃ ។ " "(ដោយសារ​​បាត់​ស្ថាបត្យកម្ម)" -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3012,13 +3033,13 @@ msgid "" msgstr "" "ខ្ញុំ​មិន​អាច​រកទីតាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បានទេ ។ ​មាន​ន័យ​ថា​អ្នក​ត្រូវការ​ជួសជុល​កញ្ចប់​នេះ​ដោយ​ដៃ ។" -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "កញ្ចប់​ឯកសារ​លិបិក្រម​ត្រូវ​បាន​ខូច ។ គ្មាន​ឈ្មោះ​ឯកសារ ៖ វាល​សម្រាប់​កញ្ចប់នេះ​ទេ​ %s ។" -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "ទំហំ​មិនបាន​ផ្គួផ្គង​" @@ -3070,7 +3091,7 @@ msgstr "កំពុង​ធ្វើអត្តសញ្ញាណនា​.. msgid "Stored label: %s\n" msgstr "បានទុក​ស្លាក ៖ %s \n" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "មិនកំពុងម៉ោន ស៊ីឌី​-រ៉ូម​ ទេ..." @@ -3131,30 +3152,30 @@ msgstr "" msgid "Copying package lists..." msgstr "កំពុង​ចម្លង​បញ្ជី​កញ្ចប់..." -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "កំពុងសរសេរ​បញ្ជី​ប្រភព​ថ្មី\n" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "ធាតុបញ្ចូល​បញ្ជីប្រភព​សម្រាប់​ឌីស​នេះគឺ ៖\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "បានសរសេរ %i កំណត់ត្រា ។\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "បានសរសេរ %i កំណត់ត្រា​ជាមួយ​ %i ឯកសារ​ដែល​បាត់បង់ ។\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "បានសរសេរ​ %i កំណត់ត្រា​ជាមួយួយ​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "បានសរសេរ %i កំណត់ត្រា​ជាមួយ​ %i ឯកសារ​ដែល​បាត់បង់​ និង​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​ ​\n" diff --git a/po/ko.po b/po/ko.po index 3595cd048..5f5332b20 100644 --- a/po/ko.po +++ b/po/ko.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2010-08-30 02:31+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" @@ -93,72 +93,72 @@ msgstr "차지하는 전체 용량: " msgid "Package file %s is out of sync." msgstr "패키지 파일 %s 파일이 동기화되지 않았습니다." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "패키지가 없습니다" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1243 msgid "You must give at least one search pattern" msgstr "최소 한 개의 검색어를 지정해야 합니다" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "%s 패키지를 찾을 수 없습니다" -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1526 msgid "Package files:" msgstr "패키지 파일:" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "캐시가 동기화되지 않았습니다. 패키지 파일을 상호 참조할 수 없습니다" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1547 msgid "Pinned packages:" msgstr "핀 패키지:" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "(없음)" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr " 설치: " -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr " 후보: " -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "(없음)" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr " 패키지 핀: " #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr " 버전 테이블:" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s(%s), 컴파일 시각 %s %s\n" -#: cmdline/apt-cache.cc:1690 +#: cmdline/apt-cache.cc:1730 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -232,20 +232,28 @@ msgstr "" " -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n" "좀 더 자세한 정보는 apt-cache(8) 및 apt.conf(5) 매뉴얼 페이지를 보십시오.\n" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "이 디스크의 이름을 정하십시오 (예: 'Debian 5.0.3 Disk 1')" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" msgstr "드라이브에 디스크를 넣고 Enter를 누르십시오" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "%s 파일의 이름을 %s(으)로 바꾸는데 실패했습니다" -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "현재 갖고 있는 다른 CD에도 이 과정을 반복하십시오." @@ -479,7 +487,7 @@ msgstr "%s 패키지를 다시 설치하는 건 불가능합니다. 다운로드 msgid "%s is already the newest version.\n" msgstr "%s 패키지는 이미 최신 버전입니다.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s 패키지 수동설치로 지정합니다.\n" @@ -589,8 +597,8 @@ msgstr "이 작업 후 %s바이트의 디스크 공간을 더 사용하게 됩 msgid "After this operation, %sB disk space will be freed.\n" msgstr "이 작업 후 %s바이트의 디스크 공간이 비워집니다.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s의 여유 공간의 크기를 파악할 수 없습니다" @@ -632,7 +640,7 @@ msgstr "중단." msgid "Do you want to continue [Y/n]? " msgstr "계속 하시겠습니까 [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s 파일을 받는데 실패했습니다 %s\n" @@ -641,7 +649,7 @@ msgstr "%s 파일을 받는데 실패했습니다 %s\n" msgid "Some files failed to download" msgstr "일부 파일을 받는데 실패했습니다" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "다운로드를 마쳤고 다운로드 전용 모드입니다" @@ -722,7 +730,7 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 msgid "The following information may help to resolve the situation:" msgstr "이 상황을 해결하는데 다음 정보가 도움이 될 수도 있습니다:" @@ -768,7 +776,7 @@ msgstr "" "의존성이 맞지 않습니다. 패키지 없이 'apt-get -f install'을 시도해 보십시오 " "(아니면 해결 방법을 지정하십시오)." -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1973 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" @@ -779,78 +787,78 @@ msgstr "" "불안정 배포판을 사용해서 일부 필요한 패키지를 아직 만들지 않았거나,\n" "아직 Incoming에서 나오지 않은 경우일 수도 있습니다." -#: cmdline/apt-get.cc:1995 +#: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "망가진 패키지" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2020 msgid "The following extra packages will be installed:" msgstr "다음 패키지를 더 설치할 것입니다:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "제안하는 패키지:" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "추천하는 패키지:" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "%s 패키지를 찾을 수 없습니다" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s 패키지는 수동설치로 지정합니다.\n" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2184 msgid "Calculating upgrade... " msgstr "업그레이드를 계산하는 중입니다... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "실패" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2192 msgid "Done" msgstr "완료" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 msgid "Internal error, problem resolver broke stuff" msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸습니다" -#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "다운로드 디렉터리를 잠글 수 없습니다" -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2452 msgid "Must specify at least one package to fetch source for" msgstr "해당되는 소스 패키지를 가져올 패키지를 최소한 하나 지정해야 합니다" -#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, c-format msgid "Unable to find a source package for %s" msgstr "%s의 소스 패키지를 찾을 수 없습니다" -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -859,7 +867,7 @@ msgstr "" "알림: '%s' 패키징은 다음 '%s' 버전 컨트롤 시스템에서 관리합니다:\n" "%s\n" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2514 #, fuzzy, c-format msgid "" "Please use:\n" @@ -870,85 +878,85 @@ msgstr "" "다음과 같이 하십시오:\n" "bzr get %s\n" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2567 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "이미 다운로드 받은 파일 '%s'은(는) 다시 받지 않고 건너 뜁니다.\n" -#: cmdline/apt-get.cc:2605 +#: cmdline/apt-get.cc:2604 #, c-format msgid "You don't have enough free space in %s" msgstr "%s에 충분한 공간이 없습니다" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2613 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "소스 아카이브를 %s바이트/%s바이트 받아야 합니다.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2618 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n" -#: cmdline/apt-get.cc:2625 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" msgstr "%s 소스를 가져옵니다\n" -#: cmdline/apt-get.cc:2663 +#: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "일부 아카이브를 가져오는데 실패했습니다." -#: cmdline/apt-get.cc:2694 +#: cmdline/apt-get.cc:2693 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "압축 풀기 명령 '%s' 실패.\n" -#: cmdline/apt-get.cc:2707 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev' 패키지가 설치되었는지를 확인하십시오.\n" -#: cmdline/apt-get.cc:2729 +#: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "빌드 명령 '%s' 실패.\n" -#: cmdline/apt-get.cc:2749 +#: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "하위 프로세스가 실패했습니다" -#: cmdline/apt-get.cc:2768 +#: cmdline/apt-get.cc:2767 msgid "Must specify at least one package to check builddeps for" msgstr "해당되는 빌드 의존성을 검사할 패키지를 최소한 하나 지정해야 합니다" -#: cmdline/apt-get.cc:2793 +#: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다" -#: cmdline/apt-get.cc:2840 +#: cmdline/apt-get.cc:2839 #, c-format msgid "%s has no build depends.\n" msgstr "%s 패키지에 빌드 의존성이 없습니다.\n" -#: cmdline/apt-get.cc:3010 +#: cmdline/apt-get.cc:3009 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -957,7 +965,7 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니" "다" -#: cmdline/apt-get.cc:3028 +#: cmdline/apt-get.cc:3027 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -966,14 +974,14 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니" "다" -#: cmdline/apt-get.cc:3051 +#: cmdline/apt-get.cc:3050 #, 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:3090 +#: cmdline/apt-get.cc:3089 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -982,7 +990,7 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지의 사용 가능한 버" "전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다" -#: cmdline/apt-get.cc:3096 +#: cmdline/apt-get.cc:3095 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -991,30 +999,30 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니" "다" -#: cmdline/apt-get.cc:3119 +#: cmdline/apt-get.cc:3118 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s에 대한 %1$s 의존성을 만족시키는데 실패했습니다: %3$s" -#: cmdline/apt-get.cc:3135 +#: cmdline/apt-get.cc:3133 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s의 빌드 의존성을 만족시키지 못했습니다." -#: cmdline/apt-get.cc:3140 +#: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "빌드 의존성을 처리하는데 실패했습니다" -#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "%s(%s)에 연결하는 중입니다" -#: cmdline/apt-get.cc:3368 +#: cmdline/apt-get.cc:3366 msgid "Supported modules:" msgstr "지원하는 모듈:" -#: cmdline/apt-get.cc:3409 +#: cmdline/apt-get.cc:3407 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1102,7 +1110,7 @@ msgstr "" "apt.conf(5) 매뉴얼 페이지를 보십시오.\n" " 이 APT는 Super Cow Powers로 무장했습니다.\n" -#: cmdline/apt-get.cc:3574 +#: cmdline/apt-get.cc:3572 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1177,7 +1185,7 @@ msgid "%s was already not hold.\n" msgstr "%s 패키지는 이미 최신 버전입니다.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" @@ -1316,8 +1324,8 @@ msgstr "연결 시간 초과" msgid "Server closed the connection" msgstr "서버에서 연결을 닫았습니다" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 +#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 msgid "Read error" msgstr "읽기 오류" @@ -1330,8 +1338,8 @@ msgid "Protocol corruption" msgstr "프로토콜이 틀렸습니다" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 +#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 msgid "Write error" msgstr "쓰기 오류" @@ -1474,29 +1482,37 @@ msgstr "'%s:%s'의 주소를 알아내는데 무언가 이상한 일이 발생 msgid "Unable to connect to %s:%s:" msgstr "%s:%s에 연결할 수 없습니다:" -#: methods/gpgv.cc:169 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "내부 오류: 서명은 올바르지만 키 핑거프린트를 확인할 수 없습니다?!" -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "최소한 하나 이상의 서명이 잘못되었습니다." -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "서명을 확인하는 'gpgv' 프로그램을 실행할 수 없습니다. (gpgv를 설치했습니까?)" -#: methods/gpgv.cc:183 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "gpgv 실행 도중 알 수 없는 오류 발생" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "다음 서명이 올바르지 않습니다:\n" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1577,8 +1593,8 @@ msgstr "내부 오류" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1607,7 +1623,12 @@ msgstr "'%s' 미러 파일이 없습니다 " msgid "Can not read mirror file '%s'" msgstr "'%s' 미러 파일이 없습니다 " -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "'%s' 미러 파일이 없습니다 " + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "[미러 사이트: %s]" @@ -1702,7 +1723,7 @@ msgstr "" " -c=? 설정 파일을 읽습니다\n" " -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "%s에 쓸 수 없습니다" @@ -2077,23 +2098,23 @@ msgstr "" " -c=? 이 설정 파일을 읽습니다\n" " -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "파이프 만들기가 실패했습니다" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "gzip 실행이 실패했습니다" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "아카이브가 손상되었습니다" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "tar 체크섬 실패, 아카이브가 손상되었습니다" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "알 수 없는 TAR 헤더 타입 %u, 멤버 %s" @@ -2313,7 +2334,7 @@ msgstr "%li분 %li초" msgid "%lis" msgstr "%li초" -#: apt-pkg/contrib/strutl.cc:1172 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "선택한 %s이(가) 없습니다" @@ -2453,111 +2474,111 @@ msgstr "CD-ROM의 정보를 읽을 수 없습니다" msgid "Problem closing the gzip file %s" msgstr "%s gzip 파일을 닫는데 문제가 있습니다" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "읽기 전용 잠금 파일 %s에 대해 잠금을 사용하지 않습니다" -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "잠금 파일 %s 파일을 열 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:249 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "NFS로 마운트된 잠금 파일 %s에 대해 잠금을 사용하지 않습니다" -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "%s 잠금 파일을 얻을 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "하위 프로세스 %s 프로세스가 세그멘테이션 오류를 받았습니다." -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:843 #, c-format msgid "Sub-process %s received signal %u." msgstr "하위 프로세스 %s 프로세스가 %u번 시그널을 받았습니다." -#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "하위 프로세스 %s 프로세스가 오류 코드(%u)를 리턴했습니다" -#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "하위 프로세스 %s 프로세스가 예상치 못하게 끝났습니다" -#: apt-pkg/contrib/fileutl.cc:984 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Could not open file %s" msgstr "%s 파일을 열 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1062 #, c-format msgid "Could not open file descriptor %d" msgstr "%d 파일 디스크립터를 열 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "하위 프로세스 IPC를 만드는데 실패했습니다" -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " msgstr "다음 압축 프로그램을 실행하는데 실패했습니다: " -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1297 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "%lu만큼 더 읽어야 하지만 더 이상 읽을 데이터가 없습니다" -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "%lu만큼 더 써야 하지만 더 이상 쓸 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1681 #, c-format msgid "Problem closing the file %s" msgstr "%s 파일을 닫는데 문제가 있습니다" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1693 #, c-format msgid "Problem renaming the file %s to %s" msgstr "%s 파일을 %s(으)로 이름을 바꾸는데 문제가 있습니다" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1704 #, c-format msgid "Problem unlinking the file %s" msgstr "%s 파일을 삭제하는데 문제가 있습니다" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1717 msgid "Problem syncing the file" msgstr "파일을 동기화하는데 문제가 있습니다" @@ -2756,7 +2777,7 @@ msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (타입)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "소스 목록 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2765,12 +2786,12 @@ msgstr "" "'%s'에 대해 즉시 설정을 할 수 없습니다. 자세한 설명은 man 5 apt.conf 페이지에" "서 APT::Immediate-Configure 항목을 보십시오. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "'%s' 파일을 열 수 없습니다" -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2805,7 +2826,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "문제를 바로잡을 수 없습니다. 망가진 고정 패키지가 있습니다." -#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 +#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2814,7 +2835,7 @@ msgstr "" "일부 인덱스 파일을 다운로드하는데 실패했습니다. 해당 파일을 무시하거나 과거" "의 버전을 대신 사용합니다." -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, c-format msgid "List directory %spartial is missing." msgstr "목록 디렉터리 %spartial이 빠졌습니다." @@ -2915,14 +2936,14 @@ msgstr "캐시의 버전 시스템이 호환되지 않습니다" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 -#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 -#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 -#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 -#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 -#: apt-pkg/pkgcachegen.cc:561 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "%s 처리 중에 오류가 발생했습니다 (FindPkg)" @@ -2943,26 +2964,26 @@ msgstr "우와, 이 APT가 처리할 수 있는 설명 개수를 넘어갔습니 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "우와, 이 APT가 처리할 수 있는 의존성 개수를 넘어갔습니다." -#: apt-pkg/pkgcachegen.cc:568 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "파일 의존성을 처리하는 데, %s %s 패키지가 없습니다" -#: apt-pkg/pkgcachegen.cc:1197 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "소스 패키지 목록 %s의 정보를 읽을 수 없습니다" -#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 -#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" msgstr "패키지 목록을 읽는 중입니다" -#: apt-pkg/pkgcachegen.cc:1302 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "파일에서 제공하는 것을 모으는 중입니다" -#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "소스 캐시를 저장하는데 입출력 오류가 발생했습니다" @@ -2975,40 +2996,40 @@ msgstr "이름 바꾸기가 실패했습니다. %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "MD5Sum이 맞지 않습니다" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 msgid "Hash Sum mismatch" msgstr "해시 합이 맞지 않습니다" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Release 파일 %s 파일을 파싱할 수 없습니다" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "다음 키 ID의 공개키가 없습니다:\n" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "배포판 충돌: %s (예상값 %s, 실제값 %s)" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3018,12 +3039,12 @@ msgstr "" "예전의 인덱스 파일을 사용합니다. GPG 오류: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "GPG 오류: %s: %s" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3032,7 +3053,7 @@ msgstr "" "%s 패키지의 파일을 찾을 수 없습니다. 수동으로 이 패키지를 고쳐야 할 수도 있습" "니다. (아키텍쳐가 빠졌기 때문입니다)" -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3041,14 +3062,14 @@ msgstr "" "%s 패키지의 파일을 찾을 수 없습니다. 수동으로 이 패키지를 고쳐야 할 수도 있습" "니다." -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "패키지 인덱스 파일이 손상되었습니다. %s 패키지에 Filename: 필드가 없습니다." -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "크기가 맞지 않습니다" @@ -3100,7 +3121,7 @@ msgstr "알아보는 중입니다.. " msgid "Stored label: %s\n" msgstr "저장된 레이블: %s\n" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 msgid "Unmounting CD-ROM...\n" msgstr "CD-ROM을 마운트 해제하는 중입니다...\n" @@ -3162,30 +3183,30 @@ msgstr "" msgid "Copying package lists..." msgstr "패키지 목록을 복사하는 중입니다..." -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "새 소스 리스트를 쓰는 중입니다\n" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "이 디스크의 소스 리스트 항목은 다음과 같습니다:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "레코드 %i개를 썼습니다.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "레코드 %i개를 파일 %i개가 빠진 상태로 썼습니다.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "레코드 %i개를 파일 %i개가 맞지 않은 상태로 썼습니다\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "레코드 %i개를 파일 %i개가 빠지고 %i개가 맞지 않은 상태로 썼습니다\n" diff --git a/po/ku.po b/po/ku.po index c51cafac2..73b08a30e 100644 --- a/po/ku.po +++ b/po/ku.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-ku\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2008-05-08 12:48+0200\n" "Last-Translator: Erdal Ronahi \n" "Language-Team: ku \n" @@ -100,73 +100,73 @@ msgstr "Cihê giştî yê veqetandî: " msgid "Package file %s is out of sync." msgstr "Pakêta dosya %s li derveyî demê ye." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Pakêt nayên dîtin" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1243 #, fuzzy msgid "You must give at least one search pattern" msgstr "Pêwist e tu mînakekê bidî" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Pakêt nehate dîtin %s" -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1526 msgid "Package files:" msgstr "Pelgehên Pakêt:" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1547 msgid "Pinned packages:" msgstr "" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "(nehate dîtin)" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr " Sazkirî: " -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr " Berendam: " -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "(ne tiştek)" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr " Destika pakêtê:" #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr " Tabloya guhertoyan:" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s ji bo %s %s komkirî di %s %s de\n" -#: cmdline/apt-cache.cc:1690 +#: cmdline/apt-cache.cc:1730 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -203,21 +203,29 @@ msgid "" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 #, fuzzy msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Ji kerema xwe re navekî li vî Dîsketî bike, wekî 'Debian 2.1r1 Disk 1'" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" msgstr "Dîsketê siwar bike û piştre bişkoja derbaskirinê bitikîne" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Anîna %s %s biserneket\n" -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" @@ -446,7 +454,7 @@ msgstr "" msgid "%s is already the newest version.\n" msgstr "%s jixwe guhertoya nûtirîn e.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "lê %s dê were sazkirin" @@ -553,8 +561,8 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nikarî cihê vala li %s tesbît bike" @@ -590,7 +598,7 @@ msgstr "Betal." msgid "Do you want to continue [Y/n]? " msgstr "Dixwazî bidomînî [E/n]?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Anîna %s %s biserneket\n" @@ -599,7 +607,7 @@ msgstr "Anîna %s %s biserneket\n" msgid "Some files failed to download" msgstr "Daxistina çend pelan biserneket" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "" @@ -675,7 +683,7 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 msgid "The following information may help to resolve the situation:" msgstr "" @@ -721,7 +729,7 @@ msgid "" "solution)." msgstr "" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1973 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" @@ -729,85 +737,85 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1995 +#: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "Paketên şikestî" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2020 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "Paketên tên pêşniyaz kirin:" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "Paketên tên tawsiyê kirin:" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "Nikarî pakêta %s bibîne" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "lê %s dê were sazkirin" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2184 msgid "Calculating upgrade... " msgstr "Bilindkirin tê hesibandin..." -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Serneket" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2192 msgid "Done" msgstr "Temam" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "Pelrêça daxistinê nayê quflekirin" -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2452 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2514 #, c-format msgid "" "Please use:\n" @@ -815,141 +823,141 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2567 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2605 +#: cmdline/apt-get.cc:2604 #, c-format msgid "You don't have enough free space in %s" msgstr "Cihê vala li %s têre nake" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2613 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2618 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2625 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" msgstr "Çavkanîna %s bîne\n" -#: cmdline/apt-get.cc:2663 +#: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "Anîna çend arşîvan biserneket." -#: cmdline/apt-get.cc:2694 +#: cmdline/apt-get.cc:2693 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2707 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2729 +#: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2749 +#: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2768 +#: cmdline/apt-get.cc:2767 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2793 +#: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2840 +#: cmdline/apt-get.cc:2839 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:3010 +#: cmdline/apt-get.cc:3009 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "" -#: cmdline/apt-get.cc:3028 +#: cmdline/apt-get.cc:3027 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:3051 +#: cmdline/apt-get.cc:3050 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:3090 +#: cmdline/apt-get.cc:3089 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:3096 +#: cmdline/apt-get.cc:3095 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "" -#: cmdline/apt-get.cc:3119 +#: cmdline/apt-get.cc:3118 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:3135 +#: cmdline/apt-get.cc:3133 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:3140 +#: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Girêdan bi %s (%s) re pêk tê" -#: cmdline/apt-get.cc:3368 +#: cmdline/apt-get.cc:3366 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:3409 +#: cmdline/apt-get.cc:3407 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -995,7 +1003,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:3574 +#: cmdline/apt-get.cc:3572 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1063,7 +1071,7 @@ msgid "%s was already not hold.\n" msgstr "%s jixwe guhertoya nûtirîn e.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" @@ -1199,8 +1207,8 @@ msgstr "" msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 +#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 msgid "Read error" msgstr "Çewiya xwendinê" @@ -1213,8 +1221,8 @@ msgid "Protocol corruption" msgstr "" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 +#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 msgid "Write error" msgstr "Çewtiya nivîsînê" @@ -1358,29 +1366,37 @@ msgstr "" msgid "Unable to connect to %s:%s:" msgstr "Nikare bi %s re girêdan pêk bîne %s:" -#: methods/gpgv.cc:169 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:183 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Di xebitandina gpgv de çewtiya nenas" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Ev pakêtên NÛ dê werine sazkirin:" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1462,8 +1478,8 @@ msgstr "Çewtiya hundirîn" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1492,7 +1508,12 @@ msgstr "" msgid "Can not read mirror file '%s'" msgstr "Nikarî pelê %s veke" -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "Nikarî pelê %s veke" + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "" @@ -1572,7 +1593,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Nivîsandin ji bo %s ne pêkane" @@ -1895,24 +1916,24 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 #, fuzzy msgid "Failed to create pipes" msgstr "%s ji hev nehate veçirandin" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "Xebitandina gzip biserneket" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "" @@ -2134,7 +2155,7 @@ msgstr "" msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1172 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "Hilbijartina %s nehatiye dîtin" @@ -2274,111 +2295,111 @@ msgstr "" msgid "Problem closing the gzip file %s" msgstr "Di girtina pelî de pirsgirêkek derket" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "Nikarî qufila pelê %s veke" -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:249 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:843 #, c-format msgid "Sub-process %s received signal %u." msgstr "" -#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:984 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Could not open file %s" msgstr "Nikarî pelê %s veke" -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1062 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "Nikarî pelê %s veke" -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " msgstr "" -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1297 #, c-format msgid "read, still have %llu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1681 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Di girtina pelî de pirsgirêkek derket" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1693 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Di girtina pelî de pirsgirêkek derket" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1704 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Di girtina pelî de pirsgirêkek derket" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1717 msgid "Problem syncing the file" msgstr "" @@ -2575,19 +2596,19 @@ msgstr "" msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Nikarî pelê %s veke" -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2616,13 +2637,13 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 +#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." msgstr "" -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "Peldanka '%s' kêm e" @@ -2722,14 +2743,14 @@ msgstr "" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 -#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 -#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 -#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 -#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 -#: apt-pkg/pkgcachegen.cc:561 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Dema şixulandina naveroka %s çewtî" @@ -2750,26 +2771,26 @@ msgstr "" msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:568 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:1197 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 -#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" msgstr "Lîsteya pakêtan tê xwendin" -#: apt-pkg/pkgcachegen.cc:1302 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "" @@ -2782,40 +2803,40 @@ msgstr "nav guherandin biserneket, %s (%s -> %s)" msgid "MD5Sum mismatch" msgstr "MD5Sum li hev nayên" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 msgid "Hash Sum mismatch" msgstr "Hash Sum li hev nayên" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Pakêt nehate dîtin %s" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2823,32 +2844,32 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "Mezinahî li hev nayên" @@ -2898,7 +2919,7 @@ msgstr "" msgid "Stored label: %s\n" msgstr "" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 msgid "Unmounting CD-ROM...\n" msgstr "" @@ -2958,30 +2979,30 @@ msgstr "" msgid "Copying package lists..." msgstr "Lîsteyên pakêtan tên jibergirtin..." -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "%i tomar hatin nivîsîn.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/lt.po b/po/lt.po index 37755a6cf..a7ed0d578 100644 --- a/po/lt.po +++ b/po/lt.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2008-08-02 01:47-0400\n" "Last-Translator: Gintautas Miliauskas \n" "Language-Team: Lithuanian \n" @@ -99,72 +99,72 @@ msgstr "" msgid "Package file %s is out of sync." msgstr "" -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Paketų nerasta" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1243 msgid "You must give at least one search pattern" msgstr "" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Nepavyko rasti paketo %s" -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1526 msgid "Package files:" msgstr "Paketų failai:" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1547 msgid "Pinned packages:" msgstr "Surišti paketai:" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "(nerasta)" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr " Įdiegta: " -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr " Kandidatas: " -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "(nėra)" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr " Paketo susiejimai: " #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr " Versijų lentelė:" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "" -#: cmdline/apt-cache.cc:1690 +#: cmdline/apt-cache.cc:1730 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -201,20 +201,28 @@ msgid "" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" msgstr "Prašome įdėti diską į įrenginį ir paspausti Enter" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Nepavyko pervadinti %s į %s" -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Pakartokite šitą procesą su kitais CD savo rinkinyje." @@ -450,7 +458,7 @@ msgstr "Pakartotinas %s įdiegimas neįmanomas, jo nepavyksta parsiųsti.\n" msgid "%s is already the newest version.\n" msgstr "%s ir taip jau yra naujausias.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n" @@ -558,8 +566,8 @@ msgstr "Po šios operacijos bus naudojama %sB papildomos disko vietos.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Po šios operacijos bus atlaisvinta %sB disko vietos.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nepavyko nustatyti %s laisvos vietos" @@ -598,7 +606,7 @@ msgstr "Nutraukti." msgid "Do you want to continue [Y/n]? " msgstr "Ar norite tęsti [T/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Nepavyko parsiųsti %s %s\n" @@ -607,7 +615,7 @@ msgstr "Nepavyko parsiųsti %s %s\n" msgid "Some files failed to download" msgstr "Nepavyko parsiųsti kai kurių failų" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "Pavyko parsiųsti tik parsiuntimo režime" @@ -685,7 +693,7 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 msgid "The following information may help to resolve the situation:" msgstr "Ši informacija gali padėti išspręsti šią situaciją:" @@ -734,7 +742,7 @@ msgstr "" "Nepatenkintos priklausomybės. Pabandykite įvykdyti 'apt-get -f install' be " "nurodytų paketų (arba nurodykite išeitį)." -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1973 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" @@ -746,85 +754,85 @@ msgstr "" "leidimą, kuomet kai kurie paketai dar nebuvo sukurti arba buvo\n" "pašalinti iš \"Incoming\" aplanko." -#: cmdline/apt-get.cc:1995 +#: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "Sugadinti paketai" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2020 msgid "The following extra packages will be installed:" msgstr "Bus įdiegti šie papildomi paketai:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "Siūlomi paketai:" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "Rekomenduojami paketai:" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "Nepavyko rasti paketo %s" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2184 msgid "Calculating upgrade... " msgstr "Skaičiuojami atnaujinimai... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Nepavyko" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2192 msgid "Done" msgstr "Įvykdyta" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 msgid "Internal error, problem resolver broke stuff" msgstr "Vidinė klaida, problemos sprendimas kažką sugadino" -#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "Nepavyko užrakinti parsiuntimų aplanko" -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2452 msgid "Must specify at least one package to fetch source for" msgstr "Būtina nurodyti bent vieną paketą, kad parsiųsti jo išeities tekstą" -#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, c-format msgid "Unable to find a source package for %s" msgstr "Nepavyko surasti išeities teksto paketo, skirto %s" -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2514 #, c-format msgid "" "Please use:\n" @@ -832,85 +840,85 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2567 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Praleidžiama jau parsiųsta byla „%s“\n" -#: cmdline/apt-get.cc:2605 +#: cmdline/apt-get.cc:2604 #, c-format msgid "You don't have enough free space in %s" msgstr "Neturite pakankamai laisvos vietos %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2613 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Reikia parsiųsti %sB/%sB išeities archyvų.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2618 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Reikia parsiųsti %sB išeities archyvų.\n" -#: cmdline/apt-get.cc:2625 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" msgstr "Parsiunčiamas archyvas %s\n" -#: cmdline/apt-get.cc:2663 +#: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "Nepavyko gauti kai kurių arhcyvų." -#: cmdline/apt-get.cc:2694 +#: cmdline/apt-get.cc:2693 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Jau išpakuotas archyvas %s praleidžiama\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Nepavyko įvykdyti išpakavimo komandos „%s“\n" -#: cmdline/apt-get.cc:2707 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n" -#: cmdline/apt-get.cc:2729 +#: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "Nepavyko įvykdyti paketo kompiliavimo komandos „%s“\n" -#: cmdline/apt-get.cc:2749 +#: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "Klaida procese-palikuonyje" -#: cmdline/apt-get.cc:2768 +#: cmdline/apt-get.cc:2767 msgid "Must specify at least one package to check builddeps for" msgstr "Būtina nurodyti bent vieną paketą, kuriam norite įvykdyti builddeps" -#: cmdline/apt-get.cc:2793 +#: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nepavyko gauti kūrimo-priklausomybių informacijos paketui %s" -#: cmdline/apt-get.cc:2840 +#: cmdline/apt-get.cc:2839 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:3010 +#: cmdline/apt-get.cc:3009 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -918,7 +926,7 @@ msgid "" msgstr "" "%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas" -#: cmdline/apt-get.cc:3028 +#: cmdline/apt-get.cc:3027 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -926,14 +934,14 @@ msgid "" msgstr "" "%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas" -#: cmdline/apt-get.cc:3051 +#: cmdline/apt-get.cc:3050 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Nepavyko patenkinti %s priklausomybės %s paketui: Įdiegtas paketas %s yra " "per naujas" -#: cmdline/apt-get.cc:3090 +#: cmdline/apt-get.cc:3089 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -942,7 +950,7 @@ msgstr "" "%s priklausomybė %s paketui negali būti patenkinama, nes nėra tinkamos " "versijos %s paketo" -#: cmdline/apt-get.cc:3096 +#: cmdline/apt-get.cc:3095 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -950,30 +958,30 @@ msgid "" msgstr "" "%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas" -#: cmdline/apt-get.cc:3119 +#: cmdline/apt-get.cc:3118 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Nepavyko patenkinti %s priklausomybės %s: %s" -#: cmdline/apt-get.cc:3135 +#: cmdline/apt-get.cc:3133 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:3140 +#: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Jungiamasi prie %s (%s)" -#: cmdline/apt-get.cc:3368 +#: cmdline/apt-get.cc:3366 msgid "Supported modules:" msgstr "Palaikomi moduliai:" -#: cmdline/apt-get.cc:3409 +#: cmdline/apt-get.cc:3407 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1019,7 +1027,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:3574 +#: cmdline/apt-get.cc:3572 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1090,7 +1098,7 @@ msgid "%s was already not hold.\n" msgstr "%s ir taip jau yra naujausias.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" @@ -1225,8 +1233,8 @@ msgstr "Jungiamasi per ilgai" msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 +#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 msgid "Read error" msgstr "Skaitymo klaida" @@ -1239,8 +1247,8 @@ msgid "Protocol corruption" msgstr "" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 +#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 msgid "Write error" msgstr "Rašymo klaida" @@ -1383,28 +1391,36 @@ msgstr "" msgid "Unable to connect to %s:%s:" msgstr "Nepavyko prisijungti prie %s %s:" -#: methods/gpgv.cc:169 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:183 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Nežinoma klaida kviečiant gpgv" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Šie parašai buvo nevalidūs:\n" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1485,8 +1501,8 @@ msgstr "Vidinė klaida" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1515,7 +1531,12 @@ msgstr "" msgid "Can not read mirror file '%s'" msgstr "Nepavyko atverti failo %s" -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "Nepavyko atverti failo %s" + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "" @@ -1612,7 +1633,7 @@ msgstr "" " -c=? Nuskaityti šį konfigūracijų failą\n" " -o=? Nustatyti savarankiškas nuostatas, pvz.: -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Nepavyko įrašyti į %s" @@ -1992,23 +2013,23 @@ msgstr "" " -c=? Nuskaityti šią konfigūracijos bylą\n" " -o=? Nurodyti savarankiškas nuostatas, pvz.: -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "Sugadintas archyvas" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "Tar kontrolinė suma klaidinga, archyvas sugadintas" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Nežinomas TAR antraštės tipas %u. narys %s" @@ -2228,7 +2249,7 @@ msgstr "" msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1172 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "" @@ -2368,111 +2389,111 @@ msgstr "" msgid "Problem closing the gzip file %s" msgstr "Klaida užveriant failą" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "Nepavyko atverti rakinimo failo %s" -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:249 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "Nepavyko rezervuoti rakinimo failo %s" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Procesas %s gavo segmentavimo klaidą" -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:843 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Procesas %s gavo segmentavimo klaidą" -#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Procesas %s grąžino klaidos kodą (%u)" -#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Procesas %s netikėtai išėjo" -#: apt-pkg/contrib/fileutl.cc:984 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Could not open file %s" msgstr "Nepavyko atverti failo %s" -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1062 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "Nepavyko atverti failo %s" -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "Nepavyko sukurti subproceso IPC" -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " msgstr "Nepavyko paleisti suspaudėjo " -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1297 #, c-format msgid "read, still have %llu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1681 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Klaida užveriant failą" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1693 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Klaida sinchronizuojant failą" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1704 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Klaida užveriant failą" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1717 msgid "Problem syncing the file" msgstr "Klaida sinchronizuojant failą" @@ -2669,19 +2690,19 @@ msgstr "" msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Nepavyko atverti failo %s" -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2710,7 +2731,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 +#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2719,7 +2740,7 @@ msgstr "" "Kai kurių indeksų failų nepavyko parsiųsti, jie buvo ignoruoti arba vietoje " "jų panaudoti seni." -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "Trūksta aplanko „%s“" @@ -2821,14 +2842,14 @@ msgstr "" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 -#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 -#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 -#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 -#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 -#: apt-pkg/pkgcachegen.cc:561 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Klaida apdorojant turinį %s" @@ -2849,26 +2870,26 @@ msgstr "" msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:568 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:1197 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 -#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" msgstr "Skaitomi paketų sąrašai" -#: apt-pkg/pkgcachegen.cc:1302 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "" @@ -2881,40 +2902,40 @@ msgstr "" msgid "MD5Sum mismatch" msgstr "MD5 sumos neatitikimas" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 msgid "Hash Sum mismatch" msgstr "Maišos sumos nesutapimas" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nepavyko atverti DB failo %s: %s" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2922,32 +2943,32 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "GPG klaida: %s: %s" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "Neatitinka dydžiai" @@ -2997,7 +3018,7 @@ msgstr "Identifikuojama.. " msgid "Stored label: %s\n" msgstr "" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 msgid "Unmounting CD-ROM...\n" msgstr "Atjungiamas CD-ROM...\n" @@ -3057,30 +3078,30 @@ msgstr "" msgid "Copying package lists..." msgstr "Kopijuojami paketų sąrašai..." -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "Rašomas naujas šaltinių sąrašas\n" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/mr.po b/po/mr.po index 8bac3c3e6..ae9fd15fa 100644 --- a/po/mr.po +++ b/po/mr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2008-11-20 23:27+0530\n" "Last-Translator: Sampada \n" "Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India " @@ -95,73 +95,73 @@ msgstr "हिशेबात घेतलेली एकूण अवकाश msgid "Package file %s is out of sync." msgstr "पॅकेज संचिका %s सिंक्रोनाइज नाहीत" -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "पॅकेजेस सापडले नाहीत" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1243 #, fuzzy msgid "You must give at least one search pattern" msgstr "तुम्हाला फक्त एकच नमुना द्यावा लागेल" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "पॅकेज %s शोधण्यास असमर्थ आहे" -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1526 msgid "Package files:" msgstr "पॅकेज संचिका:" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "दृतिका सिंक नाही,पॅकेज संचिका क्ष-संदर्भ करता येत नाही" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1547 msgid "Pinned packages:" msgstr "एकत्रित पॅकेजेस:" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "(मिळाले नाही)" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr "अधिष्ठापित केले:" -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr "उमेदवार:" -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "(कोणताच नाही)" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr "पॅकेज (पिन):" #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr "आवृत्ती कोष्टक:" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s हे %s करिता %s %s वर संग्रहित\n" -#: cmdline/apt-cache.cc:1690 +#: cmdline/apt-cache.cc:1730 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -234,21 +234,29 @@ msgstr "" "-o=? एखादा अहेतूक संरचना पर्याय निर्धारित करा उदा --o dir::cache=/tmp\n" "अधिक माहितीसाठी apt-cache(8) and apt.conf(5) ची मॅन्युअल पृष्ठे पहा \n" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 #, fuzzy msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "या तबकडीला कृपया नाव द्या जसे डेबियन २ एलआरएल तबकडी १" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" msgstr "कृपया तबकडी ड्राईव्हमध्ये ठेवून एंटर दाबा" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "%s ला पुनर्नामांकन %s करण्यास असमर्थ " -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "तुमच्या संचामधील सर्व सीडीजसाठी याच कृतीची पुनरावृत्ती करा(हीच कृती करा)" @@ -482,7 +490,7 @@ msgstr "%s चे पुनर्संस्थापन शक्य नाह msgid "%s is already the newest version.\n" msgstr "%s ही आधीच नविन आवृत्ती आहे.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s स्वहस्ते संस्थापित करायचे आहे.\n" @@ -589,8 +597,8 @@ msgstr "या क्रियेनंतर, %sB एवढी अधिक ड msgid "After this operation, %sB disk space will be freed.\n" msgstr "या क्रियेनंतर, %sB डिस्क जागा मोकळी होईल.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s मध्ये रिकामी जागा सांगू शकत नाही" @@ -629,7 +637,7 @@ msgstr "व्यत्यय/बंद करा." msgid "Do you want to continue [Y/n]? " msgstr "तुम्हाला पुढे जायचे आहे [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s %s आणणे असफल\n" @@ -638,7 +646,7 @@ msgstr "%s %s आणणे असफल\n" msgid "Some files failed to download" msgstr "काही संचिका डाऊनलोड करण्यास असमर्थ" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "डाऊनलोड संपूर्ण आणि डाऊनलोड मध्ये फक्त पद्धती" @@ -719,7 +727,7 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 msgid "The following information may help to resolve the situation:" msgstr "खालील माहिती परिस्थिती निवळण्यासाठी मदत ठरू शकेल:" @@ -770,7 +778,7 @@ msgstr "" "अनमेट डिपेंडन्सीज.एपीटी-गेट -एफ संस्थापन ('apt-get -f install') पॅकेजशिवाय प्रयत्न करा " "(किंवा पर्याय सांगा)." -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1973 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" @@ -782,85 +790,85 @@ msgstr "" "विभागणी असणारी पण हवी असणारी, तयार केली नसलेली पॅकेजेस वापरत असाल \n" "किंवा ती येणाऱ्यांपैकी बाहेर हलविली असतील." -#: cmdline/apt-get.cc:1995 +#: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "तुटलेली पॅकेजेस" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2020 msgid "The following extra packages will be installed:" msgstr "खालील अतिरिक्त पॅकेजेस संस्थापित होतील:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "सुचवलेली पॅकेजेस:" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "शिफारस केलेली पॅकेजेस:" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "%s पॅकेज सापडू शकले नाही" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "%s स्वहस्ते संस्थापित करायचे आहे.\n" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2184 msgid "Calculating upgrade... " msgstr "पुढिल आवृत्तीची गणती करीत आहे..." -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "असमर्थ" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2192 msgid "Done" msgstr "झाले" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 msgid "Internal error, problem resolver broke stuff" msgstr "अंतर्गत त्रुटी, अडचण निवारकाने स्टफला तोडले" -#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "डाऊनलोड डिरेक्टरी कुलूपबंद करण्यास असमर्थ" -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2452 msgid "Must specify at least one package to fetch source for" msgstr "उगम शोधण्यासाठी किमान एक पॅकेज देणे/सांगणे गरजेचे आहे" -#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, c-format msgid "Unable to find a source package for %s" msgstr "%s उगम पॅकेज शोधणे शक्य नाही/शोधण्यास असमर्थ आहे" -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2514 #, c-format msgid "" "Please use:\n" @@ -868,104 +876,104 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2567 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "आधीच डाऊनलोड केलेली '%s' फाईल सोडून द्या\n" -#: cmdline/apt-get.cc:2605 +#: cmdline/apt-get.cc:2604 #, c-format msgid "You don't have enough free space in %s" msgstr "%s मध्ये पुरेशी जागा नाही" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2613 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "उगम अर्काईव्हज चा %sB/%sB घेण्याची गरज आहे.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2618 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "उगम अर्काईव्हजचा %sB घेण्याची गरज आहे.\n" -#: cmdline/apt-get.cc:2625 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" msgstr "%s उगम घ्या\n" -#: cmdline/apt-get.cc:2663 +#: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "काही अर्काईव्हज आणण्यास असमर्थ." -#: cmdline/apt-get.cc:2694 +#: cmdline/apt-get.cc:2693 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s मध्ये आधीच उघडलेल्या उगमातील उघडलेल्याला सोडून द्या किंवा वगळा\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s' आज्ञा सुट्या करण्यास असमर्थ.\n" -#: cmdline/apt-get.cc:2707 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n" -#: cmdline/apt-get.cc:2729 +#: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "बांधणी करणाऱ्या आज्ञा '%s' अयशस्वी.\n" -#: cmdline/apt-get.cc:2749 +#: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "चाईल्ड प्रक्रिया अयशस्वी" -#: cmdline/apt-get.cc:2768 +#: cmdline/apt-get.cc:2767 msgid "Must specify at least one package to check builddeps for" msgstr "बिल्डेपस् कशासाठी ते पडताळण्यासाठी किमान एक पॅकेज सांगणे गरजेचे आहे" -#: cmdline/apt-get.cc:2793 +#: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s साठी बांधणी डिपेंडन्सी माहिती मिळवण्यास असमर्थ" -#: cmdline/apt-get.cc:2840 +#: cmdline/apt-get.cc:2839 #, c-format msgid "%s has no build depends.\n" msgstr "%s ला बांधणी डिपेंडन्स नाहीत.\n" -#: cmdline/apt-get.cc:3010 +#: cmdline/apt-get.cc:3009 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "%s पॅकेज न सापडल्याने %s साठी %s डिपेंडन्सी पूर्ण होऊ शकत नाही" -#: cmdline/apt-get.cc:3028 +#: cmdline/apt-get.cc:3027 #, 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:3051 +#: cmdline/apt-get.cc:3050 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "%s अवलंबित्व %s साठी पूर्ण होण्यास असमर्थ: संस्थापित पॅकेज %s खूपच नवीन आहे" -#: cmdline/apt-get.cc:3090 +#: cmdline/apt-get.cc:3089 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -974,37 +982,37 @@ msgstr "" "आवृतीची मागणी पूर्ण करण्यासाठी %s पॅकेजची आवृत्ती उपलब्ध नाही,त्यामुळे %s साठी %s " "डिपेंडन्सी पूर्ण होऊ शकत नाही" -#: cmdline/apt-get.cc:3096 +#: cmdline/apt-get.cc:3095 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "%s पॅकेज न सापडल्याने %s साठी %s डिपेंडन्सी पूर्ण होऊ शकत नाही" -#: cmdline/apt-get.cc:3119 +#: cmdline/apt-get.cc:3118 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s साठी %s डिपेंडन्सी पूर्ण होण्यास असमर्थ: %s" -#: cmdline/apt-get.cc:3135 +#: cmdline/apt-get.cc:3133 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s साठी बांधणी-डिपेंडन्सीज पूर्ण होऊ शकत नाही." -#: cmdline/apt-get.cc:3140 +#: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "बांधणी-डिपेंडन्सीज क्रिया पूर्ण करण्यास असमर्थ " -#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "%s (%s) ला जोडत आहे" -#: cmdline/apt-get.cc:3368 +#: cmdline/apt-get.cc:3366 msgid "Supported modules:" msgstr "प्रोग्राम गटाला तांत्रिक मदत दिली:" -#: cmdline/apt-get.cc:3409 +#: cmdline/apt-get.cc:3407 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1091,7 +1099,7 @@ msgstr "" " apt.conf(5) पुस्तिका पाने पहा.\n" " ह्या APT ला सुपर काऊ पॉवर्स आहेत\n" -#: cmdline/apt-get.cc:3574 +#: cmdline/apt-get.cc:3572 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1162,7 +1170,7 @@ msgid "%s was already not hold.\n" msgstr "%s ही आधीच नविन आवृत्ती आहे.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" @@ -1301,8 +1309,8 @@ msgstr "वेळेअभावी संबंध जोडता येत msgid "Server closed the connection" msgstr "सर्व्हरने संबंध जोडणी बंद केली" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 +#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 msgid "Read error" msgstr "त्रुटी वाचा" @@ -1315,8 +1323,8 @@ msgid "Protocol corruption" msgstr "प्रोटोकॉल खराब झाले" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 +#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 msgid "Write error" msgstr "लिहिण्यात त्रुटी" @@ -1459,30 +1467,38 @@ msgstr "%s:%s' (%i) रिझॉल्व्ह होत असताना क msgid "Unable to connect to %s:%s:" msgstr "%s %s ला जोडण्यास असमर्थ:" -#: methods/gpgv.cc:169 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "अंतर्गत त्रुटी: चांगली सही, पण की ठसे सांगू शकत नाही?!" -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "किमान एक अवैध सही सापडली." -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:172 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "सहीची खात्री करण्यासाठी '%s' कार्यान्वित करू शकत नाही (gpgv संस्थापित केले आहे का?)" -#: methods/gpgv.cc:183 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "gpgv कार्यान्वित होत असताना अपरिचित त्रुटी" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "खालील सह्या अवैध आहेत:\n" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1563,8 +1579,8 @@ msgstr "अंतर्गत त्रुटी" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1593,7 +1609,12 @@ msgstr "" msgid "Can not read mirror file '%s'" msgstr "%s फाईल उघडता येत नाही" -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "%s फाईल उघडता येत नाही" + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "" @@ -1686,7 +1707,7 @@ msgstr "" " -c=? ही संरचना संचिका वाचा \n" " -o=? एखादा अहेतुक संरचना पर्याय निर्धारित करा जसे- -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "%s मध्ये लिहिण्यास असमर्थ " @@ -2060,23 +2081,23 @@ msgstr "" " -c=? ही संरचना फाईल वाचा\n" " -o=?- अनियंत्रित संरचना पर्याय निश्चित करा,eg -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "पाईप तयार करण्यास असमर्थ" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "exec gzip करण्यास असमर्थ" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "बिघडलेली अर्काईव्हज" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "टार(टेपअर्काईव्ह) चेकसम चुकला, बिघडलेली अर्काईव्ह" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "अपरिचित TAR शीर्षक प्रकार %u, मेंबर %s" @@ -2295,7 +2316,7 @@ msgstr "" msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1172 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "%s निवडक भाग सापडत नाही" @@ -2435,111 +2456,111 @@ msgstr "सीडी-रॉम स्टॅट करण्यास असम msgid "Problem closing the gzip file %s" msgstr "फाईल बंद करण्यात अडचण" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "फक्त वाचण्यासाठी कुलूप संचिका %s साठी कुलूपबंदचा वापर करीत नाही" -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "%s कुलूप फाईल उघडता येत नाही" -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:249 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "%s nfs(नेटवर्क फाईल सिस्टीम) माऊंटेड कुलुप फाईल ला कुलुप /बंद करता येत नाही" -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "%s कुलुप मिळवता येत नाही" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "%s उपक्रियेला सेगमेंटेशन दोष प्राप्त झाला." -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:843 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "%s उपक्रियेला सेगमेंटेशन दोष प्राप्त झाला." -#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "%s उपक्रियेने (%u) त्रुटी कोड दिलेला आहे" -#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "%s उपक्रिया अचानकपणे बाहेर पडली" -#: apt-pkg/contrib/fileutl.cc:984 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Could not open file %s" msgstr "%s फाईल उघडता येत नाही" -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1062 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "%s साठी पाईप उघडता येत नाही" -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "आयपीसी उपक्रिया तयार करण्यास असमर्थ" -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " msgstr "दाबक(संकलितकर्ता) कर्यान्वित करण्यास असमर्थ" -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1297 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "वाचा, %lu अजूनही वाचण्यासाठी आहे पण आता काही उरली नाही" -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "लिहा, %lu अजूनही लिहिण्यासाठी आहे पण लिहिता येत नाही" -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1681 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "फाईल बंद करण्यात अडचण" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1693 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "संचिकेची syncing समस्या" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1704 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "फाईल अनलिंकिंग करण्यात अडचण" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1717 msgid "Problem syncing the file" msgstr "संचिकेची syncing समस्या" @@ -2737,19 +2758,19 @@ msgstr "स्त्रोत सुची %s (प्रकार) मध्य msgid "Type '%s' is not known on line %u in source list %s" msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही " -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "%s फाईल उघडता येत नाही" -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2784,7 +2805,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "अडचणी दूर करण्यास असमर्थ, तुम्ही तुटलेले पॅकेज घेतलेले आहे." -#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 +#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2793,7 +2814,7 @@ msgstr "" "काही अनुक्रमणिका संचयिका डाऊनलोड करण्यास असमर्थ,त्या दुर्लक्षित झाल्या, किंवा " "त्याऐवजी जुन्या वापरल्या गेल्या." -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "संचयिका यादीत %s पार्शल हरवले आहे." @@ -2893,14 +2914,14 @@ msgstr "अस्थायी स्मृतिकोष मध्ये वि #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 -#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 -#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 -#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 -#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 -#: apt-pkg/pkgcachegen.cc:561 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "%s (पॅकेज शोधतांना) प्रक्रिया करीत असतांना दोष आढळून आला" @@ -2926,26 +2947,26 @@ msgstr "" "अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही अवलंबित/विसंबून असलेल्या संख्येची मर्यादा " "ओलांडली आहे." -#: apt-pkg/pkgcachegen.cc:568 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "अवलंबित/विसंबून असणाऱ्या संचिकांची प्रक्रिया करीत असतांना पॅकेज %s %s सापडले नाही " -#: apt-pkg/pkgcachegen.cc:1197 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "%s उगम पॅकेज यादी सुरू करता येत नाही" -#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 -#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" msgstr "पॅकेज याद्या वाचत आहोत" -#: apt-pkg/pkgcachegen.cc:1302 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "तरतूद/पुरवलेल्या संचिका संग्रहित करीत आहे" -#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "IO त्रुटी उगम निवडक संचयस्थानात संग्रहित होत आहे" @@ -2958,40 +2979,40 @@ msgstr "पुनर्नामांकन अयशस्वी, %s (%s -> %s msgid "MD5Sum mismatch" msgstr "एमडी५ बेरीज/MD5Sum जुळत नाही" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 msgid "Hash Sum mismatch" msgstr "हॅश बेरीज जुळत नाही" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "पुढील कळ ओळखचिन्हांसाठी सार्वजनिक कळ उपलब्ध नाही:\n" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2999,12 +3020,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3013,7 +3034,7 @@ msgstr "" "मी %s पॅकेजकरीता संचिका शोधण्यास समर्थ नव्हतो. याचा अर्थ असाकी तुम्हाला हे पॅकेज स्वहस्ते " "स्थिर/निश्चित करण्याची गरज आहे(हरवलेल्या आर्चमुळे) " -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3022,7 +3043,7 @@ msgstr "" "मी %s पॅकेजकरीता संचिका शोधण्यास समर्थ नव्हतो. याचा अर्थ असाकी तुम्हालाहे पॅकेज स्वहस्ते " "स्थिर/निश्चित करण्याची गरज आहे." -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3030,7 +3051,7 @@ msgstr "" "पॅकेज यादीची/सुचीची संचिका दूषित/खराब झालेली आहे. संचिका नाव नाही: पॅकेजकरीता क्षेत्र/" "ठिकाण %s." -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "आकार जुळतनाही" @@ -3082,7 +3103,7 @@ msgstr "ओळखत आहे.." msgid "Stored label: %s\n" msgstr "ग्रहण केलेले नामदर्शक: %s \n" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 msgid "Unmounting CD-ROM...\n" msgstr "सिडी-रॉम अनमाउंट होत आहे...\n" @@ -3144,30 +3165,30 @@ msgstr "" msgid "Copying package lists..." msgstr "पॅकेज सूचींच्या प्रती तयार करित आहे..." -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "नविन स्त्रोत सूची लिहित आहे\n" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "ह्या डिस्क/चकती करिता स्त्रोत सूचीच्या प्रवेशिका आहेत: \n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "%i माहितीसंच लिहिले.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i गहाळ संचिकाबरोबर %i माहिती संच लिहिले.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i विजोड संचिकांबरोबर %i माहिती संच लिहिले\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "%i गहाळ संचिकाबरोबर आणि %i विजोड संचिकाबरोबर %i माहिती संच लिहिले\n" diff --git a/po/nb.po b/po/nb.po index a0809c350..9cb8cb1b9 100644 --- a/po/nb.po +++ b/po/nb.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2010-09-01 21:10+0200\n" "Last-Translator: Hans Fredrik Nordhaug \n" "Language-Team: Norwegian Bokmål \n" @@ -100,73 +100,73 @@ msgstr "Samlet mengde redegjort plass: " msgid "Package file %s is out of sync." msgstr "Pakkefila %s er ikke oppdatert." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Fant ingen pakker" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1243 msgid "You must give at least one search pattern" msgstr "Du må oppgi minst ett søkemønster" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Klarer ikke å finne pakken %s" -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1526 msgid "Package files:" msgstr "Pakkefiler:" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Mellomlageret er ikke oppdatert, kan ikke kryssreferere til en pakkefil" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1547 msgid "Pinned packages:" msgstr "Låste pakker:" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "(ikke funnet)" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr " Installert: " -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr " Kandidat: " -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "(ingen)" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr " Pakke låst til: " #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr " Versjonstabell:" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s for %s kompilert på %s %s\n" -#: cmdline/apt-cache.cc:1690 +#: cmdline/apt-cache.cc:1730 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -241,20 +241,28 @@ msgstr "" " -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n" "Les manualsidene apt-cache(8) og apt.conf(5) for mer informasjon.\n" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Oppgi et navn for disken, for eksempel «Debian 5.0.3 Disk 1»" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" msgstr "Sett inn en disk i lagringsenheten og trykk Enter" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Klarte ikke montere «%s» på «%s»" -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Gjenta denne prosessen for resten av CD-ene i ditt sett." @@ -490,7 +498,7 @@ msgstr "Det er ikke mulig å installere %s på nytt - den kan ikke nedlastes.\n" msgid "%s is already the newest version.\n" msgstr "%s er allerede nyeste versjon.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s satt til manuell installasjon.\n" @@ -599,8 +607,8 @@ 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:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 #, c-format msgid "Couldn't determine free space in %s" msgstr "Klarte ikke bestemme ledig plass i %s" @@ -640,7 +648,7 @@ msgstr "Avbryter." msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortsette [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikke å skaffe %s %s\n" @@ -649,7 +657,7 @@ msgstr "Klarte ikke å skaffe %s %s\n" msgid "Some files failed to download" msgstr "Klarte ikke laste ned alle filene" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "Nedlasting fullført med innstillinga «bare nedlasting»" @@ -733,7 +741,7 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 msgid "The following information may help to resolve the situation:" msgstr "Følgende informasjon kan være til hjelp med å løse problemet:" @@ -783,7 +791,7 @@ msgstr "" "Uinnfridde avhengighetsforhold. Prøv «apt-get -f install» uten pakker (eller " "angi en løsning)." -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1973 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" @@ -795,78 +803,78 @@ msgstr "" "at visse kjernepakker ennå ikke er laget eller flyttet ut av «Incoming» for\n" "distribusjonen." -#: cmdline/apt-get.cc:1995 +#: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "Ødelagte pakker" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2020 msgid "The following extra packages will be installed:" msgstr "Følgende ekstra pakker vil bli installert." -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "Foreslåtte pakker:" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "Anbefalte pakker" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "Klarte ikke å finne pakken %s" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s satt til automatisk installasjon.\n" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2184 msgid "Calculating upgrade... " msgstr "Beregner oppgradering... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Mislyktes" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2192 msgid "Done" msgstr "Utført" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 msgid "Internal error, problem resolver broke stuff" msgstr "Intern feil, problemløser ødela noe" -#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "Klarer ikke å låse nedlastingsmappa" -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2452 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:2493 cmdline/apt-get.cc:2805 +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, c-format msgid "Unable to find a source package for %s" msgstr "Klarer ikke å finne en kildekodepakke for %s" -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -875,7 +883,7 @@ msgstr "" "MERK: «%s»-pakker blir vedlikeholdt i versjonskontrollsystemet «%s» på:\n" "%s\n" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2514 #, fuzzy, c-format msgid "" "Please use:\n" @@ -886,106 +894,106 @@ msgstr "" "bzr get %s\n" "for å hente siste (muligens ikke utgitte) oppdateringer for pakken.\n" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2567 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hopper over allerede nedlastet fil «%s»\n" -#: cmdline/apt-get.cc:2605 +#: cmdline/apt-get.cc:2604 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikke nok ledig plass i %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2613 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Trenger å skaffe %sB av %sB fra kildekodearkivet.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2618 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Trenger å skaffe %sB fra kildekodearkivet.\n" -#: cmdline/apt-get.cc:2625 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" msgstr "Skaffer kildekode %s\n" -#: cmdline/apt-get.cc:2663 +#: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "Klarte ikke å skaffe alle arkivene." -#: cmdline/apt-get.cc:2694 +#: cmdline/apt-get.cc:2693 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Omgår utpakking av allerede utpakket kilde i %s\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen «%s» mislyktes.\n" -#: cmdline/apt-get.cc:2707 +#: cmdline/apt-get.cc:2706 #, 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:2729 +#: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggekommandoen «%s» mislyktes.\n" -#: cmdline/apt-get.cc:2749 +#: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "Barneprosessen mislyktes" -#: cmdline/apt-get.cc:2768 +#: cmdline/apt-get.cc:2767 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:2793 +#: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, 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:2840 +#: cmdline/apt-get.cc:2839 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen avhengigheter.\n" -#: cmdline/apt-get.cc:3010 +#: cmdline/apt-get.cc:3009 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes" -#: cmdline/apt-get.cc:3028 +#: cmdline/apt-get.cc:3027 #, 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:3051 +#: cmdline/apt-get.cc:3050 #, 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:3090 +#: cmdline/apt-get.cc:3089 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -994,37 +1002,37 @@ 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:3096 +#: cmdline/apt-get.cc:3095 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes" -#: cmdline/apt-get.cc:3119 +#: cmdline/apt-get.cc:3118 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikke å tilfredsstille %s avhengighet for %s: %s" -#: cmdline/apt-get.cc:3135 +#: cmdline/apt-get.cc:3133 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Klarte ikke å tilfredstille bygg-avhengighetene for %s." -#: cmdline/apt-get.cc:3140 +#: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "Klarte ikke å behandle forutsetningene for bygging" -#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Kobler til %s (%s)" -#: cmdline/apt-get.cc:3368 +#: cmdline/apt-get.cc:3366 msgid "Supported modules:" msgstr "Støttede moduler:" -#: cmdline/apt-get.cc:3409 +#: cmdline/apt-get.cc:3407 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1113,7 +1121,7 @@ msgstr "" "for mer informasjon og flere valg.\n" " Denne APT har kraften til en Superku.\n" -#: cmdline/apt-get.cc:3574 +#: cmdline/apt-get.cc:3572 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1188,7 +1196,7 @@ msgid "%s was already not hold.\n" msgstr "%s er allerede nyeste versjon.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" @@ -1329,8 +1337,8 @@ msgstr "Tidsavbrudd på forbindelsen" msgid "Server closed the connection" msgstr "Tjeneren lukket forbindelsen" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 +#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 msgid "Read error" msgstr "Lesefeil" @@ -1343,8 +1351,8 @@ msgid "Protocol corruption" msgstr "Protokollødeleggelse" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 +#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 msgid "Write error" msgstr "Skrivefeil" @@ -1487,29 +1495,37 @@ msgstr "Noe galt skjedde ved oppslag av «%s:%s» (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Klarte ikke koble til %s:%s:" -#: methods/gpgv.cc:169 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Intern feil: God signatur, men kunne bestemme nøkkelfingeravtrykk?!" -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Minst en ugyldig signatur ble funnet." -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Klarte ikke kjøre «gpgv» for å verifisere signaturen (er gpgv installert?)" -#: methods/gpgv.cc:183 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Ukjent feil ved kjøring av gpgv" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "De følgende signaturene var ugyldige:\n" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1592,8 +1608,8 @@ msgstr "Intern feil" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1622,7 +1638,12 @@ msgstr "Ingen speilfil «%s» funnet" msgid "Can not read mirror file '%s'" msgstr "Ingen speilfil «%s» funnet" -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "Ingen speilfil «%s» funnet" + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "[Speil: %s]" @@ -1720,7 +1741,7 @@ msgstr "" " -c=? Les denne innstillingsfila.\n" " -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Kan ikke skrive til %s" @@ -2094,23 +2115,23 @@ msgstr "" " -c=? Les denne innstillingsfila.\n" " -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "Klarte ikke å opprette rør" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "Klarte ikke å kjøre gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "Ødelagt arkiv" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "Tar-sjekksummen mislykkes, arkivet er ødelagt" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Ukjent TAR-hode: type %u, medlem %s" @@ -2335,7 +2356,7 @@ msgstr "%lim %lis" msgid "%lis" msgstr "%lis" -#: apt-pkg/contrib/strutl.cc:1172 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "Fant ikke utvalget %s" @@ -2475,111 +2496,111 @@ msgstr "Klarer ikke å få statusen på CD-spilleren" msgid "Problem closing the gzip file %s" msgstr "Problem ved låsing av gzip-fila %s" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Bruker ikke låsing for den skrivebeskyttede låsefila %s" -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "Klarte ikke åpne låsefila %s" -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:249 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Bruker ikke låsing på den nfs-monterte låsefila %s" -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "Får ikke låst %s" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Underprosessen %s mottok et minnefeilsignal." -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:843 #, c-format msgid "Sub-process %s received signal %u." msgstr "Underprosessen %s mottok signalet %u." -#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Underprosessen %s ga en feilkode (%u)" -#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Underprosessen %s avsluttet uventet" -#: apt-pkg/contrib/fileutl.cc:984 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Could not open file %s" msgstr "Klarte ikke åpne fila %s" -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1062 #, c-format msgid "Could not open file descriptor %d" msgstr "Klarte ikke åpne fildeskriptor %d" -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "Klarte ikke å opprette underprosessen IPC" -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " msgstr "Klarte ikke å kjøre komprimeringen" -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1297 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "lese, har fremdeles %lu igjen å lese, men ingen igjen" -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "skrive, har fremdeles %lu igjen å skrive, men klarte ikke å" -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1681 #, c-format msgid "Problem closing the file %s" msgstr "Problem ved låsing av fila %s" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1693 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problem ved endring av navn på fila %s til %s" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1704 #, c-format msgid "Problem unlinking the file %s" msgstr "Problem ved oppheving av lenke til fila %s" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1717 msgid "Problem syncing the file" msgstr "Problem ved oppdatering av fila" @@ -2777,7 +2798,7 @@ msgstr "Feil på %u i kildelista %s (type)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen «%s» er ukjent i linje %u i kildelista %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2786,12 +2807,12 @@ msgstr "" "Klarte ikke gjennomføre umiddelbar konfigurasjon av «%s». Se man 5 apt.conf " "under APT::Immediate-Configure for detaljer. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Klarte ikke åpne fila «%s»" -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2826,7 +2847,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Klarer ikke å rette problemene, noen ødelagte pakker er holdt tilbake." -#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 +#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2835,7 +2856,7 @@ msgstr "" "Klarte ikke å laste ned alle oversiktfilene. De ble ignorerte, eller gamle " "ble brukt isteden. " -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, c-format msgid "List directory %spartial is missing." msgstr "Listemappa %spartial mangler." @@ -2937,14 +2958,14 @@ msgstr "Lageret har et uoverensstemmende versjonssystem" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 -#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 -#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 -#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 -#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 -#: apt-pkg/pkgcachegen.cc:561 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Feil oppsto under behandling av %s (FindPkg)" @@ -2965,26 +2986,26 @@ msgstr "Jøss, du har overgått antallet beskrivelser denne APT klarer." msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Jøss, du har overgått antallet avhengighetsforhold denne APT klarer." -#: apt-pkg/pkgcachegen.cc:568 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Fant ikke pakken %s %s ved behandling av filkrav" -#: apt-pkg/pkgcachegen.cc:1197 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "Klarte ikke finne informasjon om %s - lista over kildekodepakker" -#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 -#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" msgstr "Leser pakkelister" -#: apt-pkg/pkgcachegen.cc:1302 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "Samler inn filtilbud" -#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "IO-feil ved lagring av kildekode-lager" @@ -2997,41 +3018,41 @@ msgstr "klarte ikke å endre navnet, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "Feil MD5sum" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 msgid "Hash Sum mismatch" msgstr "Hashsummen stemmer ikke" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Klarer ikke å fortolke Release-fila %s" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Det er ingen offentlig nøkkel tilgjengelig for de følgende nøkkel-ID-ene:\n" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konflikt mellom distribusjoner: %s (forventet %s men fant %s)" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3041,12 +3062,12 @@ msgstr "" "forrige indeksfilen vil bli brukt. GPG-feil: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-feil: %s: %s" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3055,7 +3076,7 @@ msgstr "" "Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne pakken " "selv (fordi arkitekturen mangler)." -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3064,13 +3085,13 @@ msgstr "" "Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne denne " "pakken selv." -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Oversiktsfilene er ødelagte. Feltet «Filename:» mangler for pakken %s." -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "Feil størrelse" @@ -3122,7 +3143,7 @@ msgstr "Indentifiserer.." msgid "Stored label: %s\n" msgstr "Lagret merkelapp: %s \n" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 msgid "Unmounting CD-ROM...\n" msgstr "Avmonterer CD-ROM ...\n" @@ -3186,30 +3207,30 @@ msgstr "" msgid "Copying package lists..." msgstr "Kopierer pakkelister..." -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "Skriver ny kildeliste\n" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "Kildelisteoppføringer for denne CD-en er:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "Skrev %i poster.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Skrev %i poster med %i manglende filer.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Skrev %i poster med %i feile filer.\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Skrev %i poster med %i manglende filer og %i feile filer.\n" diff --git a/po/ne.po b/po/ne.po index 2081389fc..d8f863c28 100644 --- a/po/ne.po +++ b/po/ne.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2006-06-12 14:35+0545\n" "Last-Translator: Shiva Pokharel \n" "Language-Team: Nepali \n" @@ -98,73 +98,73 @@ msgstr "को लागि कूल खाली ठाऊँ लेखां msgid "Package file %s is out of sync." msgstr "प्याकेज फाइल %s sync भन्दा बाहिर छ ।" -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "कुनै प्याकेजहरू फेला परेन" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1243 #, fuzzy msgid "You must give at least one search pattern" msgstr "तपाईँले एउटा वास्तविक बान्की दिनुपर्छ" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "प्याकेज %s तोक्न असक्षम भयो" -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1526 msgid "Package files:" msgstr "प्याकेज फाइलहरू:" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "क्यास sync भन्दा बाहिर छ, प्याकेज फाइल x-ref गर्न सक्दैन" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1547 msgid "Pinned packages:" msgstr "पिन गरिएका प्याकेजहरू:" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "(फेला परेन)" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr " स्थापना भयो:" -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr " उमेद्वार:" -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "(कुनै पनि होइन)" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr "प्याकेज पिन:" #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr " संस्करण तालिका:" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s को लागि %s %s, %s %s मा कम्पाएल गरिएको छ\n" -#: cmdline/apt-cache.cc:1690 +#: cmdline/apt-cache.cc:1730 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -238,21 +238,29 @@ msgstr "" " -o=? एउटा स्वेच्छाचारी कनफिगरेसन फाइल सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n" "धेरै जानकारीकोप लागि apt-cache(8) र apt.conf(5) म्यानुल पृष्टहरू हेर्नुहोस् ।\n" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 #, fuzzy msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "कृपया यो डिस्कको लागि नाम उपलब्ध गराउनुहोस्, जस्तै 'Debian 2.1r1 Disk 1'" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" msgstr "कृपया ड्राइभमा डिस्क घुसाउनुहोस् र इन्टर थिच्नुहोस्" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr " %s मा %s पुन:नामकरण असफल भयो" -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "तपाईँको सेटमा बाँकी सि डि हरुको लागि यो प्रक्रिया फेरी गर्नुहोस् । " @@ -486,7 +494,7 @@ msgstr " %s को पुन: स्थापना सम्भव छैन, msgid "%s is already the newest version.\n" msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "तर %s स्थापना हुनुपर्यो" @@ -593,8 +601,8 @@ msgstr "अनप्याक गरिसके पछि थप डिस् msgid "After this operation, %sB disk space will be freed.\n" msgstr "%sB अनप्याक गरिसके पछि डिस्क खाली ठाउँ खाली हुनेछ ।\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 #, c-format msgid "Couldn't determine free space in %s" msgstr " %s मा खाली ठाऊँ निर्धारण गर्न सकिएन" @@ -633,7 +641,7 @@ msgstr "परित्याग गर्नुहोस् ।" msgid "Do you want to continue [Y/n]? " msgstr "के तपाईँ निरन्तरता दिन चाहनुहुन्छ [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s %s तान्न असफल भयो\n" @@ -642,7 +650,7 @@ msgstr "%s %s तान्न असफल भयो\n" msgid "Some files failed to download" msgstr "केही फाइलहरू डाउनलोड गर्न असफल भयो" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "डाउनलोड समाप्त भयो र डाउनलोडमा मोड मात्रै छ" @@ -720,7 +728,7 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 msgid "The following information may help to resolve the situation:" msgstr "निम्न सूचनाले अवस्थालाई हल गर्न मद्दत गर्नेछ: " @@ -769,7 +777,7 @@ msgstr "" "नभेटिएका निर्भरताहरू । प्याकेजहरू बिना 'apt-get -f install' प्रयास गर्नुहोस् ( वा " "समाधान निर्दिष्ट गर्नुहोस्) ।" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1973 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" @@ -782,85 +790,85 @@ msgstr "" " वितरण अहिले सम्म सिर्जना\n" " भएको छैन वा आवगमन विनानै सर्यो ।" -#: cmdline/apt-get.cc:1995 +#: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "भाँचिएका प्याकेजहरू" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2020 msgid "The following extra packages will be installed:" msgstr "निम्न अतिरिक्त प्याकेजहरू स्थापना हुनेछन्:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "सुझाव दिएका प्याकेजहरू:" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "सिफारिस गरिएका प्याकेजहरू:" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "प्याकेज फेला पार्न सकिएन %s" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "तर %s स्थापना हुनुपर्यो" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2184 msgid "Calculating upgrade... " msgstr "स्तर वृद्धि गणना गरिदैछ..." -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "असफल भयो" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2192 msgid "Done" msgstr "काम भयो" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 msgid "Internal error, problem resolver broke stuff" msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो " -#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "डाउनलोड डाइरेक्ट्री ताल्चा मार्न असक्षम" -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2452 msgid "Must specify at least one package to fetch source for" msgstr "को लागि स्रोत तान्न कम्तिमा एउटा प्याकेज निर्दिष्ट गर्नुपर्छ" -#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, c-format msgid "Unable to find a source package for %s" msgstr "%s को लागि स्रोत प्याकेज फेला पार्न असफल भयो" -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2514 #, c-format msgid "" "Please use:\n" @@ -868,104 +876,104 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2567 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "पहिल्यै डाउनलोड भएका फाइलहरु फड्काइदैछ '%s'\n" -#: cmdline/apt-get.cc:2605 +#: cmdline/apt-get.cc:2604 #, c-format msgid "You don't have enough free space in %s" msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2613 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "स्रोत संग्रहहरुको %sB/%sB प्राप्त गर्न आवश्यक छ ।\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2618 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "स्रोत संग्रहहरुको %sB प्राप्त गर्न आवश्यक छ ।\n" -#: cmdline/apt-get.cc:2625 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" msgstr "स्रोत फड्काउनुहोस् %s\n" -#: cmdline/apt-get.cc:2663 +#: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "केही संग्रह फड्काउन असफल भयो ।" -#: cmdline/apt-get.cc:2694 +#: cmdline/apt-get.cc:2693 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr " %s मा पहिल्यै अनप्याक गरिएका स्रोतको अनप्याक फड्काइदैछ\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "अनप्याक आदेश '%s' असफल भयो ।\n" -#: cmdline/apt-get.cc:2707 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n" -#: cmdline/apt-get.cc:2729 +#: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "निर्माण आदेश '%s' असफल भयो ।\n" -#: cmdline/apt-get.cc:2749 +#: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "शाखा प्रक्रिया असफल भयो" -#: cmdline/apt-get.cc:2768 +#: cmdline/apt-get.cc:2767 msgid "Must specify at least one package to check builddeps for" msgstr "को लागि builddeps जाँच्न कम्तिमा एउटा प्याकेज निर्दष्ट गर्नुपर्छ" -#: cmdline/apt-get.cc:2793 +#: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s को लागि निर्माण-निर्भरता सूचना प्राप्त गर्न असक्षम भयो" -#: cmdline/apt-get.cc:2840 +#: cmdline/apt-get.cc:2839 #, c-format msgid "%s has no build depends.\n" msgstr "%s कुनै निर्माणमा आधारित हुदैन ।\n" -#: cmdline/apt-get.cc:3010 +#: cmdline/apt-get.cc:3009 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन" -#: cmdline/apt-get.cc:3028 +#: cmdline/apt-get.cc:3027 #, 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:3051 +#: cmdline/apt-get.cc:3050 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "%s को लागि %s निर्भरता सन्तुष्ट पार्न असफल भयो: स्थापित प्याकेज %s अति नयाँ छ" -#: cmdline/apt-get.cc:3090 +#: cmdline/apt-get.cc:3089 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -974,37 +982,37 @@ msgstr "" "%sको लागि %s निर्भरता सन्तुष्ट हुन सकेन किन भने प्याकेज %s को कुनै उपलब्ध संस्करणले संस्करण " "आवश्यकताहरुलाई सन्तुष्ट पार्न सकेन " -#: cmdline/apt-get.cc:3096 +#: cmdline/apt-get.cc:3095 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन" -#: cmdline/apt-get.cc:3119 +#: cmdline/apt-get.cc:3118 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s को लागि %s निर्भरता सन्तुष्ट गर्न असफल: %s" -#: cmdline/apt-get.cc:3135 +#: cmdline/apt-get.cc:3133 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s को लागि निर्माण निर्भरताहरू सन्तुष्ट गर्न सकिएन । " -#: cmdline/apt-get.cc:3140 +#: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "निर्माण निर्भरताहरू प्रक्रिया गर्न असफल" -#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "%s (%s) मा जडान गरिदैछ" -#: cmdline/apt-get.cc:3368 +#: cmdline/apt-get.cc:3366 msgid "Supported modules:" msgstr "समर्थित मोड्युलहरू:" -#: cmdline/apt-get.cc:3409 +#: cmdline/apt-get.cc:3407 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1089,7 +1097,7 @@ msgstr "" "pages हेर्नुहोस् ।\n" " APT संग सुपर काउ शक्तिहरू छ ।\n" -#: cmdline/apt-get.cc:3574 +#: cmdline/apt-get.cc:3572 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1160,7 +1168,7 @@ msgid "%s was already not hold.\n" msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" @@ -1299,8 +1307,8 @@ msgstr "जडान समय सकियो" msgid "Server closed the connection" msgstr "सर्भरले जडान बन्द गर्यो" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 +#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 msgid "Read error" msgstr "त्रुटि पढ्नुहोस्" @@ -1313,8 +1321,8 @@ msgid "Protocol corruption" msgstr "प्रोटोकल दूषित" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 +#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 msgid "Write error" msgstr "त्रुटि लेख्नुहोस्" @@ -1457,29 +1465,37 @@ msgstr " '%s:%s' (%i) हल गर्दा केही दुष्ट घट msgid "Unable to connect to %s:%s:" msgstr "%s %s मा जडान गर्न असफल भयो:" -#: methods/gpgv.cc:169 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "आन्तरिक त्रुटि: असल हस्ताक्षर, तर कुञ्जी औठाछाप निर्धारण गर्न सकिएन?!" -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "कम्तिमा एउटा अवैध हस्ताक्षर विरोध भयो ।" -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:172 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "हस्ताक्षर रूजू गर्न '%s' कार्यन्वयन गर्न सकिएन (के gpgv स्थापना भयो?)" -#: methods/gpgv.cc:183 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "gpgv कार्यन्वयन गर्दा अज्ञात त्रुटि" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "निम्न हस्ताक्षरहरू अवैध छन्:\n" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1560,8 +1576,8 @@ msgstr "आन्तरिक त्रुटि" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1590,7 +1606,12 @@ msgstr "" msgid "Can not read mirror file '%s'" msgstr "फाइल %s खोल्न सकिएन" -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "फाइल %s खोल्न सकिएन" + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "" @@ -1684,7 +1705,7 @@ msgstr "" " -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n" " -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr " %s मा लेख्न असक्षम" @@ -2056,23 +2077,23 @@ msgstr "" " -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n" " -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "पाइपहरू सिर्जना गर्न असफल" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "gzip कार्यन्वयन गर्न असफल" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "संग्रह दूषित भयो" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "टार चेकसम असफल भयो, संग्रह दूषित भयो" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "अज्ञात टार हेडर प्रकार %u, सदस्य %s" @@ -2292,7 +2313,7 @@ msgstr "" msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1172 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "चयन %s फेला पार्न सकिएन" @@ -2432,111 +2453,111 @@ msgstr "सिडी रोम स्थिर गर्न असफल भय msgid "Problem closing the gzip file %s" msgstr "फाइल बन्द गर्दा समस्या" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "ताल्चा मारिएको फाइल मात्र पढ्नको लागि ताल्चा मार्न प्रयोग गरिएको छैन %s" -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "ताल्चा मारिएको फाइल खोल्न सकिएन %s" -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:249 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "nfs माउन्ट गरिएको लक फाइलको लागि लक प्रयोग गरिएको छैन %s" -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "ताल्चा प्राप्त गर्न सकिएन %s" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "सहायक प्रक्रिया %s ले खण्डिकरण गल्ति प्राप्त भयो ।" -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:843 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "सहायक प्रक्रिया %s ले खण्डिकरण गल्ति प्राप्त भयो ।" -#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "सहायक प्रक्रिया %s ले एउटा त्रुटि कोड फर्कायो (%u)" -#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "सहायक प्रक्रिया %s अनपेक्षित बन्द भयो" -#: apt-pkg/contrib/fileutl.cc:984 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Could not open file %s" msgstr "फाइल %s खोल्न सकिएन" -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1062 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "%s को लागि पाइप खोल्न सकिएन" -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "सहायक प्रक्रिया IPC सिर्जना गर्न असफल" -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " msgstr "सङ्कुचनकर्ता कार्यान्वयन गर्न असफल भयो" -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1297 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "पड्नुहोस्, अहिले सम्म %lu पढ्न छ तर कुनै बाँकी छैन" -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "लेख्नुहोस्, अहिले सम्म %lu लेख्न छ तर सकिदैन " -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1681 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "फाइल बन्द गर्दा समस्या" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1693 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "फाइल गुप्तिकरण गर्दा समस्या" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1704 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "फाइल अनलिङ्क गर्दा समस्या" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1717 msgid "Problem syncing the file" msgstr "फाइल गुप्तिकरण गर्दा समस्या" @@ -2735,19 +2756,19 @@ msgstr "वैरुप्य लाइन %u स्रोत सूचिमा msgid "Type '%s' is not known on line %u in source list %s" msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "फाइल %s खोल्न सकिएन" -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2781,7 +2802,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "समस्याहरू सुधार्न असक्षम भयो, तपाईँले प्याकेजहरु भाँच्नुभयो ।" -#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 +#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2790,7 +2811,7 @@ msgstr "" "केही अनुक्रमणिका फाइलहरू डाउनलोड गर्न असफल भयो, तिनीहरू उपेक्षित भए, वा सट्टामा पुरानो " "एउटा प्रयोग गरियो ।" -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "आंशिक सूचिहरुको डाइरेक्ट्री %s हराइरहेछ ।" @@ -2890,14 +2911,14 @@ msgstr "क्यास संग एउटा नमिल्दो संस #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 -#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 -#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 -#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 -#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 -#: apt-pkg/pkgcachegen.cc:561 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (pkg फेला पार्नुहोस् )" @@ -2919,26 +2940,26 @@ msgstr "वाऊ, APT ले सक्षम गरेको संस्कर msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "वाऊ, APT ले सक्षम गरेको निर्भरताहरुको नम्बरलाई तपाईँले उछिन्नुभयो । " -#: apt-pkg/pkgcachegen.cc:568 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "फाइल निर्भरताहरू प्रक्रिया गर्दा प्याकेज %s %s फेला परेन" -#: apt-pkg/pkgcachegen.cc:1197 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन " -#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 -#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" msgstr "प्याकेज सूचिहरू पढिदैछ" -#: apt-pkg/pkgcachegen.cc:1302 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "फाइल उपलब्धताहरू संकलन गरिदैछ" -#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "स्रोत क्यास बचत गर्दा IO त्रुटि" @@ -2951,41 +2972,41 @@ msgstr "पुन:नामकरण असफल गरियो, %s (%s -> %s) msgid "MD5Sum mismatch" msgstr "MD5Sum मेल भएन" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 #, fuzzy msgid "Hash Sum mismatch" msgstr "MD5Sum मेल भएन" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "निम्न कुञ्जी IDs को लागि कुनै सार्वजनिक कुञ्जी उपलब्ध छैन:\n" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2993,12 +3014,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3007,7 +3028,7 @@ msgstr "" "%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज " "निश्चित गर्नुहोस् । (arch हराएरहेको कारणले) " -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3016,13 +3037,13 @@ msgstr "" "%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज " "निश्चित गर्नुहोस् ।" -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "प्याकेज अनुक्रमणिका फाइलहरू दूषित भए । प्याकेज %s को लागि कुनै फाइलनाम: फाँट छैन ।" -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "साइज मेल खाएन" @@ -3074,7 +3095,7 @@ msgstr "परिचय गराइदैछ.." msgid "Stored label: %s\n" msgstr "लेबुल भण्डारण गर्नुहोस्:%s \n" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "सिडी रोम अनमाउन्ट गरिदैछ..." @@ -3135,30 +3156,30 @@ msgstr "" msgid "Copying package lists..." msgstr "प्यकेज सूचिहरू प्रतिलिपी गरिदैछ..." -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "नयाँ स्रोत सूचि लेखिदैछ\n" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "यो डिस्कको लागि स्रोत सूचि प्रविष्टिहरू:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "%i रेकर्डहरू लेखियो ।\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "हराइरहेको फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "मेल नखाएका फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "हराइरहेको फाइल %i हरू र मेल नखाएका फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n" diff --git a/po/nl.po b/po/nl.po index dad286af5..ef59d0e7e 100644 --- a/po/nl.po +++ b/po/nl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.15.9\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2011-12-05 17:10+0100\n" "Last-Translator: Jeroen Schot \n" "Language-Team: Debian l10n Dutch \n" @@ -99,72 +99,72 @@ msgstr "Totale hoeveelheid verantwoorde ruimte: " msgid "Package file %s is out of sync." msgstr "Pakketbestand %s is niet meer gesynchroniseerd." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Geen pakketten gevonden" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1243 msgid "You must give at least one search pattern" msgstr "U dient precies één zoekpatroon op te geven" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Kan pakket %s niet vinden" -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1526 msgid "Package files:" msgstr "Pakketbestanden:" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Cache loopt niet synchroon, kan pakketbestand niet 'x-ref'-en" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1547 msgid "Pinned packages:" msgstr "Vastgepinde pakketten:" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "(niet gevonden)" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr " Geïnstalleerd: " -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr " Kandidaat: " -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "(geen)" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr " Pakketpin: " #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr " Versietabel:" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s voor %s gecompileerd op %s %s\n" -#: cmdline/apt-cache.cc:1690 +#: cmdline/apt-cache.cc:1730 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -238,22 +238,30 @@ msgstr "" " -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp.\n" "Zie de man-pagina's van apt-cache(8) en apt.conf(5) voor meer informatie.\n" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "" "Gelieve een naam voor deze schijf op te geven, bijvoorbeeld 'Debian 5.0.3 " "Schijf 1'" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" msgstr "Gelieve een schijf in het station te plaatsen en op 'enter' te drukken" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Aankoppelen van '%s' op '%s' is mislukt" -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Dit proces dient herhaald te worden voor alle CD's in uw set." @@ -492,7 +500,7 @@ msgstr "" msgid "%s is already the newest version.\n" msgstr "%s is reeds de nieuwste versie.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s is ingesteld voor handmatige installatie.\n" @@ -602,8 +610,8 @@ 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:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kon de hoeveelheid vrije schijfruimte op %s niet bepalen" @@ -642,7 +650,7 @@ msgstr "Afbreken." msgid "Do you want to continue [Y/n]? " msgstr "Wilt u doorgaan [J/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ophalen van %s is mislukt %s\n" @@ -651,7 +659,7 @@ msgstr "Ophalen van %s is mislukt %s\n" msgid "Some files failed to download" msgstr "Ophalen van sommige bestanden is mislukt" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "Ophalen klaar en alleen-ophalen-modus staat aan" @@ -735,7 +743,7 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 msgid "The following information may help to resolve the situation:" msgstr "De volgende informatie helpt u mogelijk verder:" @@ -789,7 +797,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:1974 +#: cmdline/apt-get.cc:1973 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" @@ -800,80 +808,80 @@ 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:1995 +#: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "Niet-werkende pakketten:" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2020 msgid "The following extra packages will be installed:" msgstr "De volgende extra pakketten zullen geïnstalleerd worden:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "Voorgestelde pakketten:" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "Aanbevolen pakketten:" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "Kon pakket %s niet vinden" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s is ingesteld op automatische geïnstalleerd.\n" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2184 msgid "Calculating upgrade... " msgstr "Opwaardering wordt doorgerekend... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Mislukt" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2192 msgid "Done" msgstr "Klaar" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 msgid "Internal error, problem resolver broke stuff" msgstr "Interne fout, probleemoplosser heeft dingen stukgemaakt" -#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "Kon de ophaalmap niet vergrendelen" -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2452 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:2493 cmdline/apt-get.cc:2805 +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, c-format msgid "Unable to find a source package for %s" msgstr "Kan geen bronpakket vinden voor %s" -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -883,7 +891,7 @@ msgstr "" "'%s' op:\n" "%s\n" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2514 #, fuzzy, c-format msgid "" "Please use:\n" @@ -895,87 +903,87 @@ msgstr "" "om de nieuwste (mogelijk nog niet uit uitgebrachte) versie van het pakket op " "te halen.\n" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2567 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Reeds opgehaald bestand '%s' wordt overgeslagen\n" -#: cmdline/apt-get.cc:2605 +#: cmdline/apt-get.cc:2604 #, c-format msgid "You don't have enough free space in %s" msgstr "U heeft niet voldoende vrije schijfruimte op %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2613 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2618 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Moet %sB aan bronarchieven ophalen.\n" -#: cmdline/apt-get.cc:2625 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" msgstr "Ophalen bron %s\n" -#: cmdline/apt-get.cc:2663 +#: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "Ophalen van sommige archieven is mislukt." -#: cmdline/apt-get.cc:2694 +#: cmdline/apt-get.cc:2693 #, 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:2706 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uitpakopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:2707 +#: cmdline/apt-get.cc:2706 #, 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:2729 +#: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "Bouwopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:2749 +#: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "Dochterproces is mislukt" -#: cmdline/apt-get.cc:2768 +#: cmdline/apt-get.cc:2767 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:2793 +#: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, 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:2840 +#: cmdline/apt-get.cc:2839 #, c-format msgid "%s has no build depends.\n" msgstr "%s heeft geen bouwvereisten.\n" -#: cmdline/apt-get.cc:3010 +#: cmdline/apt-get.cc:3009 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -984,7 +992,7 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s " "onvindbaar is" -#: cmdline/apt-get.cc:3028 +#: cmdline/apt-get.cc:3027 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -993,14 +1001,14 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s " "onvindbaar is" -#: cmdline/apt-get.cc:3051 +#: cmdline/apt-get.cc:3050 #, 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:3090 +#: cmdline/apt-get.cc:3089 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1009,7 +1017,7 @@ 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:3096 +#: cmdline/apt-get.cc:3095 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1018,30 +1026,30 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s " "onvindbaar is" -#: cmdline/apt-get.cc:3119 +#: cmdline/apt-get.cc:3118 #, 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:3135 +#: cmdline/apt-get.cc:3133 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Bouwvereisten voor %s konden niet voldaan worden." -#: cmdline/apt-get.cc:3140 +#: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "Verwerken van de bouwvereisten is mislukt" -#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Er wordt verbinding gemaakt met %s (%s)" -#: cmdline/apt-get.cc:3368 +#: cmdline/apt-get.cc:3366 msgid "Supported modules:" msgstr "Ondersteunde modules:" -#: cmdline/apt-get.cc:3409 +#: cmdline/apt-get.cc:3407 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1130,7 +1138,7 @@ msgstr "" "voor meer informatie en opties.\n" " Deze APT heeft Super Koe kracht.\n" -#: cmdline/apt-get.cc:3574 +#: cmdline/apt-get.cc:3572 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1205,7 +1213,7 @@ msgid "%s was already not hold.\n" msgstr "%s is reeds de nieuwste versie.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" @@ -1345,8 +1353,8 @@ msgstr "Verbinding is verlopen" msgid "Server closed the connection" msgstr "Verbinding is verbroken door de server" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 +#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 msgid "Read error" msgstr "Leesfout" @@ -1359,8 +1367,8 @@ msgid "Protocol corruption" msgstr "Protocolcorruptie" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 +#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 msgid "Write error" msgstr "Schrijffout" @@ -1503,32 +1511,40 @@ msgstr "Er gebeurde iets raars bij het oplossen van '%s:%s' (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Kan geen verbinding maken met %s %s:" -#: methods/gpgv.cc:169 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Interne fout: ondertekening is goed maar kon de vingerafdruk van de sleutel\n" "niet bepalen?!" -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Er is tenminste één ongeldige ondertekening gevonden." -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Kon 'gpgv' niet uitvoeren om ondertekening te verifiëren (is gpgv " "geïnstalleerd?)" -#: methods/gpgv.cc:183 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Onbekende fout bij het uitvoeren van gpgv" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "De volgende ondertekeningen waren ongeldig:\n" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1614,8 +1630,8 @@ msgstr "Interne fout" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1644,7 +1660,12 @@ msgstr "Geen spiegelbestand '%s' gevonden " msgid "Can not read mirror file '%s'" msgstr "Geen spiegelbestand '%s' gevonden " -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "Geen spiegelbestand '%s' gevonden " + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "[Spiegelserver: %s]" @@ -1746,7 +1767,7 @@ msgstr "" " -c=? Lees dit configuratiebestand.\n" " -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Kan niet naar %s schrijven" @@ -2122,23 +2143,23 @@ msgstr "" " -c=? Lees dit configuratiebestand\n" " -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "Aanmaken pijp is mislukt" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "Uitvoeren van gzip is mislukt " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "Beschadigd archief" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "Tar controlesom klopt niet, het pakket is beschadigd" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Onbekende TAR-kopteksttype %u, onderdeel %s" @@ -2362,7 +2383,7 @@ msgstr "%limin %lis" msgid "%lis" msgstr "%lis" -#: apt-pkg/contrib/strutl.cc:1172 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "Selectie %s niet gevonden" @@ -2507,114 +2528,114 @@ msgstr "stat op de CD-ROM is mislukt" msgid "Problem closing the gzip file %s" msgstr "Probleem bij het afsluiten van het gzip-bestand %s" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Er wordt geen vergrendeling gebruikt voor het alleen-lezen-" "vergrendelingsbestand %s" -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "Kon het vergrendelingsbestand '%s' niet openen" -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:249 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Het via nfs aangekoppelde vergrendelingsbestand %s wordt niet vergrendeld" -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "Kon vergrendeling %s niet verkrijgen" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Subproces %s ontving een segmentatiefout." -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:843 #, c-format msgid "Sub-process %s received signal %u." msgstr "Subproces %s ontving signaal %u." -#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Subproces %s gaf de foutcode %u terug" -#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Subproces %s sloot onverwacht af" -#: apt-pkg/contrib/fileutl.cc:984 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Could not open file %s" msgstr "Kon het bestand %s niet openen" -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1062 #, c-format msgid "Could not open file descriptor %d" msgstr "Kon de bestandsindicator %d niet openen" -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "Aanmaken subproces-IPC is mislukt" -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " msgstr "Uitvoeren van de compressor is mislukt " -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1297 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "lees, de laatste te lezen %lu zijn niet beschikbaar" -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "schrijf, de laatste %lu konden niet weggeschreven worden" -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1681 #, c-format msgid "Problem closing the file %s" msgstr "Probleem bij het afsluiten van het bestand %s" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1693 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Probleem bij het hernoemen van '%s' naar '%s'" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1704 #, c-format msgid "Problem unlinking the file %s" msgstr "Probleem bij het ontlinken van het bestand %s" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1717 msgid "Problem syncing the file" msgstr "Probleem bij het synchroniseren van het bestand" @@ -2813,7 +2834,7 @@ msgstr "Misvormde regel %u in bronlijst %s (type)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Type '%s' op regel %u in bronlijst %s is onbekend" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2822,12 +2843,12 @@ msgstr "" "Kon onmiddellijke configuratie van '%s' niet uitvoeren. Voor details zie " "'man 5 apt.conf', onder APT::Immediate-Configure. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Kon het bestand '%s' niet openen" -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2864,7 +2885,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Kan problemen niet verhelpen, u houdt defecte pakketten vast." -#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 +#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2873,7 +2894,7 @@ msgstr "" "Ophalen van sommige indexbestanden is mislukt, deze zijn of genegeerd, of er " "zijn oudere versies van gebruikt." -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, c-format msgid "List directory %spartial is missing." msgstr "Lijstmap %spartial is afwezig." @@ -2981,14 +3002,14 @@ msgstr "Cache heeft een niet-compatibel versienummeringssysteem" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 -#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 -#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 -#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 -#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 -#: apt-pkg/pkgcachegen.cc:561 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Fout tijdens verwerken van %s (FindPkg)" @@ -3011,28 +3032,28 @@ msgstr "" msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Wauw, u heeft meer afhankelijkheden dan deze APT aan kan." -#: apt-pkg/pkgcachegen.cc:568 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Pakket %s %s werd niet gevonden bij het verwerken van de " "bestandsafhankelijkheden" -#: apt-pkg/pkgcachegen.cc:1197 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kon de status van de bronpakketlijst %s niet opvragen" -#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 -#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" msgstr "Pakketlijsten worden ingelezen" -#: apt-pkg/pkgcachegen.cc:1302 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "Voorziene bestanden worden verzameld" -#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakket-cache" @@ -3045,41 +3066,41 @@ msgstr "herbenoeming is mislukt, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "MD5-som komt niet overeen" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 msgid "Hash Sum mismatch" msgstr "Hash-som komt niet overeen" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Kon Release-bestand %s niet ontleden" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Er zijn geen publieke sleutels beschikbaar voor de volgende sleutel-IDs:\n" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Conflicterende distributie: %s (verwachtte %s, maar kreeg %s)" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3090,12 +3111,12 @@ msgstr "" "%s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-fout: %s: %s" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3104,7 +3125,7 @@ msgstr "" "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u " "dit pakket handmatig moet repareren (wegens missende architectuur)" -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, fuzzy, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3113,7 +3134,7 @@ msgstr "" "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u " "dit pakket handmatig moet repareren." -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3121,7 +3142,7 @@ msgstr "" "De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor " "pakket %s." -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "Grootte komt niet overeen" @@ -3173,7 +3194,7 @@ msgstr "Identificatie..." msgid "Stored label: %s\n" msgstr "Opgeslagen label: %s \n" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 msgid "Unmounting CD-ROM...\n" msgstr "CD wordt afgekoppeld...\n" @@ -3237,30 +3258,30 @@ msgstr "" msgid "Copying package lists..." msgstr "Pakketlijsten worden gekopieerd..." -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "Nieuwe bronlijst wordt weggeschreven\n" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "Bronlijst-ingangen voor de schijf zijn:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "%i records weggeschreven.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i records weggeschreven met %i missende bestanden.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i records weggeschreven met %i niet overeenkomende bestanden\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/nn.po b/po/nn.po index 73d1bbecc..9758fd8ef 100644 --- a/po/nn.po +++ b/po/nn.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_nn\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Havard Korsvoll \n" "Language-Team: Norwegian nynorsk \n" @@ -100,73 +100,73 @@ msgstr "Brukt plass i alt: " msgid "Package file %s is out of sync." msgstr "Pakkefila %s er ute av takt." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Fann ingen pakkar" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1243 #, fuzzy msgid "You must give at least one search pattern" msgstr "Du m oppgi nyaktig eitt mnster" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Finn ikkje pakken %s" -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1526 msgid "Package files:" msgstr "Pakkefiler:" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Mellomlageret er ute av takt, kan ikkje x-referera ei pakkefil" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1547 msgid "Pinned packages:" msgstr "Spikra pakkar:" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "(ikkje funne)" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr " Installert: " -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr " Kandidat: " -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "(ingen)" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr " Pakke spikra til: " #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr " Versjonstabell:" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format 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:1690 +#: cmdline/apt-cache.cc:1730 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -239,11 +239,19 @@ msgstr "" " -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n" "Du finn meir informasjon p manualsidene apt-cache(8) og apt.conf(5).\n" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 #, fuzzy msgid "Please insert a Disc in the drive and press enter" msgstr "" @@ -251,12 +259,12 @@ msgstr "" " %s\n" "i stasjonen %s og trykk Enter.\n" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Klarte ikkje endra namnet p %s til %s" -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" @@ -495,7 +503,7 @@ msgstr "%s kan ikkje installerast p msgid "%s is already the newest version.\n" msgstr "Den nyaste versjonen av %s er installert fr fr.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "men %s skal installerast" @@ -604,8 +612,8 @@ 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:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Du har ikkje nok ledig plass i %s" @@ -645,7 +653,7 @@ msgstr "Avbryt." msgid "Do you want to continue [Y/n]? " msgstr "Vil du halda fram [J/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikkje henta %s %s\n" @@ -654,7 +662,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:1375 cmdline/apt-get.cc:2668 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "Nedlastinga er ferdig i nedlastingsmodus" @@ -732,7 +740,7 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 msgid "The following information may help to resolve the situation:" msgstr "Flgjande informasjon kan hjelpa med lysa situasjonen:" @@ -782,7 +790,7 @@ msgstr "" "Nokre krav er ikkje oppfylte. Du kan prva apt-get -f install (eller velja " "ei lysing)." -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1973 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" @@ -794,86 +802,86 @@ 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:1995 +#: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "ydelagde pakkar" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2020 msgid "The following extra packages will be installed:" msgstr "Dei flgjande tilleggspakkane vil verta installerte:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "Fresltte pakkar:" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "Tilrdde pakkar" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "Fann ikkje pakken %s" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "men %s skal installerast" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2184 msgid "Calculating upgrade... " msgstr "Reknar ut oppgradering ... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Mislukkast" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2192 msgid "Done" msgstr "Ferdig" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Intern feil. AllUpgrade ydelagde noko" -#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "Klarte ikkje lsa nedlastingskatalogen" -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2452 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:2493 cmdline/apt-get.cc:2805 +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, c-format msgid "Unable to find a source package for %s" msgstr "Finn ingen kjeldepakke for %s" -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2514 #, c-format msgid "" "Please use:\n" @@ -881,105 +889,105 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2567 #, 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:2605 +#: cmdline/apt-get.cc:2604 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikkje nok ledig plass i %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2613 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "M henta %sB/%sB med kjeldekodearkiv.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2618 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "M henta %sB med kjeldekodearkiv.\n" -#: cmdline/apt-get.cc:2625 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" msgstr "Hent kjeldekode %s\n" -#: cmdline/apt-get.cc:2663 +#: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "Klarte ikkje henta nokre av arkiva." -#: cmdline/apt-get.cc:2694 +#: cmdline/apt-get.cc:2693 #, 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:2706 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen %s mislukkast.\n" -#: cmdline/apt-get.cc:2707 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2729 +#: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggjekommandoen %s mislukkast.\n" -#: cmdline/apt-get.cc:2749 +#: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "Barneprosessen mislukkast" -#: cmdline/apt-get.cc:2768 +#: cmdline/apt-get.cc:2767 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:2793 +#: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Klarte ikkje henta byggjekrav for %s" -#: cmdline/apt-get.cc:2840 +#: cmdline/apt-get.cc:2839 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen byggjekrav.\n" -#: cmdline/apt-get.cc:3010 +#: cmdline/apt-get.cc:3009 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst" -#: cmdline/apt-get.cc:3028 +#: cmdline/apt-get.cc:3027 #, 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:3051 +#: cmdline/apt-get.cc:3050 #, 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:3090 +#: cmdline/apt-get.cc:3089 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -988,37 +996,37 @@ 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:3096 +#: cmdline/apt-get.cc:3095 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst" -#: cmdline/apt-get.cc:3119 +#: cmdline/apt-get.cc:3118 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikkje oppfylla kravet %s for %s: %s" -#: cmdline/apt-get.cc:3135 +#: cmdline/apt-get.cc:3133 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggjekrav for %s kunne ikkje tilfredstillast." -#: cmdline/apt-get.cc:3140 +#: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "Klarte ikkje behandla byggjekrava" -#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Koplar til %s (%s)" -#: cmdline/apt-get.cc:3368 +#: cmdline/apt-get.cc:3366 msgid "Supported modules:" msgstr "Sttta modular:" -#: cmdline/apt-get.cc:3409 +#: cmdline/apt-get.cc:3407 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1104,7 +1112,7 @@ msgstr "" "til apt-get(8), sources.list(5) og apt.conf(5).\n" " APT har superku-krefter.\n" -#: cmdline/apt-get.cc:3574 +#: cmdline/apt-get.cc:3572 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1175,7 +1183,7 @@ msgid "%s was already not hold.\n" msgstr "Den nyaste versjonen av %s er installert fr fr.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" @@ -1316,8 +1324,8 @@ msgstr "Tidsavbrot p msgid "Server closed the connection" msgstr "Tenaren lukka sambandet" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 +#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 msgid "Read error" msgstr "Lesefeil" @@ -1330,8 +1338,8 @@ msgid "Protocol corruption" msgstr "Protokollydeleggjing" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 +#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 msgid "Write error" msgstr "Skrivefeil" @@ -1474,29 +1482,37 @@ msgstr "Det hende noko dumt ved oppslag av msgid "Unable to connect to %s:%s:" msgstr "Klarte ikkje kopla til %s %s:" -#: methods/gpgv.cc:169 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:183 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Dei flgjande tilleggspakkane vil verta installerte:" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1577,8 +1593,8 @@ msgstr "Intern feil" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1607,7 +1623,12 @@ msgstr "" msgid "Can not read mirror file '%s'" msgstr "Klarte ikkje opna fila %s" -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "Klarte ikkje opna fila %s" + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "" @@ -1699,7 +1720,7 @@ msgstr "" " -c=? Les denne innstillingsfila.\n" " -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Klarte ikkje skriva til %s" @@ -2068,23 +2089,23 @@ msgstr "" " -c=? Les denne oppsettsfila.\n" " -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "Klarte ikkje oppretta ryr" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "Klarte ikkje kyra gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "ydelagt arkiv" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "Tar-sjekksummen mislukkast, arkivet er ydelagt" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Ukjend TAR-hovud type %u, medlem %s" @@ -2305,7 +2326,7 @@ msgstr "" msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1172 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "Fann ikkje utvalet %s" @@ -2445,111 +2466,111 @@ msgstr "Klarte ikkje f msgid "Problem closing the gzip file %s" msgstr "Problem ved lsing av fila" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Brukar ikkje lsing for den skrivebeskytta lsefila %s" -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "Klarte ikkje opna lsefila %s" -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:249 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Brukar ikkje lsing for den nfs-monterte lsefila %s" -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "Klarte ikkje lsa %s" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Underprosessen %s mottok ein segmenteringsfeil." -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:843 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Underprosessen %s mottok ein segmenteringsfeil." -#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Underprosessen %s returnerte ein feilkode (%u)" -#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Underprosessen %s avslutta uventa" -#: apt-pkg/contrib/fileutl.cc:984 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Could not open file %s" msgstr "Klarte ikkje opna fila %s" -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1062 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "Klarte ikkje opna ryr for %s" -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "Klarte ikkje oppretta underprosessen IPC" -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " msgstr "Klarte ikkje kyra komprimeringa " -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1297 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "lese, har framleis %lu att lesa, men ingen att" -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "skrive, har framleis %lu att skrive, men klarte ikkje" -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1681 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Problem ved lsing av fila" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1693 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Problem ved synkronisering av fila" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1704 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Problem ved oppheving av lenkje til fila" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1717 msgid "Problem syncing the file" msgstr "Problem ved synkronisering av fila" @@ -2748,19 +2769,19 @@ msgstr "Misforma linje %u i kjeldelista %s (type)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen %s er ukjend i linja %u i kjeldelista %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Klarte ikkje opna fila %s" -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2796,7 +2817,7 @@ msgid "Unable to correct problems, you have held broken packages." msgstr "" "Klarte ikkje retta opp problema. Nokre ydelagde pakkar er haldne tilbake." -#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 +#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2805,7 +2826,7 @@ msgstr "" "Klarte ikkje lasta ned nokre av indeksfilene. Dei er ignorerte, eller gamle " "filer er brukte i staden." -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "Listekatalogen %spartial manglar." @@ -2909,14 +2930,14 @@ msgstr "Mellomlageret brukar eit inkompatibelt versjonssystem" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 -#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 -#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 -#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 -#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 -#: apt-pkg/pkgcachegen.cc:561 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Feil ved behandling av %s (FindPkg)" @@ -2938,26 +2959,26 @@ msgstr "J msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Jss, du har overgtt talet p krav som APT kan handtera." -#: apt-pkg/pkgcachegen.cc:568 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Fann ikkje pakken %s %s ved behandling av filkrav" -#: apt-pkg/pkgcachegen.cc:1197 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "Klarte ikkje f status p kjeldepakkelista %s" -#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 -#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" msgstr "Les pakkelister" -#: apt-pkg/pkgcachegen.cc:1302 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "Samlar inn filtilbod" -#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "IU-feil ved lagring av kjeldelager" @@ -2970,41 +2991,41 @@ msgstr "endring av namn mislukkast, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "Feil MD5-sum" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 #, fuzzy msgid "Hash Sum mismatch" msgstr "Feil MD5-sum" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Klarte ikkje tolka pakkefila %s (1)" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3012,12 +3033,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3026,7 +3047,7 @@ msgstr "" "Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv " "(fordi arkitekturen manglar)." -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3034,14 +3055,14 @@ msgid "" msgstr "" "Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv." -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Pakkeindeksfilene er ydelagde. Feltet Filename: manglar for pakken %s." -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "Feil storleik" @@ -3093,7 +3114,7 @@ msgstr "Identifiserer ... " msgid "Stored label: %s\n" msgstr "Lagra etikett: %s \n" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "Avmonterer CD-ROM ..." @@ -3154,30 +3175,30 @@ msgstr "" msgid "Copying package lists..." msgstr "Kopierer pakkelister ..." -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "Skriv ny kjeldeliste\n" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "Kjeldelisteoppfringar for denne disken er:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "Skreiv %i postar.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Skreiv %i postar med %i manglande filer.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Skreiv %i postar med %i filer som ikkje passa\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Skreiv %i postar med %i manglande filer og %i filer som ikkje passa\n" diff --git a/po/pl.po b/po/pl.po index 67cc53990..e759017df 100644 --- a/po/pl.po +++ b/po/pl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.3\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2012-07-28 21:53+0200\n" "Last-Translator: Michał Kułach \n" "Language-Team: Polish \n" @@ -101,74 +101,74 @@ msgstr "Całkowity rozmiar: " msgid "Package file %s is out of sync." msgstr "Plik pakietu %s jest przestarzały." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Nie znaleziono żadnych pakietów" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1243 msgid "You must give at least one search pattern" msgstr "Należy podać przynajmniej jeden wzorzec" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "To polecenie jest przestarzałe. Prosimy używać \"apt-mark showauto\"." -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Nie udało się odnaleźć pakietu %s" -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1526 msgid "Package files:" msgstr "Plików pakietów:" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Magazyn podręczny jest przestarzały, nie można odwołać się (x-ref) do pliku " "pakietu." #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1547 msgid "Pinned packages:" msgstr "Przypięte pakiety:" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "(nie znaleziono)" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr " Zainstalowana: " -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr " Kandydująca: " -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "(brak)" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr " Sposób przypięcia: " #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr " Tabela wersji:" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s dla %s skompilowany %s %s\n" -#: cmdline/apt-cache.cc:1690 +#: cmdline/apt-cache.cc:1730 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -239,20 +239,28 @@ msgstr "" "Więcej informacji można znaleźć na stronach podręcznika apt-cache(8)\n" "oraz apt.conf(5).\n" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Proszę wprowadzić nazwę dla tej płyty, np. \"Debian 5.0.3 Disk 1\"" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" msgstr "Proszę włożyć dysk do napędu i nacisnąć enter" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Nie udało się zamontować \"%s\" w \"%s\"" -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Należy powtórzyć ten proces dla reszty płyt." @@ -490,7 +498,7 @@ msgstr "" msgid "%s is already the newest version.\n" msgstr "%s jest już w najnowszej wersji.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s zaznaczony jako zainstalowany ręcznie.\n" @@ -599,8 +607,8 @@ 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:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nie udało się ustalić ilości wolnego miejsca w %s" @@ -640,7 +648,7 @@ msgstr "Przerwane." msgid "Do you want to continue [Y/n]? " msgstr "Kontynuować [T/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Nie udało się pobrać %s %s\n" @@ -649,7 +657,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:1375 cmdline/apt-get.cc:2668 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "Ukończono pobieranie w trybie samego pobierania" @@ -736,7 +744,7 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 msgid "The following information may help to resolve the situation:" msgstr "Następujące informacje mogą pomóc rozwiązać sytuację:" @@ -799,7 +807,7 @@ msgstr "" "Niespełnione zależności. Proszę spróbować wykonać \"apt-get -f install\" bez " "pakietów (lub podać rozwiązanie)." -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1973 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" @@ -811,33 +819,33 @@ msgstr "" "w której niektóre pakiety nie zostały jeszcze utworzone lub przeniesione\n" "z katalogu Incoming (\"Przychodzące\")." -#: cmdline/apt-get.cc:1995 +#: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "Pakiety są uszkodzone" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2020 msgid "The following extra packages will be installed:" msgstr "Zostaną zainstalowane następujące dodatkowe pakiety:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "Sugerowane pakiety:" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "Polecane pakiety:" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "Nie udało się odnaleźć pakietu %s" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s zaznaczony jako zainstalowany automatycznie.\n" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -845,48 +853,48 @@ msgstr "" "To polecenie jest przestarzałe. Prosimy używać \"apt-mark auto\" i \"apt-" "mark manual\"." -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2184 msgid "Calculating upgrade... " msgstr "Obliczanie aktualizacji..." -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Nie udało się" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2192 msgid "Done" msgstr "Gotowe" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 msgid "Internal error, problem resolver broke stuff" msgstr "Błąd wewnętrzny, spowodowany przez moduł rozwiązywania problemów" -#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "Nie udało się zablokować katalogu pobierania" -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Nie można znaleźć źródła do pobrania wersji \"%s\" pakietu \"%s\"" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "Pobieranie %s %s" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2452 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:2493 cmdline/apt-get.cc:2805 +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, 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:2510 +#: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -896,7 +904,7 @@ msgstr "" "pod adresem:\n" "%s\n" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2514 #, c-format msgid "" "Please use:\n" @@ -908,70 +916,70 @@ msgstr "" "by pobrać najnowsze (prawdopodobnie jeszcze niewydane) poprawki tego " "pakietu.\n" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2567 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Pomijanie już pobranego pliku \"%s\"\n" -#: cmdline/apt-get.cc:2605 +#: cmdline/apt-get.cc:2604 #, c-format msgid "You don't have enough free space in %s" msgstr "W %s nie ma wystarczającej ilości wolnego miejsca" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2613 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Konieczne pobranie %sB/%sB archiwów źródeł.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2618 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Konieczne pobranie %sB archiwów źródeł.\n" -#: cmdline/apt-get.cc:2625 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" msgstr "Pobieranie źródeł %s\n" -#: cmdline/apt-get.cc:2663 +#: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "Nie udało się pobrać niektórych archiwów." -#: cmdline/apt-get.cc:2694 +#: cmdline/apt-get.cc:2693 #, 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:2706 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Polecenie rozpakowania \"%s\" zawiodło.\n" -#: cmdline/apt-get.cc:2707 +#: cmdline/apt-get.cc:2706 #, 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:2729 +#: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "Polecenie budowania \"%s\" zawiodło.\n" -#: cmdline/apt-get.cc:2749 +#: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "Proces potomny zawiódł" -#: cmdline/apt-get.cc:2768 +#: cmdline/apt-get.cc:2767 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 dla budowania" -#: cmdline/apt-get.cc:2793 +#: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -980,17 +988,17 @@ msgstr "" "Nie znaleziono informacji o architekturze dla %s. Proszę zapoznać się z apt." "conf(5) APT::Architectures" -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nie udało się pobrać informacji o zależnościach dla budowania %s" -#: cmdline/apt-get.cc:2840 +#: cmdline/apt-get.cc:2839 #, c-format msgid "%s has no build depends.\n" msgstr "%s nie ma zależności dla budowania.\n" -#: cmdline/apt-get.cc:3010 +#: cmdline/apt-get.cc:3009 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -999,7 +1007,7 @@ msgstr "" "Zależność %s od %s nie może zostać spełniona, ponieważ %s nie jest dozwolone " "w pakietach \"%s\"" -#: cmdline/apt-get.cc:3028 +#: cmdline/apt-get.cc:3027 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1008,14 +1016,14 @@ msgstr "" "Zależność %s od %s nie może zostać spełniona, ponieważ nie znaleziono " "pakietu %s" -#: cmdline/apt-get.cc:3051 +#: cmdline/apt-get.cc:3050 #, 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:3090 +#: cmdline/apt-get.cc:3089 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1024,7 +1032,7 @@ msgstr "" "Zależność %s od %s nie może zostać spełniona, ponieważ kandydująca wersja " "pakietu %s nie spełnia wymagań wersji" -#: cmdline/apt-get.cc:3096 +#: cmdline/apt-get.cc:3095 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1033,30 +1041,30 @@ msgstr "" "Zależność %s od %s nie może zostać spełniona, ponieważ pakiet %s nie ma " "wersji kandydującej" -#: cmdline/apt-get.cc:3119 +#: cmdline/apt-get.cc:3118 #, 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:3135 +#: cmdline/apt-get.cc:3133 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Nie udało się spełnić zależności dla budowania %s." -#: cmdline/apt-get.cc:3140 +#: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "Nie udało się przetworzyć zależności dla budowania" -#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, c-format msgid "Changelog for %s (%s)" msgstr "Dziennik zmian %s (%s)" -#: cmdline/apt-get.cc:3368 +#: cmdline/apt-get.cc:3366 msgid "Supported modules:" msgstr "Obsługiwane moduły:" -#: cmdline/apt-get.cc:3409 +#: cmdline/apt-get.cc:3407 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1144,7 +1152,7 @@ msgstr "" "apt-get(8), sources.list(5) i apt.conf(5).\n" " Ten APT ma moce Super Krowy.\n" -#: cmdline/apt-get.cc:3574 +#: cmdline/apt-get.cc:3572 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1222,7 +1230,7 @@ msgid "%s was already not hold.\n" msgstr "%s został już odznaczony jako zatrzymany.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" @@ -1386,8 +1394,8 @@ msgstr "Przekroczenie czasu połączenia" msgid "Server closed the connection" msgstr "Serwer zamknął połączenie" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 +#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 msgid "Read error" msgstr "Błąd odczytu" @@ -1400,8 +1408,8 @@ msgid "Protocol corruption" msgstr "Naruszenie zasad protokołu" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 +#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 msgid "Write error" msgstr "Błąd zapisu" @@ -1544,31 +1552,39 @@ msgstr "Coś niewłaściwego stało się przy tłumaczeniu \"%s:%s\" (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Nie udało się połączyć z %s:%s:" -#: methods/gpgv.cc:169 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Błąd wewnętrzny: Prawidłowy podpis, ale nie udało się ustalić odcisku klucza!" -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Napotkano przynajmniej jeden nieprawidłowy podpis." -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Nie udało się uruchomić gpgv by zweryfikować podpis (czy gpgv jest " "zainstalowane?)" -#: methods/gpgv.cc:183 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Nieznany błąd podczas uruchamiania gpgv" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Następujące podpisy były błędne:\n" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1651,8 +1667,8 @@ msgstr "Błąd wewnętrzny" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1681,7 +1697,12 @@ msgstr "Nie znaleziono pliku serwera lustrzanego \"%s\"" msgid "Can not read mirror file '%s'" msgstr "Nie udało się otworzyć pliku serwera lustrzanego \"%s\"" -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "Nie udało się otworzyć pliku serwera lustrzanego \"%s\"" + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "[Serwer lustrzany: %s]" @@ -1780,7 +1801,7 @@ msgstr "" " -c=? Czyta wskazany plik konfiguracyjny.\n" " -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Nie udało się pisać do %s" @@ -2154,23 +2175,23 @@ msgstr "" " -c=? Czyta wskazany plik konfiguracyjny.\n" " -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "Nie udało się utworzyć potoków" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "Nie udało się uruchomić programu gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "Uszkodzone archiwum" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "Niepoprawna suma kontrolna tar, archiwum jest uszkodzone" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Nieznany typ nagłówka TAR %u, składnik %s" @@ -2395,7 +2416,7 @@ msgstr "%limin %lis" msgid "%lis" msgstr "%lis" -#: apt-pkg/contrib/strutl.cc:1172 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "Nie odnaleziono wyboru %s" @@ -2537,45 +2558,45 @@ msgstr "Nie udało się wykonać operacji stat na CDROM-ie" msgid "Problem closing the gzip file %s" msgstr "Problem przy zamykaniu pliku gzip %s" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Dla pliku blokady %s tylko do odczytu nie zostanie użyta blokada" -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "Nie udało się otworzyć pliku blokady %s" -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:249 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Dla pliku blokady %s montowanego przez NFS nie zostanie użyta blokada" -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "Nie udało się uzyskać blokady %s" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" "Lista plików nie może zostać stworzona, ponieważ \"%s\" nie jest katalogiem" -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "Ignorowanie \"%s\" w katalogu \"%s\", ponieważ nie jest to zwykły plik" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" "Ignorowanie pliku \"%s\" w katalogu \"%s\", ponieważ nie ma on rozszerzenia " "pliku" -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" @@ -2583,70 +2604,70 @@ msgstr "" "Ignorowanie pliku \"%s\" w katalogu \"%s\", ponieważ ma on nieprawidłowe " "rozszerzenie pliku" -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Podproces %s spowodował naruszenie ochrony pamięci." -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:843 #, c-format msgid "Sub-process %s received signal %u." msgstr "Podproces %s otrzymał sygnał %u." -#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Podproces %s zwrócił kod błędu (%u)" -#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Podproces %s zakończył się niespodziewanie" -#: apt-pkg/contrib/fileutl.cc:984 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Could not open file %s" msgstr "Nie udało się otworzyć pliku %s" -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1062 #, c-format msgid "Could not open file descriptor %d" msgstr "Nie udało się otworzyć deskryptora pliku %d" -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "Nie udało się utworzyć IPC z podprocesem" -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " msgstr "Nie udało się uruchomić kompresora " -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1297 #, c-format msgid "read, still have %llu to read but none left" msgstr "należało przeczytać jeszcze %llu, ale nic nie zostało" -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "należało zapisać jeszcze %llu, ale nie udało się to" -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1681 #, c-format msgid "Problem closing the file %s" msgstr "Problem przy zamykaniu pliku %s" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1693 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problem przy zapisywaniu pliku %s w %s" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1704 #, c-format msgid "Problem unlinking the file %s" msgstr "Problem przy odlinkowywaniu pliku %s" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1717 msgid "Problem syncing the file" msgstr "Problem przy zapisywaniu pliku na dysk" @@ -2845,7 +2866,7 @@ msgstr "Nieprawidłowa linia %u w liście źródeł %s (typ)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ \"%s\" jest nieznany w linii %u listy źródeł %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2855,12 +2876,12 @@ msgstr "" "5 apt.conf\" i zapoznać się z wpisem APT::Immediate-Configure aby dowiedzieć " "się więcej. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, c-format msgid "Could not configure '%s'. " msgstr "Nie udało się skonfigurować \"%s\". " -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2897,7 +2918,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Nie udało się naprawić problemów, zatrzymano uszkodzone pakiety." -#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 +#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2905,7 +2926,7 @@ msgstr "" "Nie udało się pobrać niektórych plików indeksu, zostały one zignorowane lub " "użyto ich starszej wersji." -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, c-format msgid "List directory %spartial is missing." msgstr "Brakuje katalogu list %spartial." @@ -3007,14 +3028,14 @@ msgstr "Magazyn podręczny ma niezgodny system wersji" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 -#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 -#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 -#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 -#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 -#: apt-pkg/pkgcachegen.cc:561 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Wystąpił błąd podczas przetwarzania %s (%s%d)" @@ -3035,27 +3056,27 @@ msgstr "Przekroczono liczbę opisów, którą ten APT jest w stanie obsłużyć. msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Przekroczono liczbę zależności, którą ten APT jest w stanie obsłużyć." -#: apt-pkg/pkgcachegen.cc:568 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Pakiet %s %s nie został odnaleziony podczas przetwarzania zależności plików" -#: apt-pkg/pkgcachegen.cc:1197 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nie udało się wykonać operacji stat na liście pakietów źródłowych %s" -#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 -#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" msgstr "Czytanie list pakietów" -#: apt-pkg/pkgcachegen.cc:1302 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "Zbieranie zapewnień plików" -#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "Błąd wejścia/wyjścia przy zapisywaniu podręcznego magazynu źródeł" @@ -3068,12 +3089,12 @@ msgstr "nie udało się zmienić nazwy, %s (%s -> %s)" msgid "MD5Sum mismatch" msgstr "Błędna suma MD5" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 msgid "Hash Sum mismatch" msgstr "Błędna suma kontrolna" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3082,16 +3103,16 @@ msgstr "" "Nie udało się znaleźć oczekiwanego wpisu \"%s\" w pliku Release " "(nieprawidłowy wpis sources.list lub nieprawidłowy plik)" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nie udało się znaleźć sumy kontrolnej \"%s\" w pliku Release" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "Dla następujących identyfikatorów kluczy brakuje klucza publicznego:\n" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3100,12 +3121,12 @@ msgstr "" "Plik Release dla %s wygasnął (nieprawidłowy od %s). Aktualizacje z tego " "repozytorium nie będą wykonywane." -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Nieprawidłowa dystrybucja: %s (oczekiwano %s, a otrzymano %s)" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3115,12 +3136,12 @@ msgstr "" "w dalszym ciągu będą używane poprzednie pliki indeksu. Błąd GPG %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "Błąd GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3129,7 +3150,7 @@ msgstr "" "Nie udało się odnaleźć pliku dla pakietu %s. Może to oznaczać, że trzeba " "będzie ręcznie naprawić ten pakiet (z powodu brakującej architektury)." -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3138,14 +3159,14 @@ msgstr "" "Nie udało się odnaleźć pliku dla pakietu %s. Może to oznaczać, że trzeba " "będzie ręcznie naprawić ten pakiet." -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Pliki indeksu pakietów są uszkodzone. Brak pola Filename: dla pakietu %s." -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "Błędny rozmiar" @@ -3197,7 +3218,7 @@ msgstr "Identyfikacja.. " msgid "Stored label: %s\n" msgstr "Etykieta: %s \n" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 msgid "Unmounting CD-ROM...\n" msgstr "Odmontowanie CD-ROM-u...\n" @@ -3261,30 +3282,30 @@ msgstr "" msgid "Copying package lists..." msgstr "Kopiowanie list pakietów..." -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "Zapisywanie nowej listy źródeł\n" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "Źródła dla tej płyty to:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "Zapisano %i rekordów.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Zapisano %i rekordów z %i brakującymi plikami.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Zapisano %i rekordów z %i niepasującymi plikami\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Zapisano %i rekordów z %i brakującymi plikami i %i niepasującymi\n" diff --git a/po/pt.po b/po/pt.po index 6cb0868c6..620ee9c6f 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2012-06-29 15:45+0100\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" @@ -96,75 +96,75 @@ msgstr "Espaço total contabilizado: " msgid "Package file %s is out of sync." msgstr "O ficheiro do pacote %s está dessincronizado." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Não foi encontrado nenhum pacote" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1243 msgid "You must give at least one search pattern" msgstr "Tem de fornecer pelo menos um padrão de busca" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" "Este comando foi depreceado. Em vez disso por favor utilize 'apt-mark " "showauto'." -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Não foi possível encontrar o pacote %s" -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1526 msgid "Package files:" msgstr "Ficheiros de Pacotes :" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "A cache está dessincronizada, não pode x-referenciar um ficheiro de pacote" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1547 msgid "Pinned packages:" msgstr "Pacotes Marcados:" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "(não encontrado)" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr " Instalado: " -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr " Candidato: " -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "(nenhum)" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr " Marcação do Pacote: " #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr " Tabela de Versão:" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s para %s compilado em %s %s\n" -#: cmdline/apt-cache.cc:1690 +#: cmdline/apt-cache.cc:1730 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -235,21 +235,29 @@ msgstr "" "tmp\n" "Para mais informações veja as páginas do manual apt-cache(8) e apt.conf(5).\n" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "" "Por favor indique um nome para este Disco, tal como 'Debian 5.0.3 Disco 1'" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" msgstr "Por favor insira um Disco no leitor e pressione enter" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Falhou ao montar '%s' para '%s'" -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Repita este processo para o resto dos CDs no seu conjunto." @@ -487,7 +495,7 @@ msgstr "" msgid "%s is already the newest version.\n" msgstr "%s já está na versão mais recente.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s está definido para ser instalado manualmente.\n" @@ -596,8 +604,8 @@ 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:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 #, c-format msgid "Couldn't determine free space in %s" msgstr "Não foi possível determinar o espaço livre em %s" @@ -636,7 +644,7 @@ msgstr "Abortado." msgid "Do you want to continue [Y/n]? " msgstr "Deseja continuar [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falhou obter %s %s\n" @@ -645,7 +653,7 @@ msgstr "Falhou obter %s %s\n" msgid "Some files failed to download" msgstr "Falhou o download de alguns ficheiros" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "Download completo e em modo de fazer apenas o download" @@ -729,7 +737,7 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 msgid "The following information may help to resolve the situation:" msgstr "A seguinte informação pode ajudar a resolver a situação:" @@ -780,7 +788,7 @@ msgstr "" "Dependências não satisfeitas. Tente 'apt-get -f install' sem nenhum pacote " "(ou especifique uma solução)." -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1973 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" @@ -792,33 +800,33 @@ msgstr "" "distribuição unstable em que alguns pacotes pedidos ainda não foram \n" "criados ou foram movidos do Incoming." -#: cmdline/apt-get.cc:1995 +#: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "Pacotes estragados" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2020 msgid "The following extra packages will be installed:" msgstr "Os seguintes pacotes extra serão instalados:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "Pacotes sugeridos:" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "Pacotes recomendados:" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "Impossível encontrar o pacote %s" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s está definido para ser instalado automaticamente.\n" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -826,46 +834,46 @@ msgstr "" "Este comando foi depreceado. Em vez disso, por favor utilize 'apt-mark auto' " "e 'apt-mark manual'." -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2184 msgid "Calculating upgrade... " msgstr "A calcular a actualização... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Falhou" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2192 msgid "Done" msgstr "Pronto" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 msgid "Internal error, problem resolver broke stuff" msgstr "Erro Interno, o solucionador de problemas estragou coisas" -#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "Impossível criar acesso exclusivo ao directório de downloads" -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Não conseguiu encontrar uma fonte para obter a versão '%s' de '%s'" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "A obter %s %s" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2452 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:2493 cmdline/apt-get.cc:2805 +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, 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:2510 +#: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -875,7 +883,7 @@ msgstr "" "'%s' em:\n" "%s\n" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2514 #, c-format msgid "" "Please use:\n" @@ -886,71 +894,71 @@ msgstr "" "bzr branch %s\n" "para obter as últimas actualizações (possivelmente por lançar) ao pacote.\n" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2567 #, 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:2605 +#: cmdline/apt-get.cc:2604 #, c-format msgid "You don't have enough free space in %s" msgstr "Você não possui espaço livre suficiente em %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2613 #, 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" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2618 #, 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:2625 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" msgstr "Obter código fonte %s\n" -#: cmdline/apt-get.cc:2663 +#: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "Falhou obter alguns arquivos." -#: cmdline/apt-get.cc:2694 +#: cmdline/apt-get.cc:2693 #, 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:2706 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "O comando de descompactação '%s' falhou.\n" -#: cmdline/apt-get.cc:2707 +#: cmdline/apt-get.cc:2706 #, 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:2729 +#: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "O comando de compilação '%s' falhou.\n" -#: cmdline/apt-get.cc:2749 +#: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "O processo filho falhou" -#: cmdline/apt-get.cc:2768 +#: cmdline/apt-get.cc:2767 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:2793 +#: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -959,18 +967,18 @@ msgstr "" "Nenhuma informação de arquitectura disponível para %s. Para configuração " "veja apt.conf(5) APT::Architectures" -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, 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:2840 +#: cmdline/apt-get.cc:2839 #, c-format msgid "%s has no build depends.\n" msgstr "%s não tem dependências de compilação.\n" -#: cmdline/apt-get.cc:3010 +#: cmdline/apt-get.cc:3009 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -979,7 +987,7 @@ msgstr "" "a dependência de %s por %s não pode ser satisfeita porque %s não é permitido " "em pacotes '%s'" -#: cmdline/apt-get.cc:3028 +#: cmdline/apt-get.cc:3027 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -988,14 +996,14 @@ 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:3051 +#: cmdline/apt-get.cc:3050 #, 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:3090 +#: cmdline/apt-get.cc:3089 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1004,7 +1012,7 @@ msgstr "" "a dependência de %s para %s não pode ser satisfeita porque a versão " "candidata do pacote %s não pode satisfazer os requisitos de versão" -#: cmdline/apt-get.cc:3096 +#: cmdline/apt-get.cc:3095 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1013,30 +1021,30 @@ msgstr "" "a dependência de %s para %s não pode ser satisfeita porque o pacote %s não " "tem versão candidata" -#: cmdline/apt-get.cc:3119 +#: cmdline/apt-get.cc:3118 #, 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:3135 +#: cmdline/apt-get.cc:3133 #, 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:3140 +#: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "Falhou processar as dependências de compilação" -#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, c-format msgid "Changelog for %s (%s)" msgstr "Changlog para %s (%s)" -#: cmdline/apt-get.cc:3368 +#: cmdline/apt-get.cc:3366 msgid "Supported modules:" msgstr "Módulos Suportados:" -#: cmdline/apt-get.cc:3409 +#: cmdline/apt-get.cc:3407 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1126,7 +1134,7 @@ msgstr "" "apt-get(8), sources.list(5) e apt.conf(5)\n" " Este APT tem Poderes de Super Vaca.\n" -#: cmdline/apt-get.cc:3574 +#: cmdline/apt-get.cc:3572 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1201,7 +1209,7 @@ msgid "%s was already not hold.\n" msgstr "%s já estava para não manter.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" @@ -1360,8 +1368,8 @@ msgstr "Foi atingido o tempo limite de ligação" msgid "Server closed the connection" msgstr "O servidor fechou a ligação" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 +#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 msgid "Read error" msgstr "Erro de leitura" @@ -1374,8 +1382,8 @@ msgid "Protocol corruption" msgstr "Corrupção de protocolo" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 +#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 msgid "Write error" msgstr "Erro de escrita" @@ -1518,32 +1526,40 @@ msgstr "Algo estranho aconteceu ao resolver '%s:%s' (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Não foi possível ligar a %s:%s:" -#: methods/gpgv.cc:169 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Erro interno: Assinatura válida, mas não foi possível determinar a impressão " "digital da chave?!" -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Pelo menos uma assinatura inválida foi encontrada." -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Não foi possível executar 'gpgv' para verificar a assinatura (o gpgv está " "instalado?)" -#: methods/gpgv.cc:183 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Erro desconhecido ao executar gpgv" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "As seguintes assinaturas eram inválidas:\n" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1626,8 +1642,8 @@ msgstr "Erro interno" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1656,7 +1672,12 @@ msgstr "Não foi encontrado ficheiro de mirror '%s'" msgid "Can not read mirror file '%s'" msgstr "Não pode ler ficheiro de mirror '%s'" -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "Não pode ler ficheiro de mirror '%s'" + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "[Mirror: %s]" @@ -1757,7 +1778,7 @@ msgstr "" " -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Não conseguiu escrever para %s" @@ -2129,23 +2150,23 @@ msgstr "" " -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/" "tmp\n" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "Falhou a criação de pipes" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "Falhou executar gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "Arquivo corrompido" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "A soma de controlo do tar falhou, arquivo corrompido" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Tipo de cabeçalho TAR %u desconhecido, membro %s" @@ -2368,7 +2389,7 @@ msgstr "%limin %lis" msgid "%lis" msgstr "%lis" -#: apt-pkg/contrib/strutl.cc:1172 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "A selecção %s não foi encontrada" @@ -2511,48 +2532,48 @@ msgstr "Impossível executar stat ao cdrom" msgid "Problem closing the gzip file %s" msgstr "Problema ao fechar o ficheiro gzip %s" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Não está a ser utilizado acesso exclusivo para apenas leitura ao ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "Não foi possível abrir ficheiro de lock %s" -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:249 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Não está a ser utilizado o acesso exclusivo para o ficheiro %s, montado via " "nfs" -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "Não foi possível obter acesso exclusivo a %s" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" "Lista de ficheiros que não podem ser criados porque '%s' não é um directório" -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "A ignorar '%s' no directório '%s' porque não é um ficheiro normal" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" "A ignorar o ficheiro '%s' no directório '%s' porque não tem extensão no nome " "do ficheiro" -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" @@ -2560,70 +2581,70 @@ msgstr "" "A ignorar o ficheiro '%s' no directório '%s' porque tem uma extensão " "inválida no nome do ficheiro" -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "O sub-processo %s recebeu uma falha de segmentação." -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:843 #, c-format msgid "Sub-process %s received signal %u." msgstr "O sub-processo %s recebeu o sinal %u." -#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "O sub-processo %s retornou um código de erro (%u)" -#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "O sub-processo %s terminou inesperadamente" -#: apt-pkg/contrib/fileutl.cc:984 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Could not open file %s" msgstr "Não foi possível abrir ficheiro o %s" -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1062 #, c-format msgid "Could not open file descriptor %d" msgstr "Não foi possível abrir o descritor de ficheiro %d" -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "Falhou criar subprocesso IPC" -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " msgstr "Falhou executar compactador " -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1297 #, c-format msgid "read, still have %llu to read but none left" msgstr "lidos, ainda restam %llu para serem lidos mas não resta nenhum" -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "escritos, ainda restam %llu para escrever mas não foi possível" -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1681 #, c-format msgid "Problem closing the file %s" msgstr "Problema ao fechar o ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1693 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problema ao renomear o ficheiro %s para %s" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1704 #, c-format msgid "Problem unlinking the file %s" msgstr "Problema ao remover o link do ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1717 msgid "Problem syncing the file" msgstr "Problema sincronizando o ficheiro" @@ -2823,7 +2844,7 @@ msgstr "Linha mal formada %u na lista de fontes %s (tipo)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2832,12 +2853,12 @@ msgstr "" "Não foi possível proceder à configuração imediata em '%s'. Para detalhes, " "por favor veja man 5 apt.conf em APT::Immediate-Configure. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, c-format msgid "Could not configure '%s'. " msgstr "Não pode configurar '%s'. " -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2876,7 +2897,7 @@ msgstr "" "Não foi possível corrigir problemas, você tem pacotes mantidos (hold) " "estragados." -#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 +#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2884,7 +2905,7 @@ msgstr "" "Falhou o download de alguns ficheiros de índice. Foram ignorados ou os " "antigos foram usados em seu lugar." -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, c-format msgid "List directory %spartial is missing." msgstr "Falta directório de listas %spartial." @@ -2990,14 +3011,14 @@ msgstr "A cache possui um sistema de versões incompatível" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 -#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 -#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 -#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 -#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 -#: apt-pkg/pkgcachegen.cc:561 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Ocorreu um erro ao processar %s (%s%d)" @@ -3023,27 +3044,27 @@ msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Uau, você excedeu o número de dependências que este APT é capaz de suportar." -#: apt-pkg/pkgcachegen.cc:568 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "O pacote %s %s não foi encontrado ao processar as dependências de ficheiros" -#: apt-pkg/pkgcachegen.cc:1197 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "Não foi possível executar stat à lista de pacotes de código fonte %s" -#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 -#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" msgstr "A ler as listas de pacotes" -#: apt-pkg/pkgcachegen.cc:1302 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "A obter File Provides" -#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "Erro de I/O ao gravar a cache de código fonte" @@ -3056,12 +3077,12 @@ msgstr "falhou renomear, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "MD5Sum não coincide" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 msgid "Hash Sum mismatch" msgstr "Código de verificação hash não coincide" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3070,18 +3091,18 @@ msgstr "" "Incapaz de encontrar a entrada '%s' esperada no ficheiro Release (entrada " "errada em sources.list ou ficheiro malformado)" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Não foi possível encontrar hash sum para '%s' no ficheiro Release" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Não existe qualquer chave pública disponível para as seguintes IDs de " "chave:\n" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3090,12 +3111,12 @@ msgstr "" "O ficheiro Release para %s está expirado (inválido desde %s). Não serão " "aplicadas as actualizações para este repositório." -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribuição em conflito: %s (esperado %s mas obtido %s)" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3106,12 +3127,12 @@ msgstr "" "GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "Erro GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3121,7 +3142,7 @@ msgstr "" "significar que você precisa corrigir manualmente este pacote. (devido a " "arquitectura em falta)" -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3130,7 +3151,7 @@ msgstr "" "Não foi possível localizar arquivo para o pacote %s. Isto pode significar " "que você precisa consertar manualmente este pacote." -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3138,7 +3159,7 @@ msgstr "" "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: " "para o pacote %s." -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "Tamanho incorrecto" @@ -3190,7 +3211,7 @@ msgstr "A identificar.. " msgid "Stored label: %s\n" msgstr "Label Guardada: %s \n" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 msgid "Unmounting CD-ROM...\n" msgstr "A desmontar o CD-ROM...\n" @@ -3254,30 +3275,30 @@ msgstr "" msgid "Copying package lists..." msgstr "A copiar listas de pacotes..." -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "A escrever lista de novas source\n" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "As entradas de listas de Source para este Disco são:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "Escreveu %i registos.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Escreveu %i registos com %i ficheiros em falta.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Escreveu %i registos com %i ficheiros não coincidentes\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index e0d569c93..2704aeb94 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2008-11-17 02:33-0200\n" "Last-Translator: Felipe Augusto van de Wiel (faw) \n" "Language-Team: Brazilian Portuguese %s)." msgid "MD5Sum mismatch" msgstr "MD5Sum incorreto" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 msgid "Hash Sum mismatch" msgstr "Hash Sum incorreto" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Impossível analisar arquivo de pacote %s (1)" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "Não existem chaves públicas para os seguintes IDs de chaves:\n" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3055,12 +3076,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3070,7 +3091,7 @@ msgstr "" "que você precisa consertar manualmente este pacote. (devido a arquitetura " "não especificada)." -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3079,7 +3100,7 @@ msgstr "" "Não foi possível localizar arquivo para o pacote %s. Isto pode significar " "que você precisa consertar manualmente este pacote." -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3087,7 +3108,7 @@ msgstr "" "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo \"Filename:" "\" para o pacote %s." -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "Tamanho incorreto" @@ -3139,7 +3160,7 @@ msgstr "Identificando.. " msgid "Stored label: %s\n" msgstr "Rótulo armazenado: %s \n" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 msgid "Unmounting CD-ROM...\n" msgstr "Desmontando CD-ROM...\n" @@ -3201,30 +3222,30 @@ msgstr "" msgid "Copying package lists..." msgstr "Copiando lista de pacotes..." -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "Gravando nova lista de fontes\n" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "Entradas na lista de fontes para este disco são:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "Gravados %i registros.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Gravados %i registros com %i arquivos faltando.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Gravados %i registros com %i arquivos que não combinam\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/ro.po b/po/ro.po index d1c33ea49..6399bee80 100644 --- a/po/ro.po +++ b/po/ro.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ro\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2008-11-15 02:21+0200\n" "Last-Translator: Eddy Petrișor \n" "Language-Team: Romanian \n" @@ -98,74 +98,74 @@ msgstr "Total spațiu contorizat pentru: " msgid "Package file %s is out of sync." msgstr "Fișierul pachetului %s este desincronizat." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Nu s-au găsit pachete" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1243 #, fuzzy msgid "You must give at least one search pattern" msgstr "Trebuie să dați exact un șablon" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Nu s-a putut localiza pachetul %s" -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1526 msgid "Package files:" msgstr "Fișiere pachet: " -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Cache-ul este desincronizat, nu se poate executa x-ref pe un fișier pachet" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1547 msgid "Pinned packages:" msgstr "Pachete alese special:" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "(negăsit)" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr " Instalat: " -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr " Candidează: " -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "(niciunul)" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr " Pachet ales special: " #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr " Tabela de versiuni:" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s pentru %s compilat la %s %s\n" -#: cmdline/apt-cache.cc:1690 +#: cmdline/apt-cache.cc:1730 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -238,21 +238,29 @@ msgstr "" " -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/tmp\n" "Vedeți manualele apt-cache(8) și apt.conf(5) pentru mai multe informații.\n" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 #, fuzzy msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Furnizați un nume pentru acest disc, de exemplu „Debian 2.1r1 Disk 1”" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" msgstr "Introduceți un disc în unitate și apăsați Enter" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Eșec la redenumirea lui %s în %s" -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Repetați această procedură pentru restul CD-urilor din set." @@ -487,7 +495,7 @@ msgstr "Reinstalarea lui %s nu este posibilă, nu poate fi descărcat.\n" msgid "%s is already the newest version.\n" msgstr "%s este deja la cea mai nouă versiune.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s este marcat ca fiind instalat manual.\n" @@ -595,8 +603,8 @@ 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:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 #, c-format msgid "Couldn't determine free space in %s" msgstr "N-am putut determina spațiul disponibil în %s" @@ -636,7 +644,7 @@ msgstr "Renunțare." msgid "Do you want to continue [Y/n]? " msgstr "Vreți să continuați [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Eșec la aducerea lui %s %s\n" @@ -645,7 +653,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:1375 cmdline/apt-get.cc:2668 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "Descărcare completă și în modul doar descărcare" @@ -728,7 +736,7 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 msgid "The following information may help to resolve the situation:" msgstr "Următoarele informații ar putea să vă ajute la rezolvarea situației:" @@ -786,7 +794,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:1974 +#: cmdline/apt-get.cc:1973 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" @@ -799,86 +807,86 @@ msgstr "" "pachete\n" "cerute n-au fost create încă sau au fost mutate din Incoming." -#: cmdline/apt-get.cc:1995 +#: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "Pachete deteriorate" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2020 msgid "The following extra packages will be installed:" msgstr "Următoarele extra pachete vor fi instalate:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "Pachete sugerate:" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "Pachete recomandate:" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "Nu pot găsi pachetul %s" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "%s este marcat ca fiind instalat manual.\n" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2184 msgid "Calculating upgrade... " msgstr "Calculez înnoirea... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Eșec" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2192 msgid "Done" msgstr "Terminat" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 msgid "Internal error, problem resolver broke stuff" msgstr "" "Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni" -#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "Nu s-a putut bloca directorul de descărcare" -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2452 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:2493 cmdline/apt-get.cc:2805 +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, 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:2510 +#: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2514 #, c-format msgid "" "Please use:\n" @@ -886,87 +894,87 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2567 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Sar peste fișierul deja descărcat '%s'\n" -#: cmdline/apt-get.cc:2605 +#: cmdline/apt-get.cc:2604 #, c-format msgid "You don't have enough free space in %s" msgstr "Nu aveți suficient spațiu în %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2613 #, 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" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2618 #, 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:2625 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" msgstr "Aducere sursa %s\n" -#: cmdline/apt-get.cc:2663 +#: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "Eșec la aducerea unor arhive." -#: cmdline/apt-get.cc:2694 +#: cmdline/apt-get.cc:2693 #, 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:2706 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comanda de despachetare '%s' eșuată.\n" -#: cmdline/apt-get.cc:2707 +#: cmdline/apt-get.cc:2706 #, 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:2729 +#: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comanda de construire '%s' eșuată.\n" -#: cmdline/apt-get.cc:2749 +#: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "Procesul copil a eșuat" -#: cmdline/apt-get.cc:2768 +#: cmdline/apt-get.cc:2767 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:2793 +#: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, 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:2840 +#: cmdline/apt-get.cc:2839 #, c-format msgid "%s has no build depends.\n" msgstr "%s nu are dependențe înglobate.\n" -#: cmdline/apt-get.cc:3010 +#: cmdline/apt-get.cc:3009 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -975,7 +983,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:3028 +#: cmdline/apt-get.cc:3027 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -984,14 +992,14 @@ msgstr "" "Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu " "poate fi găsit" -#: cmdline/apt-get.cc:3051 +#: cmdline/apt-get.cc:3050 #, 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:3090 +#: cmdline/apt-get.cc:3089 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1000,7 +1008,7 @@ 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:3096 +#: cmdline/apt-get.cc:3095 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1009,30 +1017,30 @@ msgstr "" "Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu " "poate fi găsit" -#: cmdline/apt-get.cc:3119 +#: cmdline/apt-get.cc:3118 #, 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:3135 +#: cmdline/apt-get.cc:3133 #, 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:3140 +#: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "Eșec la prelucrarea dependențelor de compilare" -#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Conectare la %s (%s)" -#: cmdline/apt-get.cc:3368 +#: cmdline/apt-get.cc:3366 msgid "Supported modules:" msgstr "Module suportate:" -#: cmdline/apt-get.cc:3409 +#: cmdline/apt-get.cc:3407 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1121,7 +1129,7 @@ msgstr "" "pentru mai multe informații și opțiuni.\n" " Acest APT are puterile unei Super Vaci.\n" -#: cmdline/apt-get.cc:3574 +#: cmdline/apt-get.cc:3572 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1192,7 +1200,7 @@ msgid "%s was already not hold.\n" msgstr "%s este deja la cea mai nouă versiune.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" @@ -1331,8 +1339,8 @@ msgstr "Timpul de conectare a expirat" msgid "Server closed the connection" msgstr "Serverul a închis conexiunea" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 +#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 msgid "Read error" msgstr "Eroare de citire" @@ -1345,8 +1353,8 @@ msgid "Protocol corruption" msgstr "Protocol corupt" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 +#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 msgid "Write error" msgstr "Eroare de scriere" @@ -1492,32 +1500,40 @@ 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:169 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Eroare internă: Semnătură corespunzătoare, dar nu s-a putut determina " "amprenta digitale a cheii?!" -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Cel puțin o semnătură nevalidă a fost întâlnită." -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:172 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Nu s-a putut executa „%s” pentru verificarea semnăturii (gpgv este instalat?)" -#: methods/gpgv.cc:183 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Eroare necunoscută în timp ce se execută gpgv" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Următoarele semnături nu au fost valide:\n" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1601,8 +1617,8 @@ msgstr "Eroare internă" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1631,7 +1647,12 @@ msgstr "" msgid "Can not read mirror file '%s'" msgstr "Nu s-a putut deschide fișierul %s" -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "Nu s-a putut deschide fișierul %s" + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "" @@ -1726,7 +1747,7 @@ msgstr "" " -c=? Citește acest fișier de configurare\n" " -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Nu s-a putut scrie în %s" @@ -2107,24 +2128,24 @@ msgstr "" " -o=? Ajustează o opțiune de configurare arbitrară, ex.: -o dir::cache=/" "tmp\n" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "Eșec la crearea conexiunilor" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "Eșec la executarea lui gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "Arhivă deteriorată" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "" "Suma de control a arhivei tar nu s-a verificat, arhiva este deteriorată" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Tip antet TAR %u necunoscut, membrul %s" @@ -2347,7 +2368,7 @@ msgstr "" msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1172 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "Selecția %s nu a fost găsită" @@ -2490,111 +2511,111 @@ msgstr "Eșec la „stat” pentru CD" msgid "Problem closing the gzip file %s" msgstr "Problemă la închiderea fișierului" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Nu s-a folosit închiderea pentru fișierul disponibil doar-citire %s" -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "Nu pot deschide fișierul blocat %s" -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:249 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Nu este folosit blocajul pentru fișierul montat nfs %s" -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "Nu pot determina blocajul %s" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Subprocesul %s a primit o eroare de segmentare." -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:843 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Subprocesul %s a primit o eroare de segmentare." -#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Subprocesul %s a întors un cod de eroare (%u)" -#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Subprocesul %s s-a terminat brusc" -#: apt-pkg/contrib/fileutl.cc:984 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Could not open file %s" msgstr "Nu s-a putut deschide fișierul %s" -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1062 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "Nu s-a putut deschide conexiunea pentru %s" -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "Eșec la crearea IPC-ului pentru subproces" -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " msgstr "Eșec la executarea compresorului" -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1297 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "citire, încă mai am %lu de citit dar n-a mai rămas nimic" -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "scriere, încă mai am %lu de scris dar nu pot" -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1681 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Problemă la închiderea fișierului" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1693 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Problemă în timpul sincronizării fișierului" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1704 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Problemă la dezlegarea fișierului" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1717 msgid "Problem syncing the file" msgstr "Problemă în timpul sincronizării fișierului" @@ -2792,19 +2813,19 @@ msgstr "Linie greșită %u în lista sursă %s (tip)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Nu s-a putut deschide fișierul %s" -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2840,7 +2861,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Nu pot corecta problema, ați ținut pachete deteriorate." -#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 +#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2849,7 +2870,7 @@ msgstr "" "Descărcarea unor fișiere index a eșuat, acestea fie au fost ignorate, fie au " "fost folosite în loc unele vechi." -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "Directorul de liste %spartial lipsește." @@ -2953,14 +2974,14 @@ msgstr "Cache are un versioning system incompatibil" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 -#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 -#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 -#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 -#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 -#: apt-pkg/pkgcachegen.cc:561 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Eroare apărută în timpul procesării %s (FindPkg)" @@ -2986,27 +3007,27 @@ msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Mamăăă, ați depășit numărul de dependențe de care este capabil acest APT." -#: apt-pkg/pkgcachegen.cc:568 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Nu s-a găsit pachetul %s %s în timpul procesării dependențelor de fișiere" -#: apt-pkg/pkgcachegen.cc:1197 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nu pot determina starea listei surse de pachete %s" -#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 -#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" msgstr "Citire liste de pachete" -#: apt-pkg/pkgcachegen.cc:1302 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "Colectare furnizori fișier" -#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "Eroare IO în timpul salvării sursei cache" @@ -3019,42 +3040,42 @@ msgstr "redenumire eșuată, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "Nepotrivire MD5Sum" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 msgid "Hash Sum mismatch" msgstr "Nepotrivire la suma de căutare" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nu s-a putut analiza fișierul pachet %s (1)" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Nu există nici o cheie publică disponibilă pentru următoarele " "identificatoare de chei:\n" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3062,12 +3083,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3076,7 +3097,7 @@ msgstr "" "N-am putut localiza un fișier pentru pachetul %s. Aceasta ar putea însemna " "că aveți nevoie să reparați manual acest pachet (din pricina unui arch lipsă)" -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3085,7 +3106,7 @@ msgstr "" "N-am putut localiza un fișier pentru pachetul %s. Aceasta ar putea însemna " "că aveți nevoie să depanați manual acest pachet." -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3093,7 +3114,7 @@ msgstr "" "Fișierele index de pachete sunt deteriorate. Fără câmpul 'nume fișier:' la " "pachetul %s." -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "Nepotrivire dimensiune" @@ -3145,7 +3166,7 @@ msgstr "Identificare.. " msgid "Stored label: %s\n" msgstr "Etichetă memorată: %s \n" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 msgid "Unmounting CD-ROM...\n" msgstr "Se demontează CD-ul...\n" @@ -3208,30 +3229,30 @@ msgstr "" msgid "Copying package lists..." msgstr "Copiez listele de pachete.." -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "Scriere noua listă sursă\n" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "Intrările listei surselor pentru acest disc sunt:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "S-au scris %i înregistrări.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "S-au scris %i înregistrări cu %i fișiere lipsă.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "S-au scris %i înregistrări cu %i fișiere nepotrivite\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/ru.po b/po/ru.po index e71539f17..fee0aaa8c 100644 --- a/po/ru.po +++ b/po/ru.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: apt rev2227.1.3\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2012-06-30 08:47+0400\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" @@ -104,72 +104,72 @@ msgstr "Полное учтённое пространство: " msgid "Package file %s is out of sync." msgstr "Список пакетов %s рассинхронизирован." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Не найдено ни одного пакета" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1243 msgid "You must give at least one search pattern" msgstr "Вы должны задать не менее одно шаблона поиска" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "Эта команда устарела. Используйте вместо неё «apt-mark showauto»." -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Не удалось найти пакет %s" -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1526 msgid "Package files:" msgstr "Списки пакетов:" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Кэш рассинхронизирован, невозможно обнаружить ссылку на список пакетов" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1547 msgid "Pinned packages:" msgstr "Зафиксированные пакеты:" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "(не найдено)" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr " Установлен: " -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr " Кандидат: " -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "(отсутствует)" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr " Фиксатор пакета: " #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr " Таблица версий:" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s для %s скомпилирован %s %s\n" -#: cmdline/apt-cache.cc:1690 +#: cmdline/apt-cache.cc:1730 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -239,20 +239,28 @@ msgstr "" " -o=? Задать значение произвольной настройки, например, -o dir::cache=/tmp\n" "Подробности в справочных страницах apt-cache(8) и apt.conf(5).\n" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Задайте имя для этого диска, например «Debian 5.0.3 Disk 1»" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" msgstr "Вставьте диск в устройство и нажмите ввод" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Не удалось примонтировать «%s» к «%s»" -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Повторите этот процесс для всех имеющихся CD." @@ -490,7 +498,7 @@ msgstr "Переустановка %s невозможна, он не скачи msgid "%s is already the newest version.\n" msgstr "Уже установлена самая новая версия %s.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s установлен вручную.\n" @@ -605,8 +613,8 @@ msgstr "" "После данной операции, объём занятого дискового пространства уменьшится на " "%sB.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 #, c-format msgid "Couldn't determine free space in %s" msgstr "Не удалось определить количество свободного места в %s" @@ -647,7 +655,7 @@ msgstr "Аварийное завершение." msgid "Do you want to continue [Y/n]? " msgstr "Хотите продолжить [Д/н]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Не удалось получить %s %s\n" @@ -656,7 +664,7 @@ msgstr "Не удалось получить %s %s\n" msgid "Some files failed to download" msgstr "Некоторые файлы скачать не удалось" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "Указан режим «только скачивание», и скачивание завершено" @@ -743,7 +751,7 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 msgid "The following information may help to resolve the situation:" msgstr "Следующая информация, возможно, поможет вам:" @@ -797,7 +805,7 @@ msgstr "" "Неудовлетворённые зависимости. Попытайтесь выполнить «apt-get -f install», " "не указывая имени пакета, (или найдите другое решение)." -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1973 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" @@ -808,33 +816,33 @@ msgstr "" "или же используете нестабильную версию дистрибутива, где запрошенные вами\n" "пакеты ещё не созданы или были удалены из Incoming." -#: cmdline/apt-get.cc:1995 +#: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "Сломанные пакеты" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2020 msgid "The following extra packages will be installed:" msgstr "Будут установлены следующие дополнительные пакеты:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "Предлагаемые пакеты:" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "Рекомендуемые пакеты:" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "Не удалось найти пакет %s" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s выбран для автоматической установки.\n" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -842,47 +850,47 @@ msgstr "" "Эта команда устарела. Используйте вместо неё «apt-mark auto» и «apt-mark " "manual»." -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2184 msgid "Calculating upgrade... " msgstr "Расчёт обновлений…" -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Неудачно" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2192 msgid "Done" msgstr "Готово" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 msgid "Internal error, problem resolver broke stuff" msgstr "Внутренняя ошибка, решатель проблем всё поломал" -#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "Невозможно заблокировать каталог, куда складываются скачиваемые файлы" -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Невозможно найти источник для загрузки «%2$s» версии «%1$s»" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "Выполняется загрузка %s %s" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2452 msgid "Must specify at least one package to fetch source for" msgstr "" "Укажите как минимум один пакет, исходный код которого необходимо получить" -#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, c-format msgid "Unable to find a source package for %s" msgstr "Невозможно найти пакет с исходным кодом для %s" -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -891,7 +899,7 @@ msgstr "" "ВНИМАНИЕ: упаковка «%s» поддерживается в системе контроля версий «%s»:\n" "%s\n" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2514 #, c-format msgid "" "Please use:\n" @@ -902,70 +910,70 @@ msgstr "" "bzr branch %s\n" "для получения последних (возможно не выпущенных) обновлений пакета.\n" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2567 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускаем уже скачанный файл «%s»\n" -#: cmdline/apt-get.cc:2605 +#: cmdline/apt-get.cc:2604 #, c-format msgid "You don't have enough free space in %s" msgstr "Недостаточно места в %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2613 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необходимо получить %sб/%sб архивов исходного кода.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2618 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Необходимо получить %sб архивов исходного кода.\n" -#: cmdline/apt-get.cc:2625 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" msgstr "Получение исходного кода %s\n" -#: cmdline/apt-get.cc:2663 +#: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "Некоторые архивы не удалось получить." -#: cmdline/apt-get.cc:2694 +#: cmdline/apt-get.cc:2693 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Пропускается распаковка уже распакованного исходного кода в %s\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Команда распаковки «%s» завершилась неудачно.\n" -#: cmdline/apt-get.cc:2707 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Проверьте, установлен ли пакет «dpkg-dev».\n" -#: cmdline/apt-get.cc:2729 +#: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "Команда сборки «%s» завершилась неудачно.\n" -#: cmdline/apt-get.cc:2749 +#: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "Порождённый процесс завершился неудачно" -#: cmdline/apt-get.cc:2768 +#: cmdline/apt-get.cc:2767 msgid "Must specify at least one package to check builddeps for" msgstr "" "Для проверки зависимостей для сборки необходимо указать как минимум один " "пакет" -#: cmdline/apt-get.cc:2793 +#: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -974,17 +982,17 @@ msgstr "" "У %s отсутствует информация об архитектуре. Для её настройки смотрите apt." "conf(5) APT::Architectures" -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Невозможно получить информацию о зависимостях для сборки %s" -#: cmdline/apt-get.cc:2840 +#: cmdline/apt-get.cc:2839 #, c-format msgid "%s has no build depends.\n" msgstr "%s не имеет зависимостей для сборки.\n" -#: cmdline/apt-get.cc:3010 +#: cmdline/apt-get.cc:3009 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -993,7 +1001,7 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как %s не " "разрешён для пакетов «%s»" -#: cmdline/apt-get.cc:3028 +#: cmdline/apt-get.cc:3027 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1002,14 +1010,14 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не " "найден" -#: cmdline/apt-get.cc:3051 +#: cmdline/apt-get.cc:3050 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный " "пакет %s новее, чем надо" -#: cmdline/apt-get.cc:3090 +#: cmdline/apt-get.cc:3089 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1018,7 +1026,7 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как версия-" "кандидат пакета %s не может удовлетворить требованиям по версии" -#: cmdline/apt-get.cc:3096 +#: cmdline/apt-get.cc:3095 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1027,30 +1035,30 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не " "имеет версии-кандидата" -#: cmdline/apt-get.cc:3119 +#: cmdline/apt-get.cc:3118 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s" -#: cmdline/apt-get.cc:3135 +#: cmdline/apt-get.cc:3133 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Зависимости для сборки %s не могут быть удовлетворены." -#: cmdline/apt-get.cc:3140 +#: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "Обработка зависимостей для сборки завершилась неудачно" -#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, c-format msgid "Changelog for %s (%s)" msgstr "Changelog для %s (%s)" -#: cmdline/apt-get.cc:3368 +#: cmdline/apt-get.cc:3366 msgid "Supported modules:" msgstr "Поддерживаемые модули:" -#: cmdline/apt-get.cc:3409 +#: cmdline/apt-get.cc:3407 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1142,7 +1150,7 @@ msgstr "" "содержится подробная информация и описание параметров.\n" " В APT есть коровья СУПЕРСИЛА.\n" -#: cmdline/apt-get.cc:3574 +#: cmdline/apt-get.cc:3572 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1217,7 +1225,7 @@ msgid "%s was already not hold.\n" msgstr "%s уже помечен как не зафиксированный.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" @@ -1380,8 +1388,8 @@ msgstr "Допустимое время ожидания для соединен msgid "Server closed the connection" msgstr "Сервер прервал соединение" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 +#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 msgid "Read error" msgstr "Ошибка чтения" @@ -1394,8 +1402,8 @@ msgid "Protocol corruption" msgstr "Искажение протокола" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 +#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 msgid "Write error" msgstr "Ошибка записи" @@ -1540,30 +1548,38 @@ msgstr "Что-то странное произошло при определе msgid "Unable to connect to %s:%s:" msgstr "Невозможно соединиться с %s: %s:" -#: methods/gpgv.cc:169 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Внутренняя ошибка: Правильная подпись, но не удалось определить отпечаток " "ключа?!" -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Найдена как минимум одна неправильная подпись." -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Не удалось выполнить «gpgv» для проверки подписи (gpgv установлена?)" -#: methods/gpgv.cc:183 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Неизвестная ошибка при выполнении gpgv" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Следующие подписи неверные:\n" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1646,8 +1662,8 @@ msgstr "Внутренняя ошибка" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1676,7 +1692,12 @@ msgstr "Файл «%s» не найден на зеркале" msgid "Can not read mirror file '%s'" msgstr "Невозможно прочитать файл на зеркале «%s»" -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "Невозможно прочитать файл на зеркале «%s»" + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "[Зеркало: %s]" @@ -1773,7 +1794,7 @@ msgstr "" " -c=? Читать указанный файл настройки\n" " -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Невозможно записать в %s" @@ -2152,23 +2173,23 @@ msgstr "" " -c=? читать указанный файл настройки\n" " -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "Не удалось создать каналы" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "Не удалось выполнить gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "Повреждённый архив" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "Неправильная контрольная сумма Tar, архив повреждён" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Неизвестный заголовок в архиве TAR. Тип %u, элемент %s" @@ -2391,7 +2412,7 @@ msgstr "%liмин %liс" msgid "%lis" msgstr "%liс" -#: apt-pkg/contrib/strutl.cc:1172 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "Не найдено: %s" @@ -2535,46 +2556,46 @@ msgstr "Невозможно получить атрибуты cdrom" msgid "Problem closing the gzip file %s" msgstr "Проблема закрытия gzip-файла %s" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Блокировка не используется, так как файл блокировки %s доступен только для " "чтения" -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "Не удалось открыть файл блокировки %s" -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:249 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Блокировка не используется, так как файл блокировки %s находится на файловой " "системе nfs" -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "Не удалось получить доступ к файлу блокировки %s" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "Список файлов не может быть создан, так как «%s» не является каталогом" -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "Файл «%s» в каталоге «%s» игнорируется, так как это необычный файл" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "Файл «%s» в каталоге «%s» игнорируется, так как он не имеет расширения" -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" @@ -2582,72 +2603,72 @@ msgstr "" "Файл «%s» в каталоге «%s» игнорируется, так как он не имеет неправильное " "расширение" -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" "Нарушение защиты памяти (segmentation fault) в порождённом процессе %s." -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:843 #, c-format msgid "Sub-process %s received signal %u." msgstr "Порождённый процесс %s получил сигнал %u." -#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Порождённый процесс %s вернул код ошибки (%u)" -#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Порождённый процесс %s неожиданно завершился" -#: apt-pkg/contrib/fileutl.cc:984 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Could not open file %s" msgstr "Не удалось открыть файл %s" -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1062 #, c-format msgid "Could not open file descriptor %d" msgstr "Не удалось открыть файловый дескриптор %d" -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "Не удалось создать IPC с порождённым процессом" -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " msgstr "Не удалось выполнить компрессор " -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1297 #, c-format msgid "read, still have %llu to read but none left" msgstr "" "ошибка при чтении; собирались прочесть ещё %llu байт, но ничего больше нет" -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "ошибка при записи; собирались записать ещё %llu байт, но не смогли" -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1681 #, c-format msgid "Problem closing the file %s" msgstr "Проблема закрытия файла %s" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1693 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Проблема при переименовании файла %s в %s" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1704 #, c-format msgid "Problem unlinking the file %s" msgstr "Проблема при удалении файла %s" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1717 msgid "Problem syncing the file" msgstr "Проблема при синхронизации файла" @@ -2848,7 +2869,7 @@ msgstr "Искажённая строка %u в списке источнико msgid "Type '%s' is not known on line %u in source list %s" msgstr "Неизвестный тип «%s» в строке %u в списке источников %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2857,12 +2878,12 @@ msgstr "" "Не удалось выполнить оперативную настройку «%s». Подробней, смотрите в man 5 " "apt.conf о APT::Immediate-Configure. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, c-format msgid "Could not configure '%s'. " msgstr "Не удалось настроить «%s»." -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2899,7 +2920,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Невозможно исправить ошибки, у вас отложены (held) битые пакеты." -#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 +#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2907,7 +2928,7 @@ msgstr "" "Некоторые индексные файлы не скачались. Они были проигнорированы или вместо " "них были использованы старые версии." -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, c-format msgid "List directory %spartial is missing." msgstr "Каталог списка %spartial отсутствует." @@ -3009,14 +3030,14 @@ msgstr "Кэш имеет несовместимую систему версий #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 -#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 -#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 -#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 -#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 -#: apt-pkg/pkgcachegen.cc:561 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Произошла ошибка во время обработки %s (%s%d)" @@ -3043,26 +3064,26 @@ msgstr "" "Превышено допустимое количество зависимостей, которое способен обработать " "APT." -#: apt-pkg/pkgcachegen.cc:568 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Во время обработки файла зависимостей не найден пакет %s %s" -#: apt-pkg/pkgcachegen.cc:1197 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "Не удалось получить атрибуты списка пакетов исходного кода %s" -#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 -#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" msgstr "Чтение списков пакетов" -#: apt-pkg/pkgcachegen.cc:1302 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "Сбор информации о Provides" -#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "Ошибка ввода/вывода при попытке сохранить кэш источников" @@ -3075,12 +3096,12 @@ msgstr "переименовать не удалось, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "MD5Sum не совпадает" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 msgid "Hash Sum mismatch" msgstr "Хеш сумма не совпадает" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3089,16 +3110,16 @@ msgstr "" "Невозможно найти ожидаемый элемент «%s» в файле Release (некорректная запись " "в sources.list или файл)" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Невозможно найти хеш-сумму «%s» в файле Release" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "Недоступен открытый ключ для следующих ID ключей:\n" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3107,12 +3128,12 @@ msgstr "" "Файл Release для %s просрочен (недостоверный начиная с %s). Обновление этого " "репозитория производиться не будет." -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Конфликт распространения: %s (ожидался %s, но получен %s)" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3122,12 +3143,12 @@ msgstr "" "использованы предыдущие индексные файлы. Ошибка GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "Ошибка GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3136,7 +3157,7 @@ msgstr "" "Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся " "вручную исправить этот пакет (возможно, пропущен arch)" -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3145,13 +3166,13 @@ msgstr "" "Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся " "вручную исправить этот пакет." -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Некорректный перечень пакетов. Нет поля Filename: для пакета %s." -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "Не совпадает размер" @@ -3203,7 +3224,7 @@ msgstr "Идентификация.. " msgid "Stored label: %s\n" msgstr "Найдена метка: %s \n" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 msgid "Unmounting CD-ROM...\n" msgstr "Размонтирование CD-ROM…\n" @@ -3267,30 +3288,30 @@ msgstr "" msgid "Copying package lists..." msgstr "Копирование списков пакетов…" -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "Запись нового списка источников\n" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "Записи в списке источников для этого диска:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "Сохранено %i записей.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Сохранено %i записей с %i отсутствующими файлами.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Сохранено %i записей с %i несовпадающими файлами\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/sk.po b/po/sk.po index defb22e44..901db71f9 100644 --- a/po/sk.po +++ b/po/sk.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2012-06-28 20:49+0100\n" "Last-Translator: Ivan Masár \n" "Language-Team: Slovak \n" @@ -98,74 +98,74 @@ msgstr "Celkom priradeného miesta: " msgid "Package file %s is out of sync." msgstr "Súbor balíkov %s je neaktuálny." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Neboli nájdené žiadne balíky" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1243 msgid "You must give at least one search pattern" msgstr "Musíte zadať aspoň jeden vyhľadávací vzor" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" "Tento príkaz je zavrhovaný. Prosím, použite namiesto neho „apt-mark " "showauto“." -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Nedá sa nájsť balík %s" -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1526 msgid "Package files:" msgstr "Súbory balíka:" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Vyrovnávacia pamäť je neaktuálna, nedá sa odvolať na súbor balíka" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1547 msgid "Pinned packages:" msgstr "Pripevnené balíky:" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "(nenájdené)" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr " Nainštalovaná verzia: " -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr " Kandidát: " -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "(žiadna)" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr " Pripevnený balík:" #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr " Tabuľka verzií:" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s pre %s skompilovaný %s %s\n" -#: cmdline/apt-cache.cc:1690 +#: cmdline/apt-cache.cc:1730 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -236,20 +236,28 @@ msgstr "" "Ďalšie informácie nájdete v manuálových stránkach apt-cache(8)\n" "a apt.conf(5).\n" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Prosím, zadajte názov tohto disku, napríklad „Debian 5.0.3 Disk 1“" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" msgstr "Vložte disk do mechaniky a stlačte Enter" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Pripojenie „%s“ na „%s“ zlyhalo" -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Zopakujte tento postup pre všetky CD v sade diskov." @@ -484,7 +492,7 @@ msgstr "Nie je možná reinštalácia %s, pretože sa nedá stiahnuť.\n" msgid "%s is already the newest version.\n" msgstr "%s je už najnovšej verzie.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s je označený ako manuálne nainštalovaný.\n" @@ -593,8 +601,8 @@ 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:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 #, c-format msgid "Couldn't determine free space in %s" msgstr "Na %s sa nedá zistiť veľkosť voľného miesta" @@ -633,7 +641,7 @@ msgstr "Prerušené." msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovať [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Zlyhalo stiahnutie %s %s\n" @@ -642,7 +650,7 @@ msgstr "Zlyhalo stiahnutie %s %s\n" msgid "Some files failed to download" msgstr "Niektoré súbory sa nedajú stiahnuť" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "Sťahovanie ukončené v režime „iba stiahnuť“" @@ -729,7 +737,7 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 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:" @@ -785,7 +793,7 @@ msgstr "" "Nesplnené závislosti. Skúste spustiť „apt-get -f install“ bez balíkov (alebo " "navrhnite riešenie)." -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1973 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" @@ -797,33 +805,33 @@ msgstr "" "požadované balíky ešte neboli vytvorené alebo presunuté z fronty\n" "Novoprichádzajúcich (Incoming) balíkov." -#: cmdline/apt-get.cc:1995 +#: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "Poškodené balíky" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2020 msgid "The following extra packages will be installed:" msgstr "Nainštalujú sa nasledovné extra balíky:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "Navrhované balíky:" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "Odporúčané balíky:" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "Balík %s sa nedá nájsť" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s je označený ako automaticky nainštalovaný.\n" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -831,46 +839,46 @@ msgstr "" "Tento príkaz je zavrhovaný. Prosím, použite namiesto neho „apt-mark auto“ a " "„apt-mark manual“." -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2184 msgid "Calculating upgrade... " msgstr "Prepočítava sa aktualizácia... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Chyba" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2192 msgid "Done" msgstr "Hotovo" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 msgid "Internal error, problem resolver broke stuff" msgstr "Vnútorná chyba, „problem resolver“ niečo pokazil" -#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "Adresár pre sťahovanie sa nedá zamknúť" -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Nie je možné nájsť zdroj na stiahnutie verzie „%s“ balíka „%s“" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "Sťahuje sa %s %s" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2452 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:2493 cmdline/apt-get.cc:2805 +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, 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:2510 +#: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -880,7 +888,7 @@ msgstr "" "adrese:\n" "%s\n" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2514 #, c-format msgid "" "Please use:\n" @@ -892,70 +900,70 @@ msgstr "" "ak chcete získať najnovšie (a pravdepodobne zatiaľ nevydané) aktualizácie " "balíka.\n" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2567 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Preskakuje sa už stiahnutý súbor „%s“\n" -#: cmdline/apt-get.cc:2605 +#: cmdline/apt-get.cc:2604 #, c-format msgid "You don't have enough free space in %s" msgstr "Na %s nemáte dostatok voľného miesta" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2613 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Je potrebné stiahnuť %sB/%sB zdrojových archívov.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2618 #, 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:2625 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" msgstr "Stiahnuť zdroj %s\n" -#: cmdline/apt-get.cc:2663 +#: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "Zlyhalo stiahnutie niektorých archívov." -#: cmdline/apt-get.cc:2694 +#: cmdline/apt-get.cc:2693 #, 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:2706 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Príkaz na rozbalenie „%s“ zlyhal.\n" -#: cmdline/apt-get.cc:2707 +#: cmdline/apt-get.cc:2706 #, 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:2729 +#: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "Príkaz na zostavenie „%s“ zlyhal.\n" -#: cmdline/apt-get.cc:2749 +#: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "Proces potomka zlyhal" -#: cmdline/apt-get.cc:2768 +#: cmdline/apt-get.cc:2767 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:2793 +#: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -964,17 +972,17 @@ msgstr "" "Informácie o architektúre nie sú dostupné pre %s. Informácie o nastavení " "nájdete v apt.conf(5) APT::Architectures" -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, 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:2840 +#: cmdline/apt-get.cc:2839 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žiadne závislosti na zostavenie.\n" -#: cmdline/apt-get.cc:3010 +#: cmdline/apt-get.cc:3009 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -983,20 +991,20 @@ msgstr "" "%s závislosť pre %s nemožno splniť, pretože %s nie je povolené na balíkoch " "„%s“" -#: cmdline/apt-get.cc:3028 +#: cmdline/apt-get.cc:3027 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s závislosť pre %s nemožno splniť, pretože sa nedá nájsť balík %s" -#: cmdline/apt-get.cc:3051 +#: cmdline/apt-get.cc:3050 #, 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:3090 +#: cmdline/apt-get.cc:3089 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1005,7 +1013,7 @@ msgstr "" "%s závislosť pre %s nemožno splniť, pretože kandidátska verzia balíka %s, " "nedokáže splniť požiadavky na verziu" -#: cmdline/apt-get.cc:3096 +#: cmdline/apt-get.cc:3095 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1013,30 +1021,30 @@ msgid "" msgstr "" "%s závislosť pre %s nemožno splniť, pretože balík %s nemá kandidátsku verziu" -#: cmdline/apt-get.cc:3119 +#: cmdline/apt-get.cc:3118 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Zlyhalo splnenie %s závislosti pre %s: %s" -#: cmdline/apt-get.cc:3135 +#: cmdline/apt-get.cc:3133 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Závislosti na zostavenie %s nemožno splniť." -#: cmdline/apt-get.cc:3140 +#: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "Spracovanie závislostí na zostavenie zlyhalo" -#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, c-format msgid "Changelog for %s (%s)" msgstr "Záznam zmien %s (%s)" -#: cmdline/apt-get.cc:3368 +#: cmdline/apt-get.cc:3366 msgid "Supported modules:" msgstr "Podporované moduly:" -#: cmdline/apt-get.cc:3409 +#: cmdline/apt-get.cc:3407 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1124,7 +1132,7 @@ msgstr "" "a apt.conf(5).\n" " Tento APT má schopnosti posvätnej kravy.\n" -#: cmdline/apt-get.cc:3574 +#: cmdline/apt-get.cc:3572 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1199,7 +1207,7 @@ msgid "%s was already not hold.\n" msgstr "%s bol už nastavený na nepodržanie.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" @@ -1357,8 +1365,8 @@ msgstr "Uplynul čas spojenia" msgid "Server closed the connection" msgstr "Server ukončil spojenie" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 +#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 msgid "Read error" msgstr "Chyba pri čítaní" @@ -1371,8 +1379,8 @@ msgid "Protocol corruption" msgstr "Narušenie protokolu" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 +#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 msgid "Write error" msgstr "Chyba pri zápise" @@ -1515,28 +1523,36 @@ msgstr "Niečo veľmi zlé sa prihodilo pri preklade „%s:%s“ (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Nedá sa pripojiť k %s:%s:" -#: methods/gpgv.cc:169 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Vnútorná chyba: Správna signatúra, ale sa nedá zistiť odtlačok kľúča?!" -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Bola zistená aspoň jedna nesprávna signatúra." -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Nedá sa spustiť „gpgv“ kvôli overeniu podpisu (je nainštalované gpgv?)" -#: methods/gpgv.cc:183 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Neznáma chyba pri spustení gpgv" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Nasledovné signatúry sú neplatné:\n" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1619,8 +1635,8 @@ msgstr "Vnútorná chyba" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1649,7 +1665,12 @@ msgstr "Na zrkadle nebol nájdený súbor „%s“" msgid "Can not read mirror file '%s'" msgstr "Nepodarilo sa prečítať súbor „%s“ na zrkadle" -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "Nepodarilo sa prečítať súbor „%s“ na zrkadle" + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "[Zrkadlo: %s]" @@ -1745,7 +1766,7 @@ msgstr "" " -c=? Načíta tento konfiguračný súbor\n" " -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Do %s sa nedá zapisovať" @@ -2115,23 +2136,23 @@ msgstr "" " -c=? Načíta tento konfiguračný súbor\n" " -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "Vytvorenie rúry zlyhalo" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "Spustenie gzip zlyhalo " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "Porušený archív" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "Kontrolný súčet pre tar zlyhal, archív je poškodený" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Neznáma TAR hlavička typu %u, člen %s" @@ -2353,7 +2374,7 @@ msgstr "%li min %li s" msgid "%lis" msgstr "%li s" -#: apt-pkg/contrib/strutl.cc:1172 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "Voľba %s nenájdená" @@ -2495,112 +2516,112 @@ msgstr "Nedá sa vykonať stat() CD-ROM" msgid "Problem closing the gzip file %s" msgstr "Problém pri zatváraní gzip súboru %s" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Zamykanie pre súbor zámku %s, ktorý je iba na čítanie, sa nepoužíva" -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "Súbor zámku %s sa nedá otvoriť" -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:249 #, 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" -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "Zámok %s sa nedá získať" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "Zoznam súborov nemožno vytvoriť, pretože „%s“ nie je adresár" -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "Ignoruje sa „%s“ v adresári „%s“, pretože to nie je obyčajný súbor" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "Ignoruje sa „%s“ v adresári „%s“, pretože nemá príponu názvu súboru" -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" "Ignoruje sa „%s“ v adresári „%s“, pretože má neplatnú príponu názvu súboru" -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Podproces %s obdržal chybu segmentácie." -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:843 #, c-format msgid "Sub-process %s received signal %u." msgstr "Podproces %s dostal signál %u." -#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Podproces %s vrátil chybový kód (%u)" -#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Podproces %s neočakávane skončil" -#: apt-pkg/contrib/fileutl.cc:984 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Could not open file %s" msgstr "Nedá sa otvoriť súbor %s" -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1062 #, c-format msgid "Could not open file descriptor %d" msgstr "Nedá sa otvoriť popisovač súboru %d" -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "Nedá sa vytvoriť podproces IPC" -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " msgstr "Nepodarilo sa spustiť kompresor " -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1297 #, c-format msgid "read, still have %llu to read but none left" msgstr "čítanie, treba prečítať ešte %llu, ale už nič neostáva" -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "zápis, treba zapísať ešte %llu, no nedá sa to" -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1681 #, c-format msgid "Problem closing the file %s" msgstr "Problém pri zatváraní súboru %s" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1693 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problém pri synchronizovaní súboru %s na %s" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1704 #, c-format msgid "Problem unlinking the file %s" msgstr "Problém pri odstraňovaní súboru %s" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1717 msgid "Problem syncing the file" msgstr "Problém pri synchronizovaní súboru" @@ -2798,7 +2819,7 @@ msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ „%s“ je neznámy na riadku %u v zozname zdrojov %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2807,12 +2828,12 @@ msgstr "" "Nebolo možné vykonať okamžitú konfiguráciu „%s“. Pozri prosím podrobnosti v " "man 5 apt.conf pod APT::Immediate-Configure (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, c-format msgid "Could not configure '%s'. " msgstr "Nedá sa nakonfigurovať „%s“." -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2846,7 +2867,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Problémy sa nedajú opraviť, niektoré balíky držíte v poškodenom stave." -#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 +#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2854,7 +2875,7 @@ msgstr "" "Niektoré indexové súbory sa nepodarilo stiahnuť. Boli ignorované alebo sa " "použili staršie verzie." -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, c-format msgid "List directory %spartial is missing." msgstr "Adresár zoznamov %spartial chýba." @@ -2956,14 +2977,14 @@ msgstr "Vyrovnávacia pamäť má nezlučiteľný systém na správu verzií" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 -#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 -#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 -#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 -#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 -#: apt-pkg/pkgcachegen.cc:561 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Vyskytla sa chyba pri spracovávaní %s (%s%d)" @@ -2986,26 +3007,26 @@ msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Fíha, prekročili ste počet závislostí, ktoré toto APT zvládne spracovať." -#: apt-pkg/pkgcachegen.cc:568 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Pri spracovaní závislostí nebol nájdený balík %s %s" -#: apt-pkg/pkgcachegen.cc:1197 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nedá sa vyhodnotiť zoznam zdrojových balíkov %s" -#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 -#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" msgstr "Načítavajú sa zoznamy balíkov" -#: apt-pkg/pkgcachegen.cc:1302 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "Collecting File poskytuje" -#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäti" @@ -3018,12 +3039,12 @@ msgstr "premenovanie zlyhalo, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "Nezhoda kontrolných MD5 súčtov" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 msgid "Hash Sum mismatch" msgstr "Nezhoda kontrolných haš súčtov" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3032,16 +3053,16 @@ msgstr "" "Nepodarilo sa nájsť očakávanú položku „%s“ v súbore Release (Nesprávna " "položka sources.list alebo chybný formát súboru)" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nepodarilo sa nájsť haš „%s“ v súbore Release" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "Nie sú dostupné žiadne verejné kľúče ku kľúčom s nasledovnými ID:\n" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3050,12 +3071,12 @@ msgstr "" "Súbor Release pre %s vypršal (neplatný od %s). Aktualizácie tohto zdroja " "softvéru sa nepoužijú." -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "V konflikte s distribúciou: %s (očakávalo sa %s ale dostali sme %s)" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3065,12 +3086,12 @@ msgstr "" "použijú sa predošlé indexové súbory. Chyba GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "Chyba GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3079,7 +3100,7 @@ msgstr "" "Nedá sa nájsť súbor s balíkom %s. To by mohlo znamenať, že tento balík je " "potrebné opraviť manuálne (kvôli chýbajúcej architektúre)." -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3088,13 +3109,13 @@ msgstr "" "Nedá sa nájsť súbor s balíkom %s. Asi budete musieť opraviť tento balík " "manuálne." -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Indexové súbory balíka sú narušené. Chýba pole Filename: pre balík %s." -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "Veľkosti sa nezhodujú" @@ -3146,7 +3167,7 @@ msgstr "Identifikuje sa.." msgid "Stored label: %s\n" msgstr "Uložená menovka: %s \n" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 msgid "Unmounting CD-ROM...\n" msgstr "CD-ROM sa odpája...\n" @@ -3210,30 +3231,30 @@ msgstr "" msgid "Copying package lists..." msgstr "Kopírujú sa zoznamy balíkov..." -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "Zapisuje sa nový zoznam zdrojov\n" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "Položky zoznamu zdrojov pre tento disk sú:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "Zapísaných %i záznamov.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Zapísaných %i záznamov s %i chýbajúcimi súbormi.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Zapísaných %i záznamov s %i chybnými súbormi\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Zapísaných %i záznamov s %i chýbajúcimi a %i chybnými súbormi\n" diff --git a/po/sl.po b/po/sl.po index 2bec2772c..91cbe9aee 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2012-06-27 21:29+0000\n" "Last-Translator: Andrej Znidarsic \n" "Language-Team: Slovenian \n" @@ -98,72 +98,72 @@ msgstr "Celotna velikost, izračunana za: " msgid "Package file %s is out of sync." msgstr "Datoteka paketa %s ni usklajena." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Noben paket ni bil najden" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1243 msgid "You must give at least one search pattern" msgstr "Podati morate vsaj en iskalni vzorec" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "Ta ukaz je zastarel. Namesto njega uporabite 'apt-mark showauto'." -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Ni mogoče najti paketa %s" -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1526 msgid "Package files:" msgstr "Datoteke paketa:" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Predpomnilnik ni usklajen, x-ref datoteke paketa ni mogoč" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1547 msgid "Pinned packages:" msgstr "Pripeti paketi:" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "(ni najdeno)" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr " Nameščen: " -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr " Kandidat: " -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "(brez)" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr " Bucika paketa: " #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr " Preglednica različic:" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s za %s kodno preveden na %s %s\n" -#: cmdline/apt-cache.cc:1690 +#: cmdline/apt-cache.cc:1730 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -234,20 +234,28 @@ msgstr "" "Za več podrobnosti si oglejte strani priročnikov apt-cache(8) in apt.conf" "(5).\n" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Navedite ime tega diska, kot je naprimer 'Debian 5.0.3 disk 1'" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" msgstr "Vstavite disk v pogon in pritisnite vnosno tipko" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Priklapljanje '%s' na '%s' je spodletelo" -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Ponovi to opravilo za preostanek CD-jev v vaši zbirki." @@ -481,7 +489,7 @@ msgstr "Ponovna namestitev %s ni možna, ker prejem ni možen.\n" msgid "%s is already the newest version.\n" msgstr "Najnovejša različica %s je že nameščena.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s je bil nastavljen na ročno nameščen.\n" @@ -590,8 +598,8 @@ msgstr "Po tem opravilu bo porabljenega %sB dodatnega prostora.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Po tem opravilu bo sproščenega %sB prostora na disku.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 #, c-format msgid "Couldn't determine free space in %s" msgstr "Ni mogoče določiti prostega prostora v %s" @@ -630,7 +638,7 @@ msgstr "Prekini." msgid "Do you want to continue [Y/n]? " msgstr "Ali želite nadaljevati [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ni mogoče dobiti %s %s\n" @@ -639,7 +647,7 @@ msgstr "Ni mogoče dobiti %s %s\n" msgid "Some files failed to download" msgstr "Prejem nekaterih datotek ni uspel" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "Prejem je dokončan in uporabljen je način samo prejema" @@ -732,7 +740,7 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 msgid "The following information may help to resolve the situation:" msgstr "Naslednji podatki vam bodo morda pomagali rešiti težavo:" @@ -786,7 +794,7 @@ msgstr "" "Nerešene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali " "navedite rešitev)." -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1973 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" @@ -798,33 +806,33 @@ msgstr "" ", da nekateri zahtevani paketi še niso ustvarjeni ali premaknjeni\n" " iz Prihajajočega." -#: cmdline/apt-get.cc:1995 +#: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "Pokvarjeni paketi" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2020 msgid "The following extra packages will be installed:" msgstr "Naslednji dodatni paketi bodo nameščeni:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "Predlagani paketi:" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "Priporočeni paketi:" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "Ni mogoče najti paketa %s" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s je nastavljen na samodejno nameščen.\n" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -832,47 +840,47 @@ msgstr "" "Ta ukaz je zastarel. Namesto njega uporabite 'apt-mark auto' in 'apt-mark " "manual'." -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2184 msgid "Calculating upgrade... " msgstr "Preračunavanje nadgradnje ... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Spodletelo" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2192 msgid "Done" msgstr "Opravljeno" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 msgid "Internal error, problem resolver broke stuff" msgstr "Notranja napaka, reševalnik težav je pokvaril stvari" -#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "Ni mogoče zakleniti mape prejemov" -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Ni mogoče najti vira za prejem različice '%s' paketa '%s'" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "Prejemanje %s %s" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2452 msgid "Must specify at least one package to fetch source for" msgstr "" "Potrebno je navesti vsaj en paket, za katerega želite dobiti izvorno kodo" -#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, c-format msgid "Unable to find a source package for %s" msgstr "Izvornega paketa za %s ni mogoče najti" -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -881,7 +889,7 @@ msgstr "" "OPOMBA: pakiranje '%s' vzdrževano v sistemu nadzora različice '%s' na:\n" "%s\n" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2514 #, c-format msgid "" "Please use:\n" @@ -892,70 +900,70 @@ msgstr "" "bzr branch %s\n" "za pridobitev zadnjih (morda še neizdanih) posodobitev paketa.\n" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2567 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Preskok že prejete datoteke '%s'\n" -#: cmdline/apt-get.cc:2605 +#: cmdline/apt-get.cc:2604 #, c-format msgid "You don't have enough free space in %s" msgstr "Nimate dovolj prostora na %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2613 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potrebno je dobiti %sB/%sB izvornih arhivov.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2618 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potrebno je dobiti %sB izvornih arhivov.\n" -#: cmdline/apt-get.cc:2625 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" msgstr "Dobi vir %s\n" -#: cmdline/apt-get.cc:2663 +#: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "Nekaterih arhivov ni mogoče pridobiti." -#: cmdline/apt-get.cc:2694 +#: cmdline/apt-get.cc:2693 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Odpakiranje že odpakiranih izvornih paketov v %s je bilo preskočeno\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Ukaz odpakiranja '%s' ni uspel.\n" -#: cmdline/apt-get.cc:2707 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Izberite, če je paket 'dpkg-dev' nameščen.\n" -#: cmdline/apt-get.cc:2729 +#: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "Ukaz gradnje '%s' ni uspel.\n" -#: cmdline/apt-get.cc:2749 +#: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "Podrejeno opravilo ni uspelo" -#: cmdline/apt-get.cc:2768 +#: cmdline/apt-get.cc:2767 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:2793 +#: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -964,17 +972,17 @@ msgstr "" "Za %s ni bilo mogoče najti podatkov o arhitekturi. Za nastavitev si oglejte " "apt.conf(5) APT::Architectures" -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ni mogoče dobiti podrobnosti o odvisnostih za gradnjo za %s" -#: cmdline/apt-get.cc:2840 +#: cmdline/apt-get.cc:2839 #, c-format msgid "%s has no build depends.\n" msgstr "%s nima odvisnosti za gradnjo.\n" -#: cmdline/apt-get.cc:3010 +#: cmdline/apt-get.cc:3009 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -982,20 +990,20 @@ msgid "" msgstr "" "odvisnosti %s za %s ni mogoče zadovoljiti, ker %s ni dovoljen na paketih '%s'" -#: cmdline/apt-get.cc:3028 +#: cmdline/apt-get.cc:3027 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s odvisnosti za %s ni mogoče zadostiti, ker ni mogoče najti paketa %s" -#: cmdline/apt-get.cc:3051 +#: cmdline/apt-get.cc:3050 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Ni mogoče zadostiti %s odvisnosti za %s. Nameščen paket %s je preveč nov" -#: cmdline/apt-get.cc:3090 +#: cmdline/apt-get.cc:3089 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1004,7 +1012,7 @@ msgstr "" "odvisnosti %s za %s ni mogoče zadovoljiti, ker je različica kandidata paketa " "%s ne more zadostiti zahtev različice" -#: cmdline/apt-get.cc:3096 +#: cmdline/apt-get.cc:3095 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1013,30 +1021,30 @@ msgstr "" "odvisnosti %s za %s ni mogoče zadovoljiti, ker je različica kandidata paketa " "%s nima različice kandidata" -#: cmdline/apt-get.cc:3119 +#: cmdline/apt-get.cc:3118 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Ni mogoče zadostiti %s odvisnosti za %s: %s" -#: cmdline/apt-get.cc:3135 +#: cmdline/apt-get.cc:3133 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Odvisnosti za gradnjo %s ni bilo mogoče zadostiti." -#: cmdline/apt-get.cc:3140 +#: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "Obdelava odvisnosti za gradnjo je spodletela" -#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, c-format msgid "Changelog for %s (%s)" msgstr "Dnevnik sprememb za %s (%s)" -#: cmdline/apt-get.cc:3368 +#: cmdline/apt-get.cc:3366 msgid "Supported modules:" msgstr "Podprti moduli:" -#: cmdline/apt-get.cc:3409 +#: cmdline/apt-get.cc:3407 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1123,7 +1131,7 @@ msgstr "" " sources.list(5) in apt.conf(5). \n" " Ta APT ima moči super krav.\n" -#: cmdline/apt-get.cc:3574 +#: cmdline/apt-get.cc:3572 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1198,7 +1206,7 @@ msgid "%s was already not hold.\n" msgstr "paket %s je bil že nastavljen kot ne na čakanju.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" @@ -1355,8 +1363,8 @@ msgstr "Povezava je zakasnela" msgid "Server closed the connection" msgstr "Strežnik je zaprl povezavo" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 +#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 msgid "Read error" msgstr "Napaka branja" @@ -1369,8 +1377,8 @@ msgid "Protocol corruption" msgstr "Okvara protokola" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 +#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 msgid "Write error" msgstr "Napaka pisanja" @@ -1513,29 +1521,37 @@ msgstr "Nekaj čudnega se je zgodilo med razreševanjem '%s:%s' (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Ni se mogoče povezati z %s:%s:" -#: methods/gpgv.cc:169 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Notranja napaka: Dober podpis, toda ni mogoče določiti podpisa ključa?!" -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Najden je bil vsaj en neveljaven podpis." -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Ni mogoče izvesti 'gpgv' za preverjanje podpisa (je gpgv nameščen?)" -#: methods/gpgv.cc:183 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Neznana napaka med izvajanjem gpgv" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Naslednji podpisi so bili neveljavni:\n" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1617,8 +1633,8 @@ msgstr "Notranja napaka" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1647,7 +1663,12 @@ msgstr "Datoteke zrcalnih strežnikov '%s' ni mogoče najti " msgid "Can not read mirror file '%s'" msgstr "Datoteke zrcalnega strežnika '%s' ni mogoče prebrati" -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "Datoteke zrcalnega strežnika '%s' ni mogoče prebrati" + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "[Zrcalni strežnik: %s]" @@ -1744,7 +1765,7 @@ msgstr "" " -c=? Prebere podano datoteko z nastavitvami\n" " -o=? Nastavi poljubno nastavitveno možnost, na primer. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Ni mogoče pisati na %s" @@ -2116,23 +2137,23 @@ msgstr "" " -c=? Prebere podano datoteko z nastavitvami\n" " -o=? Nastavi poljubno nastavitveno možnost, npr. -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "Ni mogoče ustvariti pip" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "Ni mogoče izvesti gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "Pokvarjen arhiv" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "Nadzorna vsota tar ni uspela, arhiv je pokvarjen" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Neznana vrsta glave TAR %u, član %s" @@ -2353,7 +2374,7 @@ msgstr "%limin %lis" msgid "%lis" msgstr "%lis" -#: apt-pkg/contrib/strutl.cc:1172 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "Izbire %s ni mogoče najti" @@ -2495,112 +2516,112 @@ msgstr "Ni mogoče določiti CD-ROM-a" msgid "Problem closing the gzip file %s" msgstr "Težava med zapiranjem gzip datoteke %s" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Brez uporabe zaklepanja za zaklenjeno datoteko le za branje %s" -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "Ni mogoče odprti zaklenjene datoteke %s" -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:249 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Brez uporabe zaklepanja za datoteko %s, priklopljeno z NTFS" -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "Ni mogoče zakleniti datoteke %s" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "Seznama datotek ni mogoče ustvariti, ker '%s' ni mapa" -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "Preziranje '%s' v mapi '%s', ker ni običajna datoteka" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "Preziranje datoteke '%s' v mapi '%s', ker nima pripone imena datotek" -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" "Preziranje datoteke '%s' v mapi '%s', ker nima veljavne pripone imena datotek" -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Pod-opravilo %s je prejelo segmentacijsko napako." -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:843 #, c-format msgid "Sub-process %s received signal %u." msgstr "Pod-opravilo %s je prejelo signal %u." -#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Pod-opravilo %s je vrnilo kodo napake (%u)" -#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Pod-opravilo %s se je nepričakovano zaključilo" -#: apt-pkg/contrib/fileutl.cc:984 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Could not open file %s" msgstr "Ni mogoče odpreti datoteke %s" -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1062 #, c-format msgid "Could not open file descriptor %d" msgstr "Ni mogoče odpreti opisnika datotek %d" -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "Ni mogoče ustvariti podopravila IPD" -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " msgstr "Ni mogoče izvesti stiskanja " -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1297 #, c-format msgid "read, still have %llu to read but none left" msgstr "Prebrano, še vedno je treba prebrati %llu bajtov, vendar ni nič ostalo" -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "pisanje, preostalo je še %llu za pisanje, vendar ni bilo mogoče pisati" -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1681 #, c-format msgid "Problem closing the file %s" msgstr "Težava med zapiranjem datoteke %s" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1693 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Težava med preimenovanje datoteke %s v %s" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1704 #, c-format msgid "Problem unlinking the file %s" msgstr "Težava med razvezovanjem datoteke %s" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1717 msgid "Problem syncing the file" msgstr "Težava med usklajevanjem datoteke" @@ -2803,7 +2824,7 @@ msgstr "Slabo oblikovana vrstica %u v seznamu virov %s (vrsta)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Vrsta '%s' v vrstici %u na seznamu virov %s ni znana" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2812,12 +2833,12 @@ msgstr "" "Ni mogoče izvesti takojąnje nastavitve na '%s'. Oglejte si man5 apt.conf pod " "APT::Immediate-Configure za podrobnosti. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, c-format msgid "Could not configure '%s'. " msgstr "Ni mogoče nastaviti '%s' " -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2851,7 +2872,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Ni mogoče popraviti težav. Imate pokvarjene pakete." -#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 +#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2859,7 +2880,7 @@ msgstr "" "Prejem nekaterih datotek kazala je spodletel. Bile so prezrte ali pa so bile " "namesto njih uporabljene stare." -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, c-format msgid "List directory %spartial is missing." msgstr "Mapa seznama %spartial manjka." @@ -2961,14 +2982,14 @@ msgstr "Predpomnilnik ima neustrezen sistem različic" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 -#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 -#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 -#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 -#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 -#: apt-pkg/pkgcachegen.cc:561 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Med obdelovanjem %s je prišlo do napake (%s%d)" @@ -2989,26 +3010,26 @@ msgstr "Čestitamo, presegli ste število opisov, ki jih je zmožen APT." msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Čestitamo, presegli ste število odvisnosti, ki jih zmore APT." -#: apt-pkg/pkgcachegen.cc:568 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Paketa %s %s ni bilo mogoče najti med obdelavo odvisnosti datotek" -#: apt-pkg/pkgcachegen.cc:1197 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "Ni mogoče določiti seznama izvornih paketov %s" -#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 -#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" msgstr "Branje seznama paketov" -#: apt-pkg/pkgcachegen.cc:1302 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "Zbiranje dobaviteljev datotek" -#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "Napaka VI med shranjevanjem predpomnilnika virov" @@ -3021,12 +3042,12 @@ msgstr "preimenovanje je spodletelo, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "Neujemanje vsote MD5" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 msgid "Hash Sum mismatch" msgstr "Neujemanje vsote razpršil" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3035,16 +3056,16 @@ msgstr "" "Ni mogoče najti pričakovanega vnosa '%s' v datoteki Release (napačen vnos " "sources.list ali slabo oblikovana datoteka)" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Ni mogoče najti vsote razprševanja za '%s' v datoteki Release" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "Za naslednje ID-je ključa ni na voljo javnih ključev:\n" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3053,12 +3074,12 @@ msgstr "" "Datoteka Release za %s je potekla (neveljavna od %s). Posodobitev za to " "skladišče ne bo uveljavljena." -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribucija v sporu: %s (pričakovana %s, toda dobljena %s)" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3068,12 +3089,12 @@ msgstr "" "zato bodo uporabljene predhodne datoteke kazal. Napaka GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "Napaka GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3082,7 +3103,7 @@ msgstr "" "Ni bilo mogoče najti datoteke za paket %s. Morda boste morali ročno " "popraviti ta paket (zaradi manjkajočega arhiva)." -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3091,7 +3112,7 @@ msgstr "" "Ni bilo mogoče najti datoteke za paket %s. Morda boste morali ročno " "popraviti ta paket." -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3099,7 +3120,7 @@ msgstr "" "Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje za paket " "%s." -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "Neujemanje velikosti" @@ -3151,7 +3172,7 @@ msgstr "Identificiranje ... " msgid "Stored label: %s\n" msgstr "Shranjena oznaka: %s\n" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 msgid "Unmounting CD-ROM...\n" msgstr "Odklapljanje CD-ROM-a ...\n" @@ -3215,30 +3236,30 @@ msgstr "" msgid "Copying package lists..." msgstr "Kopiranje seznama paketov ..." -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "Pisanje novega seznama virov\n" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "Izvorni vnosi za ta disk so:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "Zapisanih je bilo %i zapisov.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Zapisanih je bilo %i zapisov z %i manjkajočimi datotekami.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Zapisanih je bilo %i zapisov z %i neujemajočimi datotekami.\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/sv.po b/po/sv.po index 261f84876..b7502b6cd 100644 --- a/po/sv.po +++ b/po/sv.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2010-08-24 21:18+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -98,72 +98,72 @@ msgstr "Totalt utrymme som kan redogöras för: " msgid "Package file %s is out of sync." msgstr "Paketfilen %s är inte synkroniserad." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Inga paket hittades" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1243 msgid "You must give at least one search pattern" msgstr "Du måste ange minst ett sökmönster" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Kunde inte hitta paketet %s" -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1526 msgid "Package files:" msgstr "\"Package\"-filer:" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Cachen är inte synkroniserad, kan inte korsreferera en paketfil" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1547 msgid "Pinned packages:" msgstr "Fastnålade paket:" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "(hittades inte)" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr " Installerad: " -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr " Kandidat: " -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "(ingen)" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr " Paketnålning: " #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr " Versionstabell:" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s för %s kompilerad den %s %s\n" -#: cmdline/apt-cache.cc:1690 +#: cmdline/apt-cache.cc:1730 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -237,20 +237,28 @@ msgstr "" " -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n" "Se manualsidorna för apt-cache(8) och apt.conf(5) för mer information.\n" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Ange ett namn för denna skiva, exempelvis \"Debian 5.0.3 Disk 1\"" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" msgstr "Mata in en skiva i enheten och tryck på Enter" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Misslyckades med att montera \"%s\" till \"%s\"" -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Upprepa proceduren för resten av cd-skivorna i din uppsättning." @@ -486,7 +494,7 @@ msgstr "Ominstallation av %s är inte möjlig, det kan inte hämtas.\n" msgid "%s is already the newest version.\n" msgstr "%s är redan den senaste versionen.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s är satt till manuellt installerad.\n" @@ -596,8 +604,8 @@ 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:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunde inte fastställa ledigt utrymme i %s" @@ -637,7 +645,7 @@ msgstr "Avbryter." msgid "Do you want to continue [Y/n]? " msgstr "Vill du fortsätta [J/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Misslyckades med att hämta %s %s\n" @@ -646,7 +654,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:1375 cmdline/apt-get.cc:2668 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "Hämtningen färdig i \"endast-hämta\"-läge" @@ -731,7 +739,7 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 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:" @@ -783,7 +791,7 @@ msgstr "" "Otillfredsställda beroenden. Prova med \"apt-get -f install\" utan paket " "(eller ange en lösning)." -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1973 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" @@ -795,78 +803,78 @@ msgstr "" "att några nödvändiga paket ännu inte har skapats eller flyttats\n" "ut från \"Incoming\"." -#: cmdline/apt-get.cc:1995 +#: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "Trasiga paket" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2020 msgid "The following extra packages will be installed:" msgstr "Följande ytterligare paket kommer att installeras:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "Föreslagna paket:" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "Rekommenderade paket:" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "Kunde inte hitta paketet %s" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s är satt till automatiskt installerad.\n" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2184 msgid "Calculating upgrade... " msgstr "Beräknar uppgradering... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Misslyckades" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2192 msgid "Done" msgstr "Färdig" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 msgid "Internal error, problem resolver broke stuff" msgstr "Internt fel, problemlösaren förstörde någonting" -#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "Kunde inte låsa hämtningskatalogen" -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2452 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:2493 cmdline/apt-get.cc:2805 +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, 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:2510 +#: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -876,7 +884,7 @@ msgstr "" "på:\n" "%s\n" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2514 #, fuzzy, c-format msgid "" "Please use:\n" @@ -887,85 +895,85 @@ msgstr "" "bzr get %s\n" "för att hämta senaste (möjligen inte utgivna) uppdateringar av paketet.\n" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2567 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hoppar över redan hämtade filen \"%s\"\n" -#: cmdline/apt-get.cc:2605 +#: cmdline/apt-get.cc:2604 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har inte tillräckligt mycket ledigt utrymme i %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2613 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Behöver hämta %sB/%sB källkodsarkiv.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2618 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Behöver hämta %sB källkodsarkiv.\n" -#: cmdline/apt-get.cc:2625 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" msgstr "Hämtar källkoden %s\n" -#: cmdline/apt-get.cc:2663 +#: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "Misslyckades med att hämta vissa arkiv." -#: cmdline/apt-get.cc:2694 +#: cmdline/apt-get.cc:2693 #, 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:2706 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uppackningskommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:2707 +#: cmdline/apt-get.cc:2706 #, 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:2729 +#: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggkommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:2749 +#: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "Barnprocessen misslyckades" -#: cmdline/apt-get.cc:2768 +#: cmdline/apt-get.cc:2767 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:2793 +#: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, 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:2840 +#: cmdline/apt-get.cc:2839 #, c-format msgid "%s has no build depends.\n" msgstr "%s har inga byggberoenden.\n" -#: cmdline/apt-get.cc:3010 +#: cmdline/apt-get.cc:3009 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -974,7 +982,7 @@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan " "hittas" -#: cmdline/apt-get.cc:3028 +#: cmdline/apt-get.cc:3027 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -983,14 +991,14 @@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan " "hittas" -#: cmdline/apt-get.cc:3051 +#: cmdline/apt-get.cc:3050 #, 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:3090 +#: cmdline/apt-get.cc:3089 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -999,7 +1007,7 @@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom inga tillgängliga " "versioner av paketet %s tillfredsställer versionskraven" -#: cmdline/apt-get.cc:3096 +#: cmdline/apt-get.cc:3095 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1008,31 +1016,31 @@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan " "hittas" -#: cmdline/apt-get.cc:3119 +#: cmdline/apt-get.cc:3118 #, 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:3135 +#: cmdline/apt-get.cc:3133 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggberoenden för %s kunde inte tillfredsställas." -#: cmdline/apt-get.cc:3140 +#: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "Misslyckades med att behandla byggberoenden" # Felmeddelande för misslyckad chdir -#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Ansluter till %s (%s)" -#: cmdline/apt-get.cc:3368 +#: cmdline/apt-get.cc:3366 msgid "Supported modules:" msgstr "Moduler som stöds:" -#: cmdline/apt-get.cc:3409 +#: cmdline/apt-get.cc:3407 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1120,7 +1128,7 @@ msgstr "" "för mer information och flaggor.\n" " Denna APT har Speciella Ko-Krafter.\n" -#: cmdline/apt-get.cc:3574 +#: cmdline/apt-get.cc:3572 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1200,7 +1208,7 @@ msgid "%s was already not hold.\n" msgstr "%s är redan den senaste versionen.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" @@ -1339,8 +1347,8 @@ msgstr "Tidsgränsen för anslutningen överskreds" msgid "Server closed the connection" msgstr "Servern stängde anslutningen" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 +#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 msgid "Read error" msgstr "Läsfel" @@ -1353,8 +1361,8 @@ msgid "Protocol corruption" msgstr "Protokollet skadat" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 +#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 msgid "Write error" msgstr "Skrivfel" @@ -1502,31 +1510,39 @@ msgstr "Något konstigt hände när \"%s:%s\" slogs upp (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Kunde inte ansluta till %s:%s:" -#: methods/gpgv.cc:169 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Internt fel: Korrekt signatur men kunde inte fastställa nyckelns " "fingeravtryck?!" -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Minst en ogiltig signatur träffades på." -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Kunde inte köra \"gpgv\" för att verifiera signatur (är gpgv installerad?)" -#: methods/gpgv.cc:183 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Okänt fel vid körning av gpgv" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Följande signaturer är ogiltiga:\n" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1609,8 +1625,8 @@ msgstr "Internt fel" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1640,7 +1656,12 @@ msgstr "Ingen spegelfil \"%s\" hittades " msgid "Can not read mirror file '%s'" msgstr "Ingen spegelfil \"%s\" hittades " -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "Ingen spegelfil \"%s\" hittades " + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "[Spegel: %s]" @@ -1738,7 +1759,7 @@ msgstr "" " -c=? Läs denna konfigurationsfil.\n" " -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Kunde inte skriva till %s" @@ -2115,23 +2136,23 @@ msgstr "" " -c=? Läs denna konfigurationsfil.\n" " -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "Misslyckades med att skapa rör" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "Misslyckades med att köra gzip" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "Skadat arkiv" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "Tar-kontrollsumma misslyckades, arkivet skadat" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Okänd TAR-rubriktyp %u, del %s" @@ -2354,7 +2375,7 @@ msgstr "%limin %lis" msgid "%lis" msgstr "%lis" -#: apt-pkg/contrib/strutl.cc:1172 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "Valet %s hittades inte" @@ -2495,111 +2516,111 @@ msgstr "Kunde inte ta status på cd-romen." msgid "Problem closing the gzip file %s" msgstr "Problem med att stänga gzip-filen %s" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Använder inte låsning för skrivskyddade låsfilen %s" -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "Kunde inte öppna låsfilen %s" -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:249 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Använder inte låsning för nfs-monterade låsfilen %s" -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "Kunde inte erhålla låset %s" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Underprocessen %s råkade ut för ett segmenteringsfel." -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:843 #, c-format msgid "Sub-process %s received signal %u." msgstr "Underprocessen %s tog emot signal %u." -#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Underprocessen %s svarade med en felkod (%u)" -#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Underprocessen %s avslutades oväntat" -#: apt-pkg/contrib/fileutl.cc:984 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Could not open file %s" msgstr "Kunde inte öppna filen %s" -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1062 #, c-format msgid "Could not open file descriptor %d" msgstr "Kunde inte öppna filhandtag %d" -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "Misslyckades med att skapa underprocess-IPC" -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " msgstr "Misslyckades med att starta komprimerare " -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1297 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "läsning, har fortfarande %lu att läsa men ingenting finns kvar" -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "skrivning, har fortfarande %lu att skriva men kunde inte" -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1681 #, c-format msgid "Problem closing the file %s" msgstr "Problem med att stänga filen %s" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1693 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problem med att byta namn på filen %s till %s" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1704 #, c-format msgid "Problem unlinking the file %s" msgstr "Problem med att avlänka filen %s" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1717 msgid "Problem syncing the file" msgstr "Problem med att synkronisera filen" @@ -2800,7 +2821,7 @@ msgstr "Rad %u i källistan %s har fel format (typ)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ \"%s\" är inte känd på rad %u i listan över källor %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2809,12 +2830,12 @@ msgstr "" "Kunde inte genomföra omedelbar konfiguration på \"%s\". Se man 5 apt.conf " "under APT::Immediate-Configure för information. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Kunde inte öppna filen \"%s\"" -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2850,7 +2871,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Kunde inte korrigera problemen, du har hållit tillbaka trasiga paket." -#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 +#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2859,7 +2880,7 @@ msgstr "" "Vissa indexfiler kunde inte hämtas, de har ignorerats eller så har de gamla " "använts istället." -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, c-format msgid "List directory %spartial is missing." msgstr "Listkatalogen %spartial saknas." @@ -2963,14 +2984,14 @@ msgstr "Cachen har ett inkompatibelt versionssystem" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 -#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 -#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 -#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 -#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 -#: apt-pkg/pkgcachegen.cc:561 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Fel uppstod vid hantering av %s (FindPkg)" @@ -2991,27 +3012,27 @@ msgstr "Grattis, du överskred antalet beskrivningar som denna APT kan hantera." msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Grattis, du överskred antalet beroenden som denna APT kan hantera." -#: apt-pkg/pkgcachegen.cc:568 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Paketet %s %s hittades inte när filberoenden hanterades" -#: apt-pkg/pkgcachegen.cc:1197 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kunde inte ta status på källkodspaketlistan %s" -#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 -#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" msgstr "Läser paketlistor" # Bättre ord? -#: apt-pkg/pkgcachegen.cc:1302 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "Samlar filtillhandahållningar" -#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "In-/utfel vid lagring av källcache" @@ -3024,40 +3045,40 @@ msgstr "namnbyte misslyckades, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "MD5-kontrollsumman stämmer inte" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 msgid "Hash Sum mismatch" msgstr "Hash-kontrollsumman stämmer inte" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Kunde inte tolka \"Release\"-filen %s" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "Det finns ingen öppen nyckel tillgänglig för följande nyckel-id:n:\n" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konflikt i distribution: %s (förväntade %s men fick %s)" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3068,12 +3089,12 @@ msgstr "" "%s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-fel: %s: %s" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3082,7 +3103,7 @@ msgstr "" "Jag kunde inte hitta någon fil för paketet %s. Detta kan betyda att du " "manuellt måste reparera detta paket (på grund av saknad arkitektur)." -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3091,13 +3112,13 @@ msgstr "" "Jag kunde inte hitta någon fil för paketet %s. Detta kan betyda att du " "manuellt måste reparera detta paket." -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Paketindexfilerna är skadede. Inget \"Filename:\"-fält för paketet %s." -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "Storleken stämmer inte" @@ -3149,7 +3170,7 @@ msgstr "Identifierar.. " msgid "Stored label: %s\n" msgstr "Lagrad etikett: %s \n" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 msgid "Unmounting CD-ROM...\n" msgstr "Avmonterar cd-rom...\n" @@ -3213,30 +3234,30 @@ msgstr "" msgid "Copying package lists..." msgstr "Kopierar paketlistor..." -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "Skriver ny källista\n" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "Poster i källistan för denna skiva:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "Skrev %i poster.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Skrev %i poster med %i saknade filer.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Skrev %i poster med %i filer som inte stämmer\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Skrev %i poster med %i saknade filer och %i filer som inte stämmer\n" diff --git a/po/th.po b/po/th.po index 548394cab..c5c480595 100644 --- a/po/th.po +++ b/po/th.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2012-10-27 22:44+0700\n" "Last-Translator: Theppitak Karoonboonyanan \n" "Language-Team: Thai \n" @@ -96,72 +96,72 @@ msgstr "พื้นที่ที่นับรวมทั้งหมด: " msgid "Package file %s is out of sync." msgstr "ข้อมูลแฟ้ม Package %s ไม่ตรงกับความเป็นจริง" -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "ไม่พบแพกเกจ" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1243 msgid "You must give at least one search pattern" msgstr "คุณต้องระบุแพตเทิร์นสำหรับค้นหาอย่างน้อยหนึ่งแพตเทิร์น" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "คำสั่งนี้ไม่แนะนำให้ใช้แล้ว กรุณาใช้ 'apt-mark showauto' แทน" -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "ไม่พบแพกเกจ %s" -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1526 msgid "Package files:" msgstr "แฟ้มแพกเกจ:" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "ข้อมูลแคชไม่ตรงกับความเป็นจริงแล้ว ไม่สามารถอ้างอิงไขว้ระหว่างแฟ้มแพกเกจ" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1547 msgid "Pinned packages:" msgstr "แพกเกจที่ถูกตรึง:" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "(ไม่พบ)" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr " ที่ติดตั้งอยู่: " -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr " รุ่นที่ติดตั้งได้: " -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "(ไม่มี)" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr " การตรึงแพกเกจ: " #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr " ตารางรุ่น:" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s สำหรับ %s คอมไพล์เมื่อ %s %s\n" -#: cmdline/apt-cache.cc:1690 +#: cmdline/apt-cache.cc:1730 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -231,20 +231,28 @@ msgstr "" " -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n" "กรุณาอ่านข้อมูลเพิ่มเติมจาก manual page apt-cache(8) และ apt.conf(5)\n" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "กรุณาตั้งชื่อแผ่น เช่น 'Debian 5.0.3 Disk 1'" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" msgstr "กรุณาใส่แผ่นลงในไดรว์แล้วกด enter" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "ไม่สามารถเมานท์ '%s' ที่ '%s'" -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "ทำเช่นนี้ต่อไปกับแผ่นซีดีที่เหลือในชุด" @@ -476,7 +484,7 @@ msgstr "ไม่สามารถติดตั้ง %s ซ้ำได้ msgid "%s is already the newest version.\n" msgstr "%s เป็นรุ่นใหม่ล่าสุดอยู่แล้ว\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "กำหนด %s ให้เป็นการติดตั้งแบบเลือกเองแล้ว\n" @@ -583,8 +591,8 @@ msgstr "หลังจากการกระทำนี้ ต้องใ msgid "After this operation, %sB disk space will be freed.\n" msgstr "หลังจากการกระทำนี้ เนื้อที่บนดิสก์จะว่างเพิ่มอีก %sB\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 #, c-format msgid "Couldn't determine free space in %s" msgstr "ไม่สามารถคำนวณพื้นที่ว่างใน %s" @@ -623,7 +631,7 @@ msgstr "เลิกทำ" msgid "Do you want to continue [Y/n]? " msgstr "คุณต้องการจะดำเนินการต่อไปหรือไม่ [Y/n]?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" msgstr "ไม่สามารถดาวน์โหลด %s %s\n" @@ -632,7 +640,7 @@ msgstr "ไม่สามารถดาวน์โหลด %s %s\n" msgid "Some files failed to download" msgstr "ดาวน์โหลดบางแฟ้มไม่สำเร็จ" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "ดาวน์โหลดสำเร็จแล้ว และอยู่ในโหมดดาวน์โหลดอย่างเดียว" @@ -713,7 +721,7 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 msgid "The following information may help to resolve the situation:" msgstr "ข้อมูลต่อไปนี้อาจช่วยแก้ปัญหาได้:" @@ -757,7 +765,7 @@ msgstr "" "มีปัญหาความขึ้นต่อกันระหว่างแพกเกจ กรุณาลองใช้ 'apt-get -f install' โดยไม่ระบุแพกเกจ " "(หรือจะระบุทางแก้ก็ได้)" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1973 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" @@ -768,78 +776,78 @@ msgstr "" "หรือถ้าคุณกำลังใช้รุ่น unstable ก็เป็นไปได้ว่าแพกเกจที่จำเป็นบางรายการ\n" "ยังไม่ถูกสร้างขึ้น หรือถูกย้ายออกจาก Incoming" -#: cmdline/apt-get.cc:1995 +#: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "แพกเกจมีปัญหา" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2020 msgid "The following extra packages will be installed:" msgstr "จะติดตั้งแพกเกจเพิ่มเติมต่อไปนี้:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "แพกเกจที่แนะนำ:" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "แพกเกจที่ควรใช้ร่วมกัน:" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "ไม่พบแพกเกจ %s" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "กำหนด %s ให้เป็นการติดตั้งแบบอัตโนมัติแล้ว\n" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "คำสั่งนี้ไม่แนะนำให้ใช้แล้ว กรุณาใช้ 'apt-mark auto' และ 'apt-mark manual' แทน" -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2184 msgid "Calculating upgrade... " msgstr "กำลังคำนวณการปรับรุ่น... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "ล้มเหลว" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2192 msgid "Done" msgstr "เสร็จแล้ว" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 msgid "Internal error, problem resolver broke stuff" msgstr "เกิดข้อผิดพลาดภายใน: กลไกการแก้ปัญหาทำความเสียหาย" -#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "ไม่สามารถล็อคไดเรกทอรีดาวน์โหลด" -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "ไม่พบแหล่งที่จะดาวน์โหลดรุ่น '%s' ของ '%s' ได้" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "กำลังดาวน์โหลด %s %s" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2452 msgid "Must specify at least one package to fetch source for" msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะดาวน์โหลดซอร์สโค้ด" -#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, c-format msgid "Unable to find a source package for %s" msgstr "ไม่พบแพกเกจซอร์สโค้ดสำหรับ %s" -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -848,7 +856,7 @@ msgstr "" "ข้อสังเกต: การจัดทำแพกเกจ '%s' พัฒนาผ่านระบบควบคุมรุ่น '%s' อยู่ที่:\n" "%s\n" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2514 #, c-format msgid "" "Please use:\n" @@ -859,68 +867,68 @@ msgstr "" "bzr branch %s\n" "เพื่อดึงรุ่นล่าสุด (ที่อาจยังไม่ปล่อยออกมา) ของตัวแพกเกจ\n" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2567 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "จะข้ามแฟ้ม '%s' ที่ดาวน์โหลดไว้แล้ว\n" -#: cmdline/apt-get.cc:2605 +#: cmdline/apt-get.cc:2604 #, c-format msgid "You don't have enough free space in %s" msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2613 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB/%sB\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2618 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB\n" -#: cmdline/apt-get.cc:2625 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" msgstr "ดาวน์โหลดซอร์ส %s\n" -#: cmdline/apt-get.cc:2663 +#: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "ไม่สามารถดาวน์โหลดบางแฟ้ม" -#: cmdline/apt-get.cc:2694 +#: cmdline/apt-get.cc:2693 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "จะข้ามการแตกซอร์สของซอร์สที่แตกไว้แล้วใน %s\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "คำสั่งแตกแฟ้ม '%s' ล้มเหลว\n" -#: cmdline/apt-get.cc:2707 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "กรุณาตรวจสอบว่าได้ติดตั้งแพกเกจ 'dpkg-dev' แล้ว\n" -#: cmdline/apt-get.cc:2729 +#: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "คำสั่ง build '%s' ล้มเหลว\n" -#: cmdline/apt-get.cc:2749 +#: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "โพรเซสลูกล้มเหลว" -#: cmdline/apt-get.cc:2768 +#: cmdline/apt-get.cc:2767 msgid "Must specify at least one package to check builddeps for" msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะตรวจสอบสิ่งที่ต้องการสำหรับการ build" -#: cmdline/apt-get.cc:2793 +#: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -928,17 +936,17 @@ msgid "" msgstr "" "ไม่มีข้อมูลสถาปัตยกรรมสำหรับ %s ดูวิธีตั้งค่าที่หัวข้อ APT::Architectures ของ apt.conf(5)" -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "ไม่สามารถอ่านข้อมูลสิ่งที่ต้องการสำหรับการ build ของ %s" -#: cmdline/apt-get.cc:2840 +#: cmdline/apt-get.cc:2839 #, c-format msgid "%s has no build depends.\n" msgstr "%s ไม่ต้องการสิ่งใดสำหรับ build\n" -#: cmdline/apt-get.cc:3010 +#: cmdline/apt-get.cc:3009 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -946,19 +954,19 @@ msgid "" msgstr "" "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่สามารถใช้ %s กับแพกเกจ '%s' ได้" -#: cmdline/apt-get.cc:3028 +#: cmdline/apt-get.cc:3027 #, 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:3051 +#: cmdline/apt-get.cc:3050 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: แพกเกจ %s ที่ติดตั้งไว้ใหม่เกินไป" -#: cmdline/apt-get.cc:3090 +#: cmdline/apt-get.cc:3089 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -967,37 +975,37 @@ msgstr "" "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่มีแพกเกจ %s " "รุ่นที่จะสอดคล้องกับความต้องการรุ่นของแพกเกจได้" -#: cmdline/apt-get.cc:3096 +#: cmdline/apt-get.cc:3095 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะ %s ไม่มีรุ่นที่ติดตั้งได้" -#: cmdline/apt-get.cc:3119 +#: cmdline/apt-get.cc:3118 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: %s" -#: cmdline/apt-get.cc:3135 +#: cmdline/apt-get.cc:3133 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "ไม่สามารถติดตั้งสิ่งที่จำเป็นสำหรับการ build ของ %s ได้" -#: cmdline/apt-get.cc:3140 +#: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "ติดตั้งสิ่งที่จำเป็นสำหรับการ build ไม่สำเร็จ" -#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, c-format msgid "Changelog for %s (%s)" msgstr "ปูมการแก้ไขสำหรับ %s (%s)" -#: cmdline/apt-get.cc:3368 +#: cmdline/apt-get.cc:3366 msgid "Supported modules:" msgstr "มอดูลที่รองรับ:" -#: cmdline/apt-get.cc:3409 +#: cmdline/apt-get.cc:3407 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1084,7 +1092,7 @@ msgstr "" "และ apt.conf(5)\n" " APT นี้มีพลังของ Super Cow\n" -#: cmdline/apt-get.cc:3574 +#: cmdline/apt-get.cc:3572 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1159,7 +1167,7 @@ msgid "%s was already not hold.\n" msgstr "%s ไม่ได้คงรุ่นอยู่ก่อนแล้ว\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" @@ -1312,8 +1320,8 @@ msgstr "หมดเวลารอเชื่อมต่อ" msgid "Server closed the connection" msgstr "เซิร์ฟเวอร์ปิดการเชื่อมต่อ" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 +#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 msgid "Read error" msgstr "การอ่านข้อมูลผิดพลาด" @@ -1326,8 +1334,8 @@ msgid "Protocol corruption" msgstr "มีความเสียหายของโพรโทคอล" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 +#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 msgid "Write error" msgstr "การเขียนข้อมูลผิดพลาด" @@ -1470,28 +1478,36 @@ msgstr "เกิดปัญหาร้ายแรงบางอย่าง msgid "Unable to connect to %s:%s:" msgstr "ไม่สามารถเชื่อมต่อไปยัง %s:%s:" -#: methods/gpgv.cc:169 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "ข้อผิดพลาดภายใน: ลายเซ็นใช้การได้ แต่ไม่สามารถระบุลายนิ้วมือของกุญแจ?!" -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "พบลายเซ็นที่ใช้การไม่ได้อย่างน้อยหนึ่งรายการ" -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "ไม่สามารถเรียก 'gpgv' เพื่อตรวจสอบลายเซ็น (ได้ติดตั้ง gpgv ไว้หรือไม่?)" -#: methods/gpgv.cc:183 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุขณะเรียก gpgv" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "ลายเซ็นต่อไปนี้ใช้การไม่ได้:\n" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1572,8 +1588,8 @@ msgstr "ข้อผิดพลาดภายใน" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1602,7 +1618,12 @@ msgstr "ไม่พบแฟ้มแหล่งสำเนา '%s'" msgid "Can not read mirror file '%s'" msgstr "ไม่สามารถอ่านแฟ้มแหล่งสำเนา '%s'" -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "ไม่สามารถอ่านแฟ้มแหล่งสำเนา '%s'" + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "[แหล่งสำเนา: %s]" @@ -1693,7 +1714,7 @@ msgstr "" " -c=? อ่านแฟ้มค่าตั้งนี้\n" " -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "ไม่สามารถเขียนลงแฟ้ม %s" @@ -2059,23 +2080,23 @@ msgstr "" " -c=? อ่านแฟ้มค่าตั้งนี้\n" " -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "สร้างไปป์ไม่สำเร็จ" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "เรียก gzip ไม่สำเร็จ" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "แฟ้มจัดเก็บเสียหาย" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "checksum ของแฟ้ม tar ผิดพลาด แฟ้มจัดเก็บเสียหาย" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "พบชนิด %u ของข้อมูลส่วนหัว TAR ที่ไม่รู้จัก ที่สมาชิก %s" @@ -2294,7 +2315,7 @@ msgstr "%liนาที %liวิ" msgid "%lis" msgstr "%liวิ" -#: apt-pkg/contrib/strutl.cc:1172 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "ไม่พบรายการเลือก %s" @@ -2434,111 +2455,111 @@ msgstr "ไม่สามารถ stat ซีดีรอม" msgid "Problem closing the gzip file %s" msgstr "เกิดปัญหาขณะปิดแฟ้ม gzip %s" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "จะไม่ใช้การล็อคกับแฟ้มล็อค %s ที่อ่านได้อย่างเดียว" -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "ไม่สามารถเปิดแฟ้มล็อค %s" -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:249 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "จะไม่ใช้การล็อคกับแฟ้มล็อค %s ที่เมานท์ผ่าน nfs" -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "ไม่สามารถล็อค %s" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "ไม่สามารถสร้างรายชื่อแฟ้มได้ เนื่องจาก '%s' ไม่ใช่ไดเรกทอรี" -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "จะละเลย '%s' ในไดเรกทอรี '%s' เนื่องจากไม่ใช่แฟ้มธรรมดา" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "จะละเลย '%s' ในไดเรกทอรี '%s' เนื่องจากไม่มีส่วนขยายในชื่อแฟ้ม" -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "จะละเลย '%s' ในไดเรกทอรี '%s' เนื่องจากส่วนขยายในชื่อแฟ้มไม่สามารถใช้การได้" -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "โพรเซสย่อย %s เกิดข้อผิดพลาดของการใช้ย่านหน่วยความจำ (segmentation fault)" -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:843 #, c-format msgid "Sub-process %s received signal %u." msgstr "โพรเซสย่อย %s ได้รับสัญญาณ %u" -#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "โพรเซสย่อย %s คืนค่าข้อผิดพลาด (%u)" -#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "โพรเซสย่อย %s จบการทำงานกะทันหัน" -#: apt-pkg/contrib/fileutl.cc:984 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Could not open file %s" msgstr "ไม่สามารถเปิดแฟ้ม %s" -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1062 #, c-format msgid "Could not open file descriptor %d" msgstr "ไม่สามารถเปิด file destriptor %d" -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "สร้าง IPC ของโพรเซสย่อยไม่สำเร็จ" -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " msgstr "เรียกทำงานตัวบีบอัดไม่สำเร็จ" -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1297 #, c-format msgid "read, still have %llu to read but none left" msgstr "read: ยังเหลือ %llu ที่ยังไม่ได้อ่าน แต่ข้อมูลหมดแล้ว" -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "write: ยังเหลือ %llu ที่ยังไม่ได้เขียน แต่ไม่สามารถเขียนได้" -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1681 #, c-format msgid "Problem closing the file %s" msgstr "เกิดปัญหาขณะปิดแฟ้ม %s" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1693 #, c-format msgid "Problem renaming the file %s to %s" msgstr "เกิดปัญหาขณะเปลี่ยนชื่อแฟ้ม %s ไปเป็น %s" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1704 #, c-format msgid "Problem unlinking the file %s" msgstr "เกิดปัญหาขณะลบแฟ้ม %s" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1717 msgid "Problem syncing the file" msgstr "เกิดปัญหาขณะ sync แฟ้ม" @@ -2735,7 +2756,7 @@ msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล msgid "Type '%s' is not known on line %u in source list %s" msgstr "ไม่รู้จักชนิด '%s' ที่บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2744,12 +2765,12 @@ msgstr "" "ไม่สามารถตั้งค่า '%s' แบบทันทีได้ กรุณาอ่านรายละเอียดเพิ่มเติมจาก man 5 apt.conf ที่หัวข้อ " "APT::Immediate-Configure (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, c-format msgid "Could not configure '%s'. " msgstr "ไม่สามารถตั้งค่า '%s'" -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2784,13 +2805,13 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "ไม่สามารถแก้ปัญหาได้ คุณได้คงรุ่นแพกเกจที่เสียอยู่ไว้" -#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 +#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." msgstr "ดาวน์โหลดแฟ้มดัชนีบางแฟ้มไม่สำเร็จ จะข้ามรายการดังกล่าวไป หรือใช้ข้อมูลเก่าแทน" -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, c-format msgid "List directory %spartial is missing." msgstr "ไม่มีไดเรกทอรีรายชื่อแพกเกจ %spartial" @@ -2890,14 +2911,14 @@ msgstr "แคชมีระบบนับรุ่นที่ไม่ตร #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 -#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 -#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 -#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 -#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 -#: apt-pkg/pkgcachegen.cc:561 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (%s%d)" @@ -2918,26 +2939,26 @@ msgstr "โอ้ คุณมาถึงขีดจำกัดจำนว msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนความสัมพันธ์ระหว่างแพกเกจที่ APT สามารถรองรับได้แล้ว" -#: apt-pkg/pkgcachegen.cc:568 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "ไม่พบแพกเกจ %s %s ขณะประมวลผลความขึ้นต่อแฟ้ม" -#: apt-pkg/pkgcachegen.cc:1197 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "ไม่สามารถ stat รายการแพกเกจซอร์ส %s" -#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 -#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" msgstr "กำลังอ่านรายชื่อแพกเกจ" -#: apt-pkg/pkgcachegen.cc:1302 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "กำลังเก็บข้อมูลแฟ้มที่ตระเตรียมให้" -#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "เกิดข้อผิดพลาด IO ขณะบันทึกแคชของซอร์ส" @@ -2950,12 +2971,12 @@ msgstr "เปลี่ยนชื่อไม่สำเร็จ: %s (%s -> msgid "MD5Sum mismatch" msgstr "MD5Sum ไม่ตรงกัน" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 msgid "Hash Sum mismatch" msgstr "ผลรวมแฮชไม่ตรงกัน" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -2964,16 +2985,16 @@ msgstr "" "ไม่พบรายการ '%s' ที่ต้องการในแฟ้ม Release (รายการ sources.list ไม่ถูกต้อง " "หรือแฟ้มผิดรูปแบบ)" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "ไม่พบผลรวมแฮชสำหรับ '%s' ในแฟ้ม Release" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "ไม่มีกุญแจสาธารณะสำหรับกุญแจหมายเลขต่อไปนี้:\n" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -2982,12 +3003,12 @@ msgstr "" "แฟ้ม Release สำหรับ %s หมดอายุแล้ว (ตั้งแต่ %s ที่แล้ว) จะไม่ใช้รายการปรับรุ่นต่างๆ " "ของคลังแพกเกจนี้" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "ชุดจัดแจกขัดแย้งกัน: %s (ต้องการ %s แต่พบ %s)" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2997,32 +3018,32 @@ msgstr "" "ข้อผิดพลาดจาก GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "ข้อผิดพลาดจาก GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "ไม่พบแฟ้มสำหรับแพกเกจ %s คุณอาจต้องแก้ปัญหาแพกเกจนี้เอง (ไม่มี arch)" -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package." msgstr "ไม่พบแฟ้มสำหรับแพกเกจ %s คุณอาจต้องแก้ปัญหาแพกเกจนี้เอง" -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "แฟ้มดัชนีแพกเกจเสียหาย ไม่มีข้อมูล Filename: (ชื่อแฟ้ม) สำหรับแพกเกจ %s" -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "ขนาดไม่ตรงกัน" @@ -3074,7 +3095,7 @@ msgstr "กำลังตรวจสอบชื่อแผ่น.. " msgid "Stored label: %s\n" msgstr "ชื่อที่เก็บไว้: %s\n" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 msgid "Unmounting CD-ROM...\n" msgstr "กำลังเลิกเมานท์ซีดีรอม...\n" @@ -3136,30 +3157,30 @@ msgstr "" msgid "Copying package lists..." msgstr "กำลังคัดลอกรายชื่อแพกเกจ..." -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "กำลังเขียนรายชื่อแหล่งแพกเกจแหล่งใหม่\n" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "บรรทัดรายชื่อแหล่งแพกเกจสำหรับแผ่นนี้คือ:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "เขียนแล้ว %i ระเบียน\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มขาดหาย %i แฟ้ม\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มผิดขนาด %i แฟ้ม\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มขาดหาย %i แฟ้ม และแฟ้มผิดขนาด %i แฟ้ม\n" diff --git a/po/tl.po b/po/tl.po index 6fd464bb1..f5059f3e8 100644 --- a/po/tl.po +++ b/po/tl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2007-03-29 21:36+0800\n" "Last-Translator: Eric Pareja \n" "Language-Team: Tagalog \n" @@ -101,73 +101,73 @@ msgstr "Kabuuan ng puwang na napag-tuosan: " msgid "Package file %s is out of sync." msgstr "Wala sa sync ang talaksan ng paketeng %s." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Walang nahanap na mga pakete" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1243 #, fuzzy msgid "You must give at least one search pattern" msgstr "Kailangan niyong magbigay ng isa lamang na pattern" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Hindi mahanap ang paketeng %s" -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1526 msgid "Package files:" msgstr "Talaksang Pakete:" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Wala sa sync ang cache, hindi ma-x-ref ang talaksang pakete" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1547 msgid "Pinned packages:" msgstr "Mga naka-Pin na Pakete:" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "(hindi nahanap)" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr " Nakaluklok: " -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr " Kandidato: " -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "(wala)" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr " Naka-Pin na Pakete: " #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr " Talaang Bersyon:" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format 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:1690 +#: cmdline/apt-cache.cc:1730 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -243,21 +243,29 @@ msgstr "" "Basahin ang pahina ng manwal ng apt-cache(8) at apt.conf(5) para sa \n" "karagdagang impormasyon\n" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 #, fuzzy msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Bigyan ng pangalan ang Disk na ito, tulad ng 'Debian 2.1r1 Disk 1'" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" msgstr "Paki-pasok ang isang Disk sa drive at pindutin ang enter" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Bigo ang pagpangalan muli ng %s tungong %s" -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Ulitin ang prosesong ito para sa lahat ng mga CD sa inyong set." @@ -493,7 +501,7 @@ msgstr "Ang pagluklok muli ng %s ay hindi maaari, hindi ito makuha.\n" msgid "%s is already the newest version.\n" msgstr "%s ay pinakabagong bersyon na.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ngunit ang %s ay iluluklok" @@ -607,8 +615,8 @@ 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:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 #, c-format msgid "Couldn't determine free space in %s" msgstr "Hindi matantsa ang libreng puwang sa %s" @@ -647,7 +655,7 @@ msgstr "Abort." msgid "Do you want to continue [Y/n]? " msgstr "Nais niyo bang magpatuloy [O/h]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Bigo sa pagkuha ng %s %s\n" @@ -656,7 +664,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:1375 cmdline/apt-get.cc:2668 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang" @@ -734,7 +742,7 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 msgid "The following information may help to resolve the situation:" msgstr "" "Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:" @@ -785,7 +793,7 @@ msgstr "" "May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang " "mga pakete (o magtakda ng solusyon)." -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1973 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" @@ -796,85 +804,85 @@ 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:1995 +#: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "Sirang mga pakete" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2020 msgid "The following extra packages will be installed:" msgstr "Ang mga sumusunod na extra na pakete ay luluklokin:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "Mga paketeng mungkahi:" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "Mga paketeng rekomendado:" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "Hindi mahanap ang paketeng %s" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "ngunit ang %s ay iluluklok" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2184 msgid "Calculating upgrade... " msgstr "Sinusuri ang pag-upgrade... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Bigo" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2192 msgid "Done" msgstr "Tapos" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 msgid "Internal error, problem resolver broke stuff" msgstr "Error na internal, may nasira ang problem resolver" -#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "Hindi maaldaba ang directory ng download" -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2452 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:2493 cmdline/apt-get.cc:2805 +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, c-format msgid "Unable to find a source package for %s" msgstr "Hindi mahanap ang paketeng source para sa %s" -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2514 #, c-format msgid "" "Please use:\n" @@ -882,85 +890,85 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2567 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Linaktawan ang nakuha na na talaksan '%s'\n" -#: cmdline/apt-get.cc:2605 +#: cmdline/apt-get.cc:2604 #, c-format msgid "You don't have enough free space in %s" msgstr "Kulang kayo ng libreng puwang sa %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2613 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Kailangang kumuha ng %sB/%sB ng arkibong source.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2618 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Kailangang kumuha ng %sB ng arkibong source.\n" -#: cmdline/apt-get.cc:2625 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" msgstr "Kunin ang Source %s\n" -#: cmdline/apt-get.cc:2663 +#: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "Bigo sa pagkuha ng ilang mga arkibo." -#: cmdline/apt-get.cc:2694 +#: cmdline/apt-get.cc:2693 #, 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:2706 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Bigo ang utos ng pagbuklat '%s'.\n" -#: cmdline/apt-get.cc:2707 +#: cmdline/apt-get.cc:2706 #, 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:2729 +#: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "Utos na build '%s' ay bigo.\n" -#: cmdline/apt-get.cc:2749 +#: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "Bigo ang prosesong anak" -#: cmdline/apt-get.cc:2768 +#: cmdline/apt-get.cc:2767 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:2793 +#: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, 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:2840 +#: cmdline/apt-get.cc:2839 #, c-format msgid "%s has no build depends.\n" msgstr "Walang build depends ang %s.\n" -#: cmdline/apt-get.cc:3010 +#: cmdline/apt-get.cc:3009 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -969,7 +977,7 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi " "mahanap" -#: cmdline/apt-get.cc:3028 +#: cmdline/apt-get.cc:3027 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -978,14 +986,14 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi " "mahanap" -#: cmdline/apt-get.cc:3051 +#: cmdline/apt-get.cc:3050 #, 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:3090 +#: cmdline/apt-get.cc:3089 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -994,7 +1002,7 @@ 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:3096 +#: cmdline/apt-get.cc:3095 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1003,30 +1011,30 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi " "mahanap" -#: cmdline/apt-get.cc:3119 +#: cmdline/apt-get.cc:3118 #, 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:3135 +#: cmdline/apt-get.cc:3133 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Hindi mabuo ang build-dependencies para sa %s." -#: cmdline/apt-get.cc:3140 +#: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "Bigo sa pagproseso ng build dependencies" -#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Kumokonekta sa %s (%s)" -#: cmdline/apt-get.cc:3368 +#: cmdline/apt-get.cc:3366 msgid "Supported modules:" msgstr "Suportadong mga Module:" -#: cmdline/apt-get.cc:3409 +#: cmdline/apt-get.cc:3407 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1111,7 +1119,7 @@ msgstr "" "para sa karagdagang impormasyon at mga option.\n" " Ang APT na ito ay may Kapangyarihan Super Kalabaw.\n" -#: cmdline/apt-get.cc:3574 +#: cmdline/apt-get.cc:3572 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1182,7 +1190,7 @@ msgid "%s was already not hold.\n" msgstr "%s ay pinakabagong bersyon na.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" @@ -1321,8 +1329,8 @@ msgstr "Lumipas ang koneksyon" msgid "Server closed the connection" msgstr "Sinarhan ng server ang koneksyon" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 +#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 msgid "Read error" msgstr "Error sa pagbasa" @@ -1335,8 +1343,8 @@ msgid "Protocol corruption" msgstr "Sira ang protocol" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 +#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 msgid "Write error" msgstr "Error sa pagsulat" @@ -1479,32 +1487,40 @@ 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:169 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Error na internal: Tanggap na lagda, ngunit hindi malaman ang key " "fingerprint?!" -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Hindi kukulang sa isang hindi tanggap na lagda ang na-enkwentro." -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:172 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Hindi maitakbo ang '%s' upang maberipika ang lagda (nakaluklok ba ang gpgv?)" -#: methods/gpgv.cc:183 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Hindi kilalang error sa pag-execute ng gpgv" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Ang sumusunod na mga lagda ay imbalido:\n" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1587,8 +1603,8 @@ msgstr "Internal na error" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1617,7 +1633,12 @@ msgstr "" msgid "Can not read mirror file '%s'" msgstr "Hindi mabuksan ang talaksang %s" -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "Hindi mabuksan ang talaksang %s" + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "" @@ -1712,7 +1733,7 @@ msgstr "" " -c=? Basahin ang talaksang pagkaayos na ito\n" " -o=? Itakda ang isang optiong pagkaayos, hal. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Hindi makapagsulat sa %s" @@ -2090,23 +2111,23 @@ msgstr "" " -c=? Basahin ang talaksang pagkaayos na ito\n" " -o=? Itakda ang isang option ng pagkaayos, hal. -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "Bigo sa paglikha ng mga pipe" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "Bigo sa pagtakbo ng gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "Sirang arkibo" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "Bigo ang checksum ng tar, sira ang arkibo" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Hindi kilalang uri ng TAR header %u, miyembrong %s" @@ -2327,7 +2348,7 @@ msgstr "" msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1172 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "Piniling %s ay hindi nahanap" @@ -2471,114 +2492,114 @@ msgstr "Bigo sa pag-stat ng cdrom" msgid "Problem closing the gzip file %s" msgstr "Problema sa pagsara ng talaksan" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Hindi ginagamit ang pagaldaba para sa basa-lamang na talaksang aldaba %s" -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "Hindi mabuksan ang talaksang aldaba %s" -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:249 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Hindi gumagamit ng pag-aldaba para sa talaksang aldaba %s na naka-mount sa " "nfs" -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "hindi makuha ang aldaba %s" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Nakatanggap ang sub-process %s ng segmentation fault." -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:843 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Nakatanggap ang sub-process %s ng segmentation fault." -#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Naghudyat ang sub-process %s ng error code (%u)" -#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Ang sub-process %s ay lumabas ng di inaasahan" -#: apt-pkg/contrib/fileutl.cc:984 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Could not open file %s" msgstr "Hindi mabuksan ang talaksang %s" -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1062 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "Hindi makapag-bukas ng pipe para sa %s" -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "Bigo ang paglikha ng subprocess IPC" -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " msgstr "Bigo ang pag-exec ng taga-compress" -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1297 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "pagbasa, mayroong %lu na babasahin ngunit walang natira" -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "pagsulat, mayroon pang %lu na isusulat ngunit hindi makasulat" -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1681 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Problema sa pagsara ng talaksan" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1693 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Problema sa pag-sync ng talaksan" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1704 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Problema sa pag-unlink ng talaksan" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1717 msgid "Problem syncing the file" msgstr "Problema sa pag-sync ng talaksan" @@ -2777,19 +2798,19 @@ msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (uri)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Hindi mabuksan ang talaksang %s" -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2827,7 +2848,7 @@ msgid "Unable to correct problems, you have held broken packages." msgstr "" "Hindi maayos ang mga problema, mayroon kayong sirang mga pakete na naka-hold." -#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 +#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2836,7 +2857,7 @@ msgstr "" "May mga talaksang index na hindi nakuha, sila'y di pinansin, o ginamit ang " "mga luma na lamang." -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "Nawawala ang directory ng talaan %spartial." @@ -2940,14 +2961,14 @@ msgstr "Hindi akma ang versioning system ng cache" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 -#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 -#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 -#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 -#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 -#: apt-pkg/pkgcachegen.cc:561 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "May naganap na error habang prinoseso ang %s (FindPkg)" @@ -2970,27 +2991,27 @@ msgstr "Wow, nalagpasan niyo ang bilang ng bersyon na kaya ng APT na ito." msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Wow, nalagpasan niyo ang bilang ng dependensiya na kaya ng APT na ito." -#: apt-pkg/pkgcachegen.cc:568 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Hindi nahanap ang paketeng %s %s habang prinoseso ang mga dependensiya." -#: apt-pkg/pkgcachegen.cc:1197 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "Hindi ma-stat ang talaan ng pagkukunan ng pakete %s" -#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 -#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" msgstr "Binabasa ang Listahan ng mga Pakete" -#: apt-pkg/pkgcachegen.cc:1302 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "Kinukuha ang Talaksang Provides" -#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "IO Error sa pag-imbak ng source cache" @@ -3003,41 +3024,41 @@ msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "Di tugmang MD5Sum" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 #, fuzzy msgid "Hash Sum mismatch" msgstr "Di tugmang MD5Sum" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Hindi ma-parse ang talaksang pakete %s (1)" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "Walang public key na magamit para sa sumusunod na key ID:\n" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3045,12 +3066,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3059,7 +3080,7 @@ msgstr "" "Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin " "niyong ayusin ng de kamay ang paketeng ito. (dahil sa walang arch)" -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3068,7 +3089,7 @@ msgstr "" "Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin " "niyong ayusin ng de kamay ang paketeng ito." -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3076,7 +3097,7 @@ msgstr "" "Sira ang talaksang index ng mga pakete. Walang Filename: field para sa " "paketeng %s." -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "Di tugmang laki" @@ -3128,7 +3149,7 @@ msgstr "Kinikilala..." msgid "Stored label: %s\n" msgstr "Naka-imbak na Label: %s \n" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "Ina-unmount ang CD-ROM..." @@ -3191,30 +3212,30 @@ msgstr "" msgid "Copying package lists..." msgstr "Kinokopya ang Listahan ng mga Pakete" -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "Sinusulat ang bagong listahan ng pagkukunan\n" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "Mga nakatala sa Listahan ng Source para sa Disc na ito ay:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "Nagsulat ng %i na record.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Nagsulat ng %i na record na may %i na talaksang kulang.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Nagsulat ng %i na record na may %i na talaksang mismatch\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/uk.po b/po/uk.po index 9778a3aa6..f42773acd 100644 --- a/po/uk.po +++ b/po/uk.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-all\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2012-09-25 20:19+0300\n" "Last-Translator: A. Bondarenko \n" "Language-Team: Українська \n" @@ -105,72 +105,72 @@ msgstr "Загальний простір полічений для: " msgid "Package file %s is out of sync." msgstr "Перелік пакунків %s розсинхронізований." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Не знайдено жодного пакунка" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1243 msgid "You must give at least one search pattern" msgstr "Ви повинні задати не менше одного шаблону пошуку" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "Ця команда є застарілою. Будь-ласка використовуйте 'apt-mark showauto'" -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Не можу знайти пакунок %s" -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1526 msgid "Package files:" msgstr "Переліки пакунків:" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Кеш не синхронізований, неможливо знайти посилання на перелік пакунків" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1547 msgid "Pinned packages:" msgstr "Зафіксовані пакунки:" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "(не знайдено)" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr " Встановлено: " -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr " Кандидат: " -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "(відсутній)" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr " Фіксатор(pin) пакунка: " #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr " Таблиця версій:" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s для %s скомпільовано %s %s\n" -#: cmdline/apt-cache.cc:1690 +#: cmdline/apt-cache.cc:1730 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -240,20 +240,28 @@ msgstr "" " -o=? Встановити умовну опцію конфігурації, наприклад, -o dir::cache=/tmp\n" "Дивіться подробиці на man-сторінках apt-cache(8) і apt.conf(5).\n" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Задайте назву для цього Диска, наприклад 'Debian 5.0.3 Disk 1'" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" msgstr "Будь-ласка, вставте Диск у пристрій і натисніть Enter" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Не вдалося під'єднати '%s' до '%s'" -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Повторіть цей процес для решти CD з вашого набору." @@ -491,7 +499,7 @@ msgstr "Перевстановлення %s неможливе, бо він не msgid "%s is already the newest version.\n" msgstr "Вже встановлена найновіша версія %s.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s позначений як встановлений вручну.\n" @@ -603,8 +611,8 @@ msgid "After this operation, %sB disk space will be freed.\n" msgstr "" "Після цієї операції об'єм зайнятого дискового простору зменшиться на %sB.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 #, c-format msgid "Couldn't determine free space in %s" msgstr "Не вдалося визначити кількість вільного місця в %s" @@ -644,7 +652,7 @@ msgstr "Перервано." msgid "Do you want to continue [Y/n]? " msgstr "Бажаєте продовжити [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Не вдалося завантажити %s %s\n" @@ -653,7 +661,7 @@ msgstr "Не вдалося завантажити %s %s\n" msgid "Some files failed to download" msgstr "Деякі файли не вдалося завантажити" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "Завантаження завершено в режимі \"тільки завантаження\"" @@ -740,7 +748,7 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 msgid "The following information may help to resolve the situation:" msgstr "Наступна інформація можливо допоможе Вам виправити ситуацію:" @@ -795,7 +803,7 @@ msgstr "" "Незадоволені залежності. Спробуйте виконати 'apt-get -f install', не " "вказуючи назв пакунків (або вкажіть рішення)." -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1973 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" @@ -806,33 +814,33 @@ msgstr "" "або ж використовуєте нестабільний дистрибутив, і запитані Вами пакунки\n" "ще не створені або були вилучені з Incoming." -#: cmdline/apt-get.cc:1995 +#: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "Зламані пакунки" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2020 msgid "The following extra packages will be installed:" msgstr "Будуть встановлені наступні додаткові пакунки:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "Пропоновані пакунки:" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "Рекомендовані пакунки:" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "Не можу знайти пакунок %s" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s позначений як автоматично встановлений.\n" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -840,48 +848,48 @@ msgstr "" "Ця команда застаріла. Будь-ласка, використовуйте замість неї 'apt-mark auto' " "і 'apt-mark manual'." -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2184 msgid "Calculating upgrade... " msgstr "Обчислення оновлень... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Невдача" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2192 msgid "Done" msgstr "Виконано" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 msgid "Internal error, problem resolver broke stuff" msgstr "Внутрішня помилка, вирішувач проблем щось поламав" -#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "Неможливо заблокувати директорію для завантаження" -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Неможливо знайти джерело для завантаження версії '%s' для '%s'" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "Завантаження %s %s" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2452 msgid "Must specify at least one package to fetch source for" msgstr "" "Вкажіть як мінімум один пакунок, для якого необхідно завантажити вихідні " "тексти" -#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, c-format msgid "Unable to find a source package for %s" msgstr "Неможливо знайти пакунок з вихідними текстами для %s" -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -890,7 +898,7 @@ msgstr "" "УВАГА: Пакування '%s' відбувається в системі контролю версій '%s' на:\n" "%s\n" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2514 #, c-format msgid "" "Please use:\n" @@ -901,71 +909,71 @@ msgstr "" "bzr branch %s\n" "щоб отримати найновіші (потенційно не випущені) оновлення до пакунку.\n" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2567 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускаємо вже завантажений файл '%s'\n" -#: cmdline/apt-get.cc:2605 +#: cmdline/apt-get.cc:2604 #, c-format msgid "You don't have enough free space in %s" msgstr "Недостатньо місця в %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2613 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необхідно завантажити %sB/%sB з архівів вихідних текстів.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2618 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Потрібно завантажити %sB архівів з вихідними текстами.\n" -#: cmdline/apt-get.cc:2625 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" msgstr "Завантаження вихідних текстів %s\n" -#: cmdline/apt-get.cc:2663 +#: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "Деякі архіви не вдалося завантажити." -#: cmdline/apt-get.cc:2694 +#: cmdline/apt-get.cc:2693 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Пропускається розпакування вихідних текстів, тому що вже розпаковано в %s\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Команда розпакування '%s' завершилася невдало.\n" -#: cmdline/apt-get.cc:2707 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2729 +#: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "Команда побудови '%s' закінчилася невдало.\n" -#: cmdline/apt-get.cc:2749 +#: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "Породжений процес завершився невдало" -#: cmdline/apt-get.cc:2768 +#: cmdline/apt-get.cc:2767 msgid "Must specify at least one package to check builddeps for" msgstr "" "Для перевірки залежностей для побудови необхідно вказати як мінімум один " "пакунок" -#: cmdline/apt-get.cc:2793 +#: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -974,17 +982,17 @@ msgstr "" "Відсутня інформація про архітектуру для %s. Дивись apt.conf(5) APT::" "Архітектури для налащтування" -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Неможливо одержати інформацію про залежності для побудови %s" -#: cmdline/apt-get.cc:2840 +#: cmdline/apt-get.cc:2839 #, c-format msgid "%s has no build depends.\n" msgstr "%s не має залежностей для побудови.\n" -#: cmdline/apt-get.cc:3010 +#: cmdline/apt-get.cc:3009 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -993,7 +1001,7 @@ msgstr "" "Залежність типу %s для %s не може бути задоволена, бо %s не є дозволеним на " "'%s' пакунках" -#: cmdline/apt-get.cc:3028 +#: cmdline/apt-get.cc:3027 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1001,14 +1009,14 @@ msgid "" msgstr "" "Залежність типу %s для %s не може бути задоволена, бо пакунок %s не знайдено" -#: cmdline/apt-get.cc:3051 +#: cmdline/apt-get.cc:3050 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Не вдалося задовольнити залежність типу %s для %s: Встановлений пакунок %s " "новіше, аніж треба" -#: cmdline/apt-get.cc:3090 +#: cmdline/apt-get.cc:3089 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1017,7 +1025,7 @@ msgstr "" "Залежність типу %s для %s не може бути задоволена, бо версія пакунку-" "кандидата %s не задовольняє умови по версіям" -#: cmdline/apt-get.cc:3096 +#: cmdline/apt-get.cc:3095 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1026,30 +1034,30 @@ msgstr "" "Залежність типу %s для %s не може бути задоволена, бо немає пакунку-" "кандидата %s потрібної версії" -#: cmdline/apt-get.cc:3119 +#: cmdline/apt-get.cc:3118 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Неможливо задовольнити залежність типу %s для пакунка %s: %s" -#: cmdline/apt-get.cc:3135 +#: cmdline/apt-get.cc:3133 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Залежності для побудови %s не можуть бути задоволені." -#: cmdline/apt-get.cc:3140 +#: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "Обробка залежностей для побудови закінчилася невдало" -#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, c-format msgid "Changelog for %s (%s)" msgstr "Журнал змін для %s (%s)" -#: cmdline/apt-get.cc:3368 +#: cmdline/apt-get.cc:3366 msgid "Supported modules:" msgstr "Підтримувані модулі:" -#: cmdline/apt-get.cc:3409 +#: cmdline/apt-get.cc:3407 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1141,7 +1149,7 @@ msgstr "" "містять більше інформації і опцій.\n" " Цей APT має Супер-Коров'ячу Силу.\n" -#: cmdline/apt-get.cc:3574 +#: cmdline/apt-get.cc:3572 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1216,7 +1224,7 @@ msgid "%s was already not hold.\n" msgstr "%s вже був незафіксований.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" @@ -1376,8 +1384,8 @@ msgstr "Час з'єднання вичерпався" msgid "Server closed the connection" msgstr "Сервер закрив з'єднання" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 +#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 msgid "Read error" msgstr "Помилка зчитування" @@ -1390,8 +1398,8 @@ msgid "Protocol corruption" msgstr "Спотворений протокол" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 +#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 msgid "Write error" msgstr "Помилка запису" @@ -1534,30 +1542,38 @@ msgstr "Сталося щось дивне при спробі отримати msgid "Unable to connect to %s:%s:" msgstr "Неможливо під'єднатися до %s:%s:" -#: methods/gpgv.cc:169 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Внутрішня помилка: Вірний підпис (signature), але не можливо визначити його " "відбиток?!" -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Знайдено як мінімум один невірний підпис." -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Неможливо виконати 'gpgv' для перевірки підпису (чи встановлено gpgv?)" -#: methods/gpgv.cc:183 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Невідома помилка виконання gpgv" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Наступні підписи були невірними:\n" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1640,8 +1656,8 @@ msgstr "Внутрішня помилка" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1670,7 +1686,12 @@ msgstr "Не знайдено файла дзеркала '%s' " msgid "Can not read mirror file '%s'" msgstr "Неможливо прочитати файл дзеркала '%s'" -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "Неможливо прочитати файл дзеркала '%s'" + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "[Дзеркало: %s]" @@ -1769,7 +1790,7 @@ msgstr "" " -c=? Читати зазначений конфігураційний файл\n" " -o=? Вказати довільну опцію, наприклад, -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Неможливо записати в %s" @@ -2152,23 +2173,23 @@ msgstr "" " -c=? читати зазначений файл конфігурації\n" " -o=? встановити довільну опцію, наприклад, -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "Не вдалося створити канали (pipes)" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "Не вдалося виконати gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "Пошкоджений архів" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "Контрольна сума tar архіва невірна, архів пошкоджений" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Невідомий тип заголовку TAR - %u, член %s" @@ -2394,7 +2415,7 @@ msgstr "%liхв %liс" msgid "%lis" msgstr "%liс" -#: apt-pkg/contrib/strutl.cc:1172 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "Вибір %s не знайдено" @@ -2539,116 +2560,116 @@ msgstr "Не вдалося прочитати атрибути cdrom" msgid "Problem closing the gzip file %s" msgstr "Проблема з закриттям gzip файла %s" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Блокування не використовується, так як файл блокування %s доступний тільки " "для зчитування" -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "Неможливо відкрити 'lock' файл %s" -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:249 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Блокування не використовується, так як файл блокування %s знаходиться на " "файловій системі nfs" -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "Неможливо отримати замок %s" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "Неможливо створити перелік файлів, так як '%s' не є директорією" -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "Ігнорується '%s' у директорії '%s', так як не є звичайним файлом" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "Ігнорується файл '%s' у директорії '%s', так як він не має розширення" -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" "Ігнорується файл '%s' у директорії '%s', так як він має невірне розширення" -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Підпроцес %s отримав 'segmentation fault' (фатальна помилка)." -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:843 #, c-format msgid "Sub-process %s received signal %u." msgstr "Підпроцес %s отримав сигнал %u." -#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Підпроцес %s повернув код помилки (%u)" -#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Підпроцес %s раптово завершився" -#: apt-pkg/contrib/fileutl.cc:984 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Could not open file %s" msgstr "Неможливо відкрити файл %s" -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1062 #, c-format msgid "Could not open file descriptor %d" msgstr "Неможливо відкрити файловий дескриптор %d" -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "Не вдалося створити IPC з породженим процесом" -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " msgstr "Не вдалося виконати компресор " -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1297 #, c-format msgid "read, still have %llu to read but none left" msgstr "зчитування, повинен зчитати ще %llu байт, але нічого більше нема" -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "записування, повинен був записати ще %llu байт, але не вдалося" -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1681 #, c-format msgid "Problem closing the file %s" msgstr "Проблема з закриттям файла %s" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1693 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Проблема з перейменуванням файла %s на %s" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1704 #, c-format msgid "Problem unlinking the file %s" msgstr "Проблема з роз'єднанням файла %s" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1717 msgid "Problem syncing the file" msgstr "Проблема з синхронізацією файла" @@ -2847,7 +2868,7 @@ msgstr "Спотворений рядок %u у переліку джерел %s msgid "Type '%s' is not known on line %u in source list %s" msgstr "Невідомий тип '%s' на рядку %u в переліку джерел %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2856,12 +2877,12 @@ msgstr "" "Неможливо прямо налаштувати конфігурацію на '%s'. Будь-ласка, дивіться man 5 " "apt.conf, нижче APT::Immediate-Configure для деталей. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, c-format msgid "Could not configure '%s'. " msgstr "Неможливо налаштувати '%s'." -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2897,7 +2918,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Неможливо усунути проблеми, ви маєте поламані зафіксовані пакунки." -#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 +#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2905,7 +2926,7 @@ msgstr "" "Деякі індексні файли не вдалося завантажити. Вони були зігноровані, або " "замість них були використані старіші версії." -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, c-format msgid "List directory %spartial is missing." msgstr "Відсутня директорія зі списками: %spartial" @@ -3008,14 +3029,14 @@ msgstr "Кеш має несумісну систему призначення #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 -#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 -#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 -#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 -#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 -#: apt-pkg/pkgcachegen.cc:561 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Виникла помилка під час обробки %s (%s%d)" @@ -3036,27 +3057,27 @@ msgstr "Ого! Ви перевищили кількість описів, як msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Ого! Ви перевищили кількість залежностей, які APT може обробити." -#: apt-pkg/pkgcachegen.cc:568 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Пакунок %s %s не був знайдений під час обробки залежностей" -#: apt-pkg/pkgcachegen.cc:1197 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "Не вдалося прочитати атрибути переліку вихідних текстів %s" -#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 -#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" msgstr "Зчитування переліків пакунків" -#: apt-pkg/pkgcachegen.cc:1302 +#: apt-pkg/pkgcachegen.cc:1304 #, fuzzy msgid "Collecting File Provides" msgstr "Збирання інформації про 'File Provides'" -#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "Помилка IO під час збереження кешу вихідних текстів" @@ -3069,12 +3090,12 @@ msgstr "не вдалося перейменувати, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "Невідповідність MD5Sum" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 msgid "Hash Sum mismatch" msgstr "Невідповідність хешу MD5Sum" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3083,16 +3104,16 @@ msgstr "" "Неможливо знайти очікуваний запис '%s' у 'Release' файлі (Невірний запис у " "sources.list, або пошкоджений файл)" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Неможливо знайти хеш-суму для '%s' у 'Release' файлі" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "Відсутній публічний ключ для заданих ідентифікаторів (ID) ключа:\n" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3101,12 +3122,12 @@ msgstr "" "Файл 'Release' для %s застарів (недійсний з %s). Оновлення для цього " "репозиторія не будуть застосовані." -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Конфліктуючий дистрибутив: %s (очікувався %s, але є %s)" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3116,12 +3137,12 @@ msgstr "" "попередні індексні файли будуть використані. Помилка GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "Помилка GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3130,7 +3151,7 @@ msgstr "" "Я не зміг знайти файл для пакунку %s. Можливо, це значить, що вам потрібно " "власноруч виправити цей пакунок. (через відсутність 'arch')" -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3139,14 +3160,14 @@ msgstr "" "Я не зміг знайти файл для пакунку %s. Можливо, це значить, що вам потрібно " "власноруч виправити цей пакунок." -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Індексні файли пакунків пошкоджені. Немає поля 'Filename' для пакунку %s." -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "Невідповідність розміру" @@ -3198,7 +3219,7 @@ msgstr "Ідентифікація.. " msgid "Stored label: %s\n" msgstr "Записано мітку: %s\n" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 msgid "Unmounting CD-ROM...\n" msgstr "Демонтується CD-ROM...\n" @@ -3262,30 +3283,30 @@ msgstr "" msgid "Copying package lists..." msgstr "Копіюються переліки пакунків..." -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "Записується новий перелік вихідних текстів\n" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "Перелік вихідних текстів для цього диска:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "Записано %i записів.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Записано %i записів з %i відсутніми файлами.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Записано %i записів з %i невідповідними файлам\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Записано %i записів з %i відсутніми і %i невідповідними файлами\n" diff --git a/po/vi.po b/po/vi.po index 03e2e5506..54807e201 100644 --- a/po/vi.po +++ b/po/vi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2012-11-20 14:12+0700\n" "Last-Translator: Trần Ngọc Quân \n" "Language-Team: Vietnamese \n" @@ -99,74 +99,74 @@ msgstr "Tổng chỗ đã tính: " msgid "Package file %s is out of sync." msgstr "Tập tin gói %s không đồng bộ được." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Không tìm thấy gói" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1243 msgid "You must give at least one search pattern" msgstr "Bạn phải đưa ra ít nhất 1 chuỗi tìm kiếm" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" "Lệnh này đã bị loại bỏ. Xin hãy dùng lệnh 'apt-mark showauto' để thay thế." -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Không thể định vị gói %s" -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1526 msgid "Package files:" msgstr "Tập tin gói:" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Bộ nhớ tạm không đồng bộ được nên không thể tham chiếu chéo tập tin gói" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1547 msgid "Pinned packages:" msgstr "Các gói đã ghim:" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "(không tìm thấy)" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr " Đã cài đặt: " -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr " Ứng cử: " -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "(không có)" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr " Ghim gói: " #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr " Bảng phiên bản:" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s dành cho %s được biên dịch %s %s\n" -#: cmdline/apt-cache.cc:1690 +#: cmdline/apt-cache.cc:1730 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -240,20 +240,28 @@ msgstr "" "Để tìm thông tin thêm, xem hai trang man (hướng dẫn)\n" " apt-cache(8) và apt.conf(5).\n" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Hãy cung cấp tên cho Đĩa này, như “Debian 5.0.3 Đĩa 1”" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" msgstr "Hãy nạp đĩa vào ổ và bấm nút Enter" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Gặp lỗi khi gắn “%s” vào “%s”" -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Hãy lặp lại tiến trình này cho các Đĩa còn lại trong bộ đĩa của bạn." @@ -489,7 +497,7 @@ msgstr "Không thể cài đặt lại %s vì không thể tải về nó.\n" msgid "%s is already the newest version.\n" msgstr "%s là phiên bản mơi nhất.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s được đặt thành “được cài đặt bằng tay”.\n" @@ -599,8 +607,8 @@ msgstr "Sau thao tác này, %sB dung lượng đĩa thêm sẽ được dùng th msgid "After this operation, %sB disk space will be freed.\n" msgstr "Sau thao tác này, %sB dung lượng đĩa sẽ được giải phóng.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 #, c-format msgid "Couldn't determine free space in %s" msgstr "Không thể tìm được chỗ trống trong %s" @@ -640,7 +648,7 @@ msgstr "Hủy bỏ." msgid "Do you want to continue [Y/n]? " msgstr "Bạn có muốn tiếp tục không? [C/k] " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Việc lấy %s bị lỗi %s\n" @@ -649,7 +657,7 @@ msgstr "Việc lấy %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:1375 cmdline/apt-get.cc:2668 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "Mới tải về xong và trong chế độ chỉ tải về" @@ -732,7 +740,7 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 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:" @@ -777,7 +785,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:1974 +#: cmdline/apt-get.cc:1973 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" @@ -789,33 +797,33 @@ 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:1995 +#: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "Gói bị hỏng" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2020 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:2111 +#: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "Các gói đề nghị:" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "Gói khuyến khích:" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "Không tìm thấy gói %s" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s được đặt thành “được tự động cài đặt”.\n" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -823,46 +831,46 @@ msgstr "" "Lệnh này đã bị loại bỏ. Xin hãy dùng lệnh 'apt-mark auto' và 'apt-mark " "manual' để thay thế." -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2184 msgid "Calculating upgrade... " msgstr "Đang tính bước nâng cấp... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Gặp lỗi" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2192 msgid "Done" msgstr "Hoàn tất" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 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:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "Không thể khoá thư mục tải về" -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Không tìm thấy nguồn cho việc tải về phiên bản '%s' of '%s'" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "Đang tải về %s %s" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2452 msgid "Must specify at least one package to fetch source for" msgstr "Phải ghi rõ ít nhất một gói cho đó cần lấy mã nguồn" -#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, 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:2510 +#: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -872,7 +880,7 @@ msgstr "" "“%s” tại:\n" "%s\n" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2514 #, c-format msgid "" "Please use:\n" @@ -883,69 +891,69 @@ msgstr "" "bzr branch %s\n" "để lấy các gói mới nhất (có thể là chưa phát hành).\n" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2567 #, 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:2605 +#: cmdline/apt-get.cc:2604 #, 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" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2613 #, 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" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2618 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Cần phải lấy %sB từ kho nguồn.\n" -#: cmdline/apt-get.cc:2625 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" msgstr "Lấy nguồn %s\n" -#: cmdline/apt-get.cc:2663 +#: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "Việc lấy một số kho bị lỗi." -#: cmdline/apt-get.cc:2694 +#: cmdline/apt-get.cc:2693 #, 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:2706 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Lệnh giải nén “%s” bị lỗi.\n" -#: cmdline/apt-get.cc:2707 +#: cmdline/apt-get.cc:2706 #, 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:2729 +#: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "Lệnh xây dụng “%s” bị lỗi.\n" -#: cmdline/apt-get.cc:2749 +#: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "Tiến trình con bị lỗi" -#: cmdline/apt-get.cc:2768 +#: cmdline/apt-get.cc:2767 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:2793 +#: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -954,17 +962,17 @@ msgstr "" "Không có thông tin kiến trúc sẵn sàng cho %s. Xem apt.conf(5) APT::" "Architectures để cài đặt" -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, 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:2840 +#: cmdline/apt-get.cc:2839 #, 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:3010 +#: cmdline/apt-get.cc:3009 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -972,20 +980,20 @@ msgid "" msgstr "" "phụ thuộc %s cho %s không ổn thỏa bởi vì %s không được cho phép trên gói '%s'" -#: cmdline/apt-get.cc:3028 +#: cmdline/apt-get.cc:3027 #, 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:3051 +#: cmdline/apt-get.cc:3050 #, 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:3090 +#: cmdline/apt-get.cc:3089 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -994,7 +1002,7 @@ msgstr "" "cách phụ thuộc %s cho %s không thể được thỏa mãn phiên bản ứng cử của gói %s " "có thể thỏa mãn điều kiện phiên bản" -#: cmdline/apt-get.cc:3096 +#: cmdline/apt-get.cc:3095 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1003,30 +1011,30 @@ msgstr "" "cách phụ thuộc %s cho %s không thể được thỏa mãn bởi vì gói %s không có bản " "ứng cử" -#: cmdline/apt-get.cc:3119 +#: cmdline/apt-get.cc:3118 #, 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:3135 +#: cmdline/apt-get.cc:3133 #, 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:3140 +#: cmdline/apt-get.cc:3138 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:3233 cmdline/apt-get.cc:3245 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, c-format msgid "Changelog for %s (%s)" msgstr "Changelog cho %s (%s)" -#: cmdline/apt-get.cc:3368 +#: cmdline/apt-get.cc:3366 msgid "Supported modules:" msgstr "Mô-đun đã hỗ trợ:" -#: cmdline/apt-get.cc:3409 +#: cmdline/apt-get.cc:3407 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1119,7 +1127,7 @@ msgstr "" " apt-get(8), sources.list(5) và apt.conf(5).\n" " Trình APT này có năng lực của siêu bò.\n" -#: cmdline/apt-get.cc:3574 +#: cmdline/apt-get.cc:3572 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1194,7 +1202,7 @@ msgid "%s was already not hold.\n" msgstr "%s đã sẵn được đặt là chưa nắm giữ.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" @@ -1353,8 +1361,8 @@ msgstr "Thời hạn kết nối" msgid "Server closed the connection" msgstr "Máy phục vụ đã đóng kết nối" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 +#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 msgid "Read error" msgstr "Lỗi đọc" @@ -1367,8 +1375,8 @@ msgid "Protocol corruption" msgstr "Giao thức bị hỏng" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 +#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 msgid "Write error" msgstr "Lỗi ghi" @@ -1511,30 +1519,38 @@ msgstr "Gặp lỗi nghiệm trọng khi tháo gỡ “%s:%s” (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Không thể kết nối đến %s: %s:" -#: methods/gpgv.cc:169 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Lỗi nội bộ: chữ ký đúng, nhưng không thể quyết định vân tay của khóa ?!" -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "Gặp ít nhất một chữ ký không hợp lệ." -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Không thể thực hiện “gpgv” để thẩm tra chữ ký (gpgv đã được cài đặt chưa?)" -#: methods/gpgv.cc:183 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "Gặp lỗi không rõ khi thực hiện gpgv" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "Những chữ ký theo đây vẫn không hợp lệ:\n" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1620,8 +1636,8 @@ msgstr "Gặp lỗi nội bộ" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1650,7 +1666,12 @@ msgstr "Không tìm thấy tập tin nhân bản “%s”" msgid "Can not read mirror file '%s'" msgstr "Không thể đọc tập tin mirror '%s'" -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "Không thể đọc tập tin mirror '%s'" + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "[Nhân bản: %s]" @@ -1750,7 +1771,7 @@ msgstr "" " -c=? Đọc tập tin cấu hình này\n" " -o=? Đặt một tùy chọn cấu hình nhiệm ý, v.d. “-o dir::cache=/tmp”\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Không thể ghi vào %s" @@ -2139,23 +2160,23 @@ msgstr "" " -c=? Đọc tập tin cấu hình này\n" " -o=? Đặt tùy chọn cấu hình nhiệm ý, v.d. “-o dir::cache=/tmp”\n" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "Việc tạo những ống bị lỗi" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "Việc thực hiện gzip bị lỗi " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "Kho bị hỏng." -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "Lỗi kiểm tổng tar, kho bị hỏng" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Không rõ kiểu phần đầu tar %u, bộ phận %s" @@ -2379,7 +2400,7 @@ msgstr "%liphút %ligiây" msgid "%lis" msgstr "%ligiây" -#: apt-pkg/contrib/strutl.cc:1172 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "Không tìm thấy vùng chọn %s" @@ -2520,44 +2541,44 @@ msgstr "Việc lấy cac thông tin cho đĩa CD-ROM bị lỗi" msgid "Problem closing the gzip file %s" msgstr "Gặp vấn đề khi đóng tập tin gzip %s" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Không dùng khả năng khóa cho tập tin khóa chỉ đọc %s" -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "Không thể mở tập tin khóa %s" -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:249 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Không dùng khả năng khóa cho tập tin khóa đã lắp kiểu NFS %s" -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "Không thể lấy khóa %s" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" "Liệt kê các tập tin không thể được tạo ra vì '%s' không phải là một thư mục" -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "Bỏ qua '%s' trong thư mục '%s'vì nó không phải là tập tin bình thường" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" "Bỏ qua tập tin '%s' trong thư mục '%s' vì nó không có phần đuôi mở rộng" -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" @@ -2565,70 +2586,70 @@ msgstr "" "Bỏ qua tập tin '%s' trong thư mục '%s' vì nó có phần đuôi mở rộng không hợp " "lệ" -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Tiến trình phụ %s đã nhận một lỗi chia ra từng đoạn." -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:843 #, c-format msgid "Sub-process %s received signal %u." msgstr "Tiến trình phụ %s đã nhận tín hiệu %u." -#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Tiến trình phụ %s đã trả lời mã lỗi (%u)" -#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Tiến trình phụ %s đã thoát bất thường" -#: apt-pkg/contrib/fileutl.cc:984 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Could not open file %s" msgstr "Không thể mở tập tin %s" -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1062 #, c-format msgid "Could not open file descriptor %d" msgstr "Không thể mở bộ mô tả tập tin %d" -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "Việc tạo tiến trình con IPC bị lỗi" -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " msgstr "Việc thực hiện bô nén bị lỗi " -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1297 #, c-format msgid "read, still have %llu to read but none left" msgstr "đọc, còn cần đọc %llu nhưng mà không có gì còn lại cả" -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "ghi, còn cần ghi %llu nhưng mà không thể" -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1681 #, c-format msgid "Problem closing the file %s" msgstr "Gặp vấn đề khi đóng tập tin %s" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1693 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Gặp vấn đề khi thay tên tập tin %s bằng %s" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1704 #, c-format msgid "Problem unlinking the file %s" msgstr "Gặp vấn đề khi bỏ liên kết tập tin %s" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1717 msgid "Problem syncing the file" msgstr "Gặp vấn đề khi đồng bộ hóa tập tin" @@ -2834,7 +2855,7 @@ msgstr "Gặp dòng dạng sai %u trong danh sách nguồn %s (kiểu)." msgid "Type '%s' is not known on line %u in source list %s" msgstr "Không biết kiểu “%s” trên dòng %u trong danh sách nguồn %s." -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2843,12 +2864,12 @@ msgstr "" "Không thể thực hiện ngay lập tức tiến trình cấu hình “%s”. Xem “man 5 apt." "conf ” dưới “APT::Immediate-Configure” để tìm chi tiết. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, c-format msgid "Could not configure '%s'. " msgstr "Không thể cấu hình '%s'. " -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2883,7 +2904,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Không thể sửa vấn đề, bạn đã giữ lại một số gói bị ngắt." -#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 +#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2891,7 +2912,7 @@ msgstr "" "Một số tập tin chỉ mục không tải về được. Chúng đã bị bỏ qua, hoặc cái cũ đã " "được dùng thay thế." -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, c-format msgid "List directory %spartial is missing." msgstr "Thiếu thư mục danh sách %spartial." @@ -2996,14 +3017,14 @@ msgstr "Bộ nhớ tạm có hệ thống điêu khiển phiên bản không tư #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 -#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 -#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 -#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 -#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 -#: apt-pkg/pkgcachegen.cc:561 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Gặp lỗi khi xử lý %s (%s%d)" @@ -3024,26 +3045,26 @@ msgstr "Ồ, bạn đã vượt quá số mô tả mà trình APT này có thể msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Ồ, bạn đã vượt quá số cách phụ thuộc mà trình APT này có thể quản lý." -#: apt-pkg/pkgcachegen.cc:568 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Không tìm thấy gói %s %s khi xử lý quan hệ phụ thuộc của tập tin" -#: apt-pkg/pkgcachegen.cc:1197 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "Không thể lấy các thông tin về danh sách gói nguồn %s" -#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 -#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" msgstr "Đang đọc các danh sách gói" -#: apt-pkg/pkgcachegen.cc:1302 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "Đang tập hợp các Nhà cung cấp Tập tin" -#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn" @@ -3056,12 +3077,12 @@ msgstr "việc thay đổi tên bị lỗi, %s (%s → %s)." msgid "MD5Sum mismatch" msgstr "Sai khớp MD5Sum (tổng kiểm)" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 msgid "Hash Sum mismatch" msgstr "Sai khớp tổng chuỗi duy nhất (hash sum)" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3070,16 +3091,16 @@ msgstr "" "Không tìm thấy mục cần thiết '%s' trong tập tin Phát hành (Sai mục trong " "sources.list hoặc tập tin bị hỏng)" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Không thể tìm thấy mã băm tổng kiểm tra cho tập tin Phát hành %s" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "Không có khóa công sẵn sàng cho những mã số khoá theo đây:\n" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3088,12 +3109,12 @@ msgstr "" "Tập tin phát hành %s đã hết hạn (không hợp lệ kể từ %s). Cập nhật cho kho " "này sẽ không được áp dụng." -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Bản phát hành xung đột: %s (mong đợi %s còn nhận %s)" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3104,12 +3125,12 @@ msgstr "" "Lỗi GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "Lỗi GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3118,7 +3139,7 @@ msgstr "" "Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói " "này, do thiếu kiến trúc." -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3127,7 +3148,7 @@ msgstr "" "Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói " "này." -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3135,7 +3156,7 @@ msgstr "" "Các tập tin chỉ mục của gói này bị hỏng. Không có trường Filename: (Tên tập " "tin:) cho gói %s." -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "Sai khớp kích cỡ" @@ -3190,7 +3211,7 @@ msgstr "Đang nhận diện... " msgid "Stored label: %s\n" msgstr "Nhãn đã lưu: %s\n" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 msgid "Unmounting CD-ROM...\n" msgstr "Đang tháo lắp đĩa CD-ROM...\n" @@ -3253,30 +3274,30 @@ msgstr "" msgid "Copying package lists..." msgstr "Đang sao chép các danh sách gói..." -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "Đang ghi danh sách nguồn mới\n" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "Các mục nhập danh sách nguồn cho đĩa này:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "Mới ghi %i mục ghi.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Mới ghi %i mục ghi với %i tập tin còn thiếu.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Mới ghi %i mục ghi với %i tập tin không khớp với nhau\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 50e1eca86..51bfebd4f 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.0~pre1\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2010-08-26 14:42+0800\n" "Last-Translator: Aron Xu \n" "Language-Team: Chinese (simplified) \n" @@ -97,72 +97,72 @@ msgstr "总占用空间：" msgid "Package file %s is out of sync." msgstr "软件包文件 %s 尚未同步。" -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 +#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "没有发现匹配的软件包" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1243 msgid "You must give at least one search pattern" msgstr "您必须明确地给出至少一个表达式" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "未发现软件包 %s" -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1526 msgid "Package files:" msgstr "软件包文件：" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "缓存尚未同步，无法交差引证(x-ref)一个软件包文件" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1547 msgid "Pinned packages:" msgstr "被锁定的软件包：" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "(没有找到)" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr " 已安装：" -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr " 候选软件包：" -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "(无)" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr " 软件包锁：" #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr " 版本列表：" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s，用于 %s 构架，编译于 %s %s\n" -#: cmdline/apt-cache.cc:1690 +#: cmdline/apt-cache.cc:1730 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -236,20 +236,28 @@ msgstr "" " -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n" "若要了解更多信息，您还可以查阅 apt-cache(8) 和 apt.conf(5) 参考手册。\n" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "请给这张盘片起个名字，比如“Debian 5.0.3 Disk 1”" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" msgstr "请把盘片插入驱动器再按回车键" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "无法将 %s 挂载到 %s" -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "请对您的盘片套件中的其它盘片重复相同的操作。" @@ -482,7 +490,7 @@ msgstr "不能重新安装 %s，因为无法下载它。\n" msgid "%s is already the newest version.\n" msgstr "%s 已经是最新的版本了。\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s 被设置为手动安装。\n" @@ -589,8 +597,8 @@ msgstr "解压缩后会消耗掉 %sB 的额外空间。\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "解压缩后将会空出 %sB 的空间。\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2593 #, c-format msgid "Couldn't determine free space in %s" msgstr "无法获知您在 %s 上的可用空间" @@ -629,7 +637,7 @@ msgstr "中止执行。" msgid "Do you want to continue [Y/n]? " msgstr "您希望继续执行吗？[Y/n]" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" msgstr "无法下载 %s %s\n" @@ -638,7 +646,7 @@ msgstr "无法下载 %s %s\n" msgid "Some files failed to download" msgstr "有一些文件无法下载" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "下载完毕，目前是“仅下载”模式" @@ -715,7 +723,7 @@ msgstr "似乎自动卸载工具损坏了一些软件，这不应该发生。请 #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 msgid "The following information may help to resolve the situation:" msgstr "下列信息可能会对解决问题有所帮助：" @@ -760,7 +768,7 @@ msgstr "" "有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可" "以指定一个解决办法)。" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1973 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" @@ -771,78 +779,78 @@ msgstr "" "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n" "包尚未被创建或是它们已被从新到(Incoming)目录移出。" -#: cmdline/apt-get.cc:1995 +#: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "破损的软件包" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2020 msgid "The following extra packages will be installed:" msgstr "将会安装下列额外的软件包：" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "建议安装的软件包：" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "推荐安装的软件包：" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "无法找到软件包 %s" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s 被设置为手动安装。\n" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2184 msgid "Calculating upgrade... " msgstr "正在对升级进行计算... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "失败" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2192 msgid "Done" msgstr "完成" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 msgid "Internal error, problem resolver broke stuff" msgstr "内部错误，问题解决工具坏事了" -#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "无法锁定下载目录" -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2452 msgid "Must specify at least one package to fetch source for" msgstr "要下载源代码，必须指定至少一个对应的软件包" -#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 +#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, c-format msgid "Unable to find a source package for %s" msgstr "无法找到与 %s 对应的源代码包" -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -851,7 +859,7 @@ msgstr "" "提示：%s 的打包工作被维护于以下位置的 %s 版本控制系统中：\n" "%s\n" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2514 #, fuzzy, c-format msgid "" "Please use:\n" @@ -862,104 +870,104 @@ msgstr "" "bzr get %s\n" "获得该软件包的最近更新(可能尚未正式发布)。\n" -#: cmdline/apt-get.cc:2568 +#: cmdline/apt-get.cc:2567 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "忽略已下载过的文件“%s”\n" -#: cmdline/apt-get.cc:2605 +#: cmdline/apt-get.cc:2604 #, c-format msgid "You don't have enough free space in %s" msgstr "您在 %s 上没有足够的可用空间" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2613 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下载 %sB/%sB 的源代码包。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2618 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下载 %sB 的源代码包。\n" -#: cmdline/apt-get.cc:2625 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" msgstr "下载源代码 %s\n" -#: cmdline/apt-get.cc:2663 +#: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "有一些包文件无法下载。" -#: cmdline/apt-get.cc:2694 +#: cmdline/apt-get.cc:2693 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "忽略已经被解包到 %s 目录的源代码包\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "运行解包的命令“%s”出错。\n" -#: cmdline/apt-get.cc:2707 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "请检查是否安装了“dpkg-dev”软件包。\n" -#: cmdline/apt-get.cc:2729 +#: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "执行构造软件包命令“%s”失败。\n" -#: cmdline/apt-get.cc:2749 +#: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "子进程出错" -#: cmdline/apt-get.cc:2768 +#: cmdline/apt-get.cc:2767 msgid "Must specify at least one package to check builddeps for" msgstr "要检查生成软件包的构建依赖关系，必须指定至少一个软件包" -#: cmdline/apt-get.cc:2793 +#: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 +#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "无法获得 %s 的构建依赖关系信息" -#: cmdline/apt-get.cc:2840 +#: cmdline/apt-get.cc:2839 #, c-format msgid "%s has no build depends.\n" msgstr " %s 没有构建依赖关系信息。\n" -#: cmdline/apt-get.cc:3010 +#: cmdline/apt-get.cc:3009 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系" -#: cmdline/apt-get.cc:3028 +#: cmdline/apt-get.cc:3027 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系" -#: cmdline/apt-get.cc:3051 +#: cmdline/apt-get.cc:3050 #, 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:3090 +#: cmdline/apt-get.cc:3089 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -968,37 +976,37 @@ msgstr "" "由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 " "%1$s 依赖关系" -#: cmdline/apt-get.cc:3096 +#: cmdline/apt-get.cc:3095 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系" -#: cmdline/apt-get.cc:3119 +#: cmdline/apt-get.cc:3118 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s" -#: cmdline/apt-get.cc:3135 +#: cmdline/apt-get.cc:3133 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "不能满足软件包 %s 所要求的构建依赖关系。" -#: cmdline/apt-get.cc:3140 +#: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "无法处理构建依赖关系" -#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "正在连接 %s (%s)" -#: cmdline/apt-get.cc:3368 +#: cmdline/apt-get.cc:3366 msgid "Supported modules:" msgstr "支持的模块：" -#: cmdline/apt-get.cc:3409 +#: cmdline/apt-get.cc:3407 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1086,7 +1094,7 @@ msgstr "" "以获取更多信息和选项。\n" " 本 APT 具有超级牛力。\n" -#: cmdline/apt-get.cc:3574 +#: cmdline/apt-get.cc:3572 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1160,7 +1168,7 @@ msgid "%s was already not hold.\n" msgstr "%s 已经是最新的版本了。\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" @@ -1298,8 +1306,8 @@ msgstr "连接超时" msgid "Server closed the connection" msgstr "服务器关闭了连接" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 +#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 msgid "Read error" msgstr "读错误" @@ -1312,8 +1320,8 @@ msgid "Protocol corruption" msgstr "协议有误" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 +#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 msgid "Write error" msgstr "写出错" @@ -1456,28 +1464,36 @@ msgstr "解析“%s:%s”时，出现了某些故障(%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "不能连接到 %s：%s：" -#: methods/gpgv.cc:169 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "内部错误：签名正确无误，但是无法确认密钥指纹？！" -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "至少发现一个无效的签名。" -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "无法运行 gpgv 以验证签名(您安装了 gpgv 吗？)" -#: methods/gpgv.cc:183 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:178 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "运行 gpgv 时发生未知错误" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" msgstr "下列签名无效：\n" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1558,8 +1574,8 @@ msgstr "内部错误" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 +#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1588,7 +1604,12 @@ msgstr "没有找到镜像文件 %s" msgid "Can not read mirror file '%s'" msgstr "没有找到镜像文件 %s" -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "没有找到镜像文件 %s" + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "[镜像：%s]" @@ -1678,7 +1699,7 @@ msgstr "" " -c=? 读指定的配置文件\n" " -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "无法写入 %s" @@ -2048,23 +2069,23 @@ msgstr "" " -c=? 读取指定配置文件\n" " -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "无法创建管道" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "无法执行 gzip" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "包文件已被损坏" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "Tar 的校验和不符，文件已损坏" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "未知的 TAR 数据头类型 %u，成员 %s" @@ -2283,7 +2304,7 @@ msgstr "%li分 %li秒" msgid "%lis" msgstr "%li秒" -#: apt-pkg/contrib/strutl.cc:1172 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "找不到您选则的 %s" @@ -2423,111 +2444,111 @@ msgstr "无法读取盘片的状态" msgid "Problem closing the gzip file %s" msgstr "关闭 gzip %s 文件出错" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "由于文件系统为只读，因而无法使用文件锁 %s" -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "无法打开锁文件 %s" -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:249 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "无法在 nfs 文件系统上使用文件锁 %s" -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "无法获得锁 %s" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "子进程 %s 发生了段错误" -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:843 #, c-format msgid "Sub-process %s received signal %u." msgstr "子进程 %s 收到信号 %u。" -#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "子进程 %s 返回了一个错误号 (%u)" -#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "子进程 %s 异常退出" -#: apt-pkg/contrib/fileutl.cc:984 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Could not open file %s" msgstr "无法打开文件 %s" -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1062 #, c-format msgid "Could not open file descriptor %d" msgstr "无法打开文件描述符 %d" -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "无法创建子进程的 IPC 管道" -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " msgstr "无法执行压缩程序" -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1297 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "读取文件出错，还剩 %lu 字节没有读出" -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "写入文件出错，还剩 %lu 字节没有保存" -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1681 #, c-format msgid "Problem closing the file %s" msgstr "关闭文件 %s 出错" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1693 #, c-format msgid "Problem renaming the file %s to %s" msgstr "重命名文件 %s 为 %s 出错" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1704 #, c-format msgid "Problem unlinking the file %s" msgstr "用 unlink 删除文件 %s 出错" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1717 msgid "Problem syncing the file" msgstr "同步文件出错" @@ -2725,7 +2746,7 @@ msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2734,12 +2755,12 @@ msgstr "" "无法立即对 %s 进行配置。请查看 man 5 apt.conf 中的 APT::Immediate-Configure " "(%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "无法打开文件 %s" -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2775,7 +2796,7 @@ msgstr "" "无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关" "系。" -#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588 +#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2783,7 +2804,7 @@ msgid "" msgstr "" "有一些索引文件不能下载，它们可能被忽略了，也可能转而使用了旧的索引文件。" -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, c-format msgid "List directory %spartial is missing." msgstr "软件包列表的目录 %spartial 缺失。" @@ -2883,14 +2904,14 @@ msgstr "软件包暂存区使用的是不兼容的版本控制系统" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319 -#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395 -#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432 -#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509 -#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547 -#: apt-pkg/pkgcachegen.cc:561 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "处理 %s (FindPkg)时出错" @@ -2911,26 +2932,26 @@ msgstr "哇，软件包说明数量超出了本 APT 的处理能力。" msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "哇，依赖关系数量超出了本 APT 的处理能力。" -#: apt-pkg/pkgcachegen.cc:568 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "当处理文件依赖关系时，无法找到软件包 %s %s" -#: apt-pkg/pkgcachegen.cc:1197 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "无法获取源软件包列表 %s 的状态" -#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389 -#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" msgstr "正在读取软件包列表" -#: apt-pkg/pkgcachegen.cc:1302 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "正在收集文件所提供的软件包" -#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "无法读取或写入软件源缓存" @@ -2943,40 +2964,40 @@ msgstr "无法重命名文件，%s (%s -> %s)。" msgid "MD5Sum mismatch" msgstr "MD5 校验和不符" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 msgid "Hash Sum mismatch" msgstr "Hash 校验和不符" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "无法解析软件包仓库 Release 文件 %s" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "以下 ID 的密钥没有可用的公钥：\n" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "冲突的发行版：%s (期望 %s 但得到 %s)" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2985,12 +3006,12 @@ msgstr "" "校验签名出错。此仓库未被更新，仍然使用以前的索引文件。GPG 错误：%s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "GPG 错误：%s: %s" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2999,7 +3020,7 @@ msgstr "" "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件" "包。(缘于架构缺失)" -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3007,13 +3028,13 @@ msgid "" msgstr "" "我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。" -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。" -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "大小不符" @@ -3065,7 +3086,7 @@ msgstr "正在鉴别.. " msgid "Stored label: %s\n" msgstr "已归档文件的标签：%s\n" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 msgid "Unmounting CD-ROM...\n" msgstr "正在卸载 CD-ROM...\n" @@ -3129,30 +3150,30 @@ msgstr "" msgid "Copying package lists..." msgstr "正在复制软件包列表……" -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "正在写入新的源列表\n" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "对应于该盘片的软件源设置项是：\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "已写入 %i 条记录。\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "已写入 %i 条记录，并有 %i 个文件缺失。\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "已写入 %i 条记录，并有 %i 个文件不匹配\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不匹配\n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 88eb4dbef..82ee4e108 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.5.4\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-05-16 11:28+0200\n" +"POT-Creation-Date: 2013-06-26 07:37+0200\n" "PO-Revision-Date: 2009-01-28 10:41+0800\n" "Last-Translator: Tetralet \n" "Language-Team: Debian-user in Chinese [Big5] %s)。" msgid "MD5Sum mismatch" msgstr "MD5Sum 不符" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865 -#: apt-pkg/acquire-item.cc:2008 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 +#: apt-pkg/acquire-item.cc:2019 msgid "Hash Sum mismatch" msgstr "Hash Sum 不符" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1377 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1393 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "無法辨別 Release 檔 %s" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1435 msgid "There is no public key available for the following key IDs:\n" msgstr "無法取得以下的密鑰 ID 的公鑰：\n" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1473 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "發行版本衝突：%s（應當是 %s 但卻得到 %s）" -#: apt-pkg/acquire-item.cc:1518 +#: apt-pkg/acquire-item.cc:1525 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2976,12 +2997,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533 +#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1641 +#: apt-pkg/acquire-item.cc:1652 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2990,20 +3011,20 @@ msgstr "" "找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。（因為找不到平" "台）" -#: apt-pkg/acquire-item.cc:1700 +#: apt-pkg/acquire-item.cc:1711 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package." msgstr "找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。" -#: apt-pkg/acquire-item.cc:1759 +#: apt-pkg/acquire-item.cc:1770 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "這個套件的索引檔損壞了。沒有套件 %s 的 Filename: 欄位。" -#: apt-pkg/acquire-item.cc:1857 +#: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" msgstr "大小不符" @@ -3055,7 +3076,7 @@ msgstr "正在識別.." msgid "Stored label: %s\n" msgstr "保存標籤：%s\n" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 msgid "Unmounting CD-ROM...\n" msgstr "正在卸載光碟機...\n" @@ -3115,30 +3136,30 @@ msgstr "" msgid "Copying package lists..." msgstr "正在複製套件清單..." -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "正在寫入新的來源列表\n" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "該碟片的來源列表項目為：\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" msgstr "寫入 %i 筆紀錄。\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案遺失了。\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案不符\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案遺失了，有 %i 個檔案不符\n" -- cgit v1.2.3 From 32b5dd08ac22b0ad153b145d1500c66fe4c78f83 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 27 Jun 2013 07:25:53 +0200 Subject: show broken count when starting the resolver --- apt-pkg/algorithms.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 6cde4d6cc..b08b8dcfc 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -845,8 +845,10 @@ bool pkgProblemResolver::ResolveInternal(bool const BrokenFix) } while (Again == true); - if (Debug == true) + if (Debug == true) { clog << "Starting" << endl; + clog << " Broken count: " << Cache.BrokenCount() << endl; + } MakeScores(); @@ -874,8 +876,10 @@ bool pkgProblemResolver::ResolveInternal(bool const BrokenFix) } } - if (Debug == true) + if (Debug == true) { clog << "Starting 2" << endl; + clog << " Broken count: " << Cache.BrokenCount() << endl; + } /* Now consider all broken packages. For each broken package we either remove the package or fix it's problem. We do this once, it should -- cgit v1.2.3 From 06f881174113eaa667006663c6f4da3e3f4409b4 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 27 Jun 2013 07:26:39 +0200 Subject: when doing MarkInstall() packages may also get removed, so show them in the debug output of Debug::pkgDepCache::AutoInstall=true --- apt-pkg/depcache.cc | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 6a3e9bfc4..f9bfa1f67 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1243,9 +1243,16 @@ bool pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, PkgState[Pkg->ID].CandidateVer != *I && MarkInstall(Pkg,true,Depth + 1, false, ForceImportantDeps) == true) continue; - else if ((Start->Type == pkgCache::Dep::Conflicts || Start->Type == pkgCache::Dep::DpkgBreaks) && - MarkDelete(Pkg,false,Depth + 1, false) == false) - break; + else if (Start->Type == pkgCache::Dep::Conflicts || + Start->Type == pkgCache::Dep::DpkgBreaks) + { + if(DebugAutoInstall == true) + std::clog << OutputInDepth(Depth) + << " Removing: " << Pkg.Name() + << std::endl; + if (MarkDelete(Pkg,false,Depth + 1, false) == false) + break; + } } continue; } -- cgit v1.2.3 From dcab2a78e1585903ff144949f40c514788638f92 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 27 Jun 2013 10:27:29 +0200 Subject: use just one line for the debug output (thanks to donkult for the review) --- apt-pkg/algorithms.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index b08b8dcfc..c2c38e728 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -846,8 +846,7 @@ bool pkgProblemResolver::ResolveInternal(bool const BrokenFix) while (Again == true); if (Debug == true) { - clog << "Starting" << endl; - clog << " Broken count: " << Cache.BrokenCount() << endl; + clog << "Starting, broken count: " << Cache.BrokenCount() << endl; } MakeScores(); @@ -877,8 +876,7 @@ bool pkgProblemResolver::ResolveInternal(bool const BrokenFix) } if (Debug == true) { - clog << "Starting 2" << endl; - clog << " Broken count: " << Cache.BrokenCount() << endl; + clog << "Starting 2, broken count: " << Cache.BrokenCount() << endl; } /* Now consider all broken packages. For each broken package we either -- cgit v1.2.3 From 49b49018ff08e337c506d5ccb3476bc2faa5d1b5 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 28 Jun 2013 07:37:55 +0200 Subject: make starting debug output of pkgProblemResolver proper english --- apt-pkg/algorithms.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index c2c38e728..df38e6109 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -846,7 +846,8 @@ bool pkgProblemResolver::ResolveInternal(bool const BrokenFix) while (Again == true); if (Debug == true) { - clog << "Starting, broken count: " << Cache.BrokenCount() << endl; + clog << "Starting pkgProblemResolver with broken count: " + << Cache.BrokenCount() << endl; } MakeScores(); @@ -876,7 +877,8 @@ bool pkgProblemResolver::ResolveInternal(bool const BrokenFix) } if (Debug == true) { - clog << "Starting 2, broken count: " << Cache.BrokenCount() << endl; + clog << "Starting 2 pkgProblemResolver with broken count: " + << Cache.BrokenCount() << endl; } /* Now consider all broken packages. For each broken package we either -- cgit v1.2.3 From 25a4d2049fb79bc2c86cd45e977b4a071e5300ac Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 2 Jul 2013 08:27:56 +0200 Subject: update changelog --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index aa8553251..70046aa65 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.9.9) unstable; urgency=low + + [ Michael Vogt ] + * improve debug output for the Debug::pkgProblemResolver and + Debug::pkgDepCache::AutoInstall + + -- Michael Vogt Tue, 02 Jul 2013 08:26:17 +0200 + apt (0.9.8.2) unstable; urgency=low [ Programs translations ] -- cgit v1.2.3 From 0abed86eb392990a5a4995fcf7ca70601d40efd1 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 2 Jul 2013 08:34:34 +0200 Subject: update changelog --- debian/changelog | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4baa4d18d..ea599988d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -apt (0.9.9) unstable; urgency=low +apt (0.9.9) UNRELEASEDunstable; urgency=low [ Michael Vogt ] * improve debug output for the Debug::pkgProblemResolver and Debug::pkgDepCache::AutoInstall + * improve apt-cdrom output when no CD-ROM can be auto-detected + * document --no-auto-detect in apt-cdrom [ David Kalnischkies ] * build the en manpages in subdirectory doc/en @@ -26,7 +28,7 @@ apt (0.9.9) unstable; urgency=low * do not redownload unchanged InRelease files * trigger NODATA error for invalid InRelease files (Closes: #712486) - -- David Kalnischkies Sun, 09 Jun 2013 15:06:24 +0200 + -- Michael Vogt Tue, 02 Jul 2013 08:34:12 +0200 apt (0.9.8.2) unstable; urgency=low -- cgit v1.2.3 From 4ff028826ef0fa500b7717415be4109c2ac1da1d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 2 Jul 2013 08:45:03 +0200 Subject: fix format string error --- cmdline/apt-cdrom.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc index 3f53e16ee..c153cca85 100644 --- a/cmdline/apt-cdrom.cc +++ b/cmdline/apt-cdrom.cc @@ -162,7 +162,7 @@ bool DoAdd(CommandLine &) if (count == 0) { res = cdrom.Add(&log); if (res == false) { - _error->Error(_(W_NO_CDROM_FOUND)); + _error->Error("%s", _(W_NO_CDROM_FOUND)); } } @@ -192,7 +192,7 @@ bool DoIdent(CommandLine &) if (count == 0) { res = cdrom.Ident(ident, &log); if (res == false) { - _error->Error(_(W_NO_CDROM_FOUND)); + _error->Error("%s", _(W_NO_CDROM_FOUND)); } } return res; -- cgit v1.2.3 From 4b8528bd5749f759e924534709a620da67cd40f8 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 2 Jul 2013 08:58:43 +0200 Subject: releasing version 0.9.9 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ea599988d..b20bc1f60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.9.9) UNRELEASEDunstable; urgency=low +apt (0.9.9) unstable; urgency=low [ Michael Vogt ] * improve debug output for the Debug::pkgProblemResolver and @@ -28,7 +28,7 @@ apt (0.9.9) UNRELEASEDunstable; urgency=low * do not redownload unchanged InRelease files * trigger NODATA error for invalid InRelease files (Closes: #712486) - -- Michael Vogt Tue, 02 Jul 2013 08:34:12 +0200 + -- Michael Vogt Tue, 02 Jul 2013 08:58:33 +0200 apt (0.9.8.2) unstable; urgency=low -- cgit v1.2.3 From 8bb62daf9b1bbeec8a40cfed239a8e9ac115353a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 5 Jul 2013 16:41:06 +0200 Subject: debian/rules: * debian/rules: - call dh_clean in clean (closes: #714980) --- debian/changelog | 7 +++++++ debian/rules | 1 + 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index b20bc1f60..295142165 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.9.9.1) UNRELEASED; urgency=low + + * debian/rules: + - call dh_clean in clean (closes: #714980) + + -- Michael Vogt Fri, 05 Jul 2013 16:39:34 +0200 + apt (0.9.9) unstable; urgency=low [ Michael Vogt ] diff --git a/debian/rules b/debian/rules index 79a6dbe0c..02fed44d5 100755 --- a/debian/rules +++ b/debian/rules @@ -110,6 +110,7 @@ build/build-manpages-stamp: build/configure-stamp clean: dh_testdir + dh_clean [ ! -f Makefile ] || $(MAKE) clean distclean rm -rf build -- cgit v1.2.3 From 9c5104cf35c6bca91247a8a31c1748be80ab7d68 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 10 Jul 2013 16:41:14 +0200 Subject: apt-pkg/packagemanager.cc: * apt-pkg/packagemanager.cc: - increate APT::pkgPackageManager::MaxLoopCount to 5000 --- apt-pkg/packagemanager.cc | 4 ++-- debian/changelog | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index 310934c42..8c0d2e855 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -338,7 +338,7 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth) however if there is a loop (A depends on B, B depends on A) this will not be the case, so check for dependencies before configuring. */ bool Bad = false, Changed = false; - const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 500); + const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 5000); unsigned int i=0; std::list needConfigure; do @@ -628,7 +628,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c This will be either dealt with if the package is configured as a dependency of Pkg (if and when Pkg is configured), or by the ConfigureAll call at the end of the for loop in OrderInstall. */ bool Changed = false; - const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 500); + const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 5000); unsigned int i = 0; do { diff --git a/debian/changelog b/debian/changelog index 295142165..cb47dd456 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,10 @@ apt (0.9.9.1) UNRELEASED; urgency=low + [ Michael Vogt ] * debian/rules: - call dh_clean in clean (closes: #714980) + * apt-pkg/packagemanager.cc: + - increate APT::pkgPackageManager::MaxLoopCount to 5000 -- Michael Vogt Fri, 05 Jul 2013 16:39:34 +0200 -- cgit v1.2.3 From a86f851619f720b8c4a74d01274c5e2bf012d451 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Sat, 3 Nov 2012 00:39:19 +0100 Subject: cherry pick 39a07ec8f2c612a5af234c7713571362f7ca90b4 --- debian/apt.auto-removal.sh | 67 ++++++++++++++++++++++++++++++++++++++++++++++ debian/apt.conf.autoremove | 3 --- debian/apt.dirs | 1 + debian/changelog | 10 +++++++ debian/rules | 2 ++ 5 files changed, 80 insertions(+), 3 deletions(-) create mode 100644 debian/apt.auto-removal.sh diff --git a/debian/apt.auto-removal.sh b/debian/apt.auto-removal.sh new file mode 100644 index 000000000..8f6fc2efc --- /dev/null +++ b/debian/apt.auto-removal.sh @@ -0,0 +1,67 @@ +#!/bin/sh + +set -e + +# Author: Steve Langasek +# +# Mark as not-for-autoremoval those kernel packages that are: +# - the currently booted version +# - the kernel version we've been called for +# - the latest kernel version (determined using rules copied from the grub +# package for deciding which kernel to boot) +# In the common case, this results in exactly two kernels saved, but it can +# result in three kernels being saved. It's better to err on the side of +# saving too many kernels than saving too few. +# +# We generate this list and save it to /etc/apt/apt.conf.d instead of marking +# packages in the database because this runs from a postinst script, and apt +# will overwrite the db when it exits. + +config_file=/etc/apt/apt.conf.d/01autoremove-kernels + +installed_version="$1" +running_version="$(uname -r)" + + +version_test_gt () +{ + local version_test_gt_sedexp="s/[._-]\(pre\|rc\|test\|git\|old\|trunk\)/~\1/g" + local version_a="`echo "$1" | sed -e "$version_test_gt_sedexp"`" + local version_b="`echo "$2" | sed -e "$version_test_gt_sedexp"`" + dpkg --compare-versions "$version_a" gt "$version_b" + return "$?" +} + +list=$(dpkg -l 'linux-image-[0-9]*'|awk '/^ii/ { print $2 }' | sed -e's/linux-image-//') + +latest_version="" +for i in $list; do + if version_test_gt "$i" "$latest_version"; then + latest_version="$i" + fi +done + +kernels=$(sort -u < "$config_file".dpkg-new <> "$config_file".dpkg-new + echo " \"^linux-image-extra-$kernel.*\";" >> "$config_file".dpkg-new + echo " \"^linux-signed-image-$kernel.*\";" >> "$config_file".dpkg-new +done +cat >> "$config_file".dpkg-new < Fri, 05 Jul 2013 16:39:34 +0200 apt (0.9.9) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 02fed44d5..3979bd810 100755 --- a/debian/rules +++ b/debian/rules @@ -183,6 +183,8 @@ apt: build build-manpages # apt install # cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove + cp debian/apt.auto-removal.sh debian/$@/etc/kernel/postinst.d/apt-auto-removal + chmod 755 debian/$@/etc/kernel/postinst.d/apt-auto-removal # make rosetta happy and remove pot files in po/ (but leave stuff # in po/domains/* untouched) and cp *.po into each domain dir -- cgit v1.2.3 From bac1fd143d91e1595ef412195f44cfedae42b472 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Sat, 3 Nov 2012 08:28:54 +0100 Subject: Make sure we always have at least two kernels marked not for removal --- debian/apt.auto-removal.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/debian/apt.auto-removal.sh b/debian/apt.auto-removal.sh index 8f6fc2efc..598aee1a3 100644 --- a/debian/apt.auto-removal.sh +++ b/debian/apt.auto-removal.sh @@ -9,6 +9,10 @@ set -e # - the kernel version we've been called for # - the latest kernel version (determined using rules copied from the grub # package for deciding which kernel to boot) +# - the second-latest kernel version, if the booted kernel version is +# already the latest and this script is called for that same version, +# to ensure a fallback remains available in the event the newly-installed +# kernel at this ABI fails to boot # In the common case, this results in exactly two kernels saved, but it can # result in three kernels being saved. It's better to err on the side of # saving too many kernels than saving too few. @@ -35,16 +39,30 @@ version_test_gt () list=$(dpkg -l 'linux-image-[0-9]*'|awk '/^ii/ { print $2 }' | sed -e's/linux-image-//') latest_version="" +previous_version="" for i in $list; do if version_test_gt "$i" "$latest_version"; then + previous_version="$latest_version" latest_version="$i" + elif version_test_gt "$i" "$previous_version"; then + previous_version="$i" fi done +if [ "$latest_version" != "$installed_version" ] \ + || [ "$latest_version" != "$running_version" ] \ + || [ "$installed_version" != "$running_version" ] +then + # We have at least two kernels that we have reason to think the + # user wants, so don't save the second-newest version. + previous_version= +fi + kernels=$(sort -u < Date: Mon, 5 Nov 2012 10:27:17 +0100 Subject: get dpkg from apt-config as well and add robustness against missing/failing apt-config (for paranoia) Conflicts: debian/apt.auto-removal.sh --- debian/apt.auto-removal.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/debian/apt.auto-removal.sh b/debian/apt.auto-removal.sh index 598aee1a3..17becd30e 100644 --- a/debian/apt.auto-removal.sh +++ b/debian/apt.auto-removal.sh @@ -21,7 +21,14 @@ set -e # packages in the database because this runs from a postinst script, and apt # will overwrite the db when it exits. -config_file=/etc/apt/apt.conf.d/01autoremove-kernels + +# +eval $(apt-config shell APT_CONF_D Dir::Etc::parts/d) +test -n "${APT_CONF_D}" || APT_CONF_D="/etc/apt/apt.conf.d" +config_file=${APT_CONF_D}/01autoremove-kernels + +eval $(apt-config shell DPKG Dir::bin::dpkg/f) +test -n "$DPKG" || DPKG="/usr/bin/dpkg" installed_version="$1" running_version="$(uname -r)" @@ -32,11 +39,11 @@ version_test_gt () local version_test_gt_sedexp="s/[._-]\(pre\|rc\|test\|git\|old\|trunk\)/~\1/g" local version_a="`echo "$1" | sed -e "$version_test_gt_sedexp"`" local version_b="`echo "$2" | sed -e "$version_test_gt_sedexp"`" - dpkg --compare-versions "$version_a" gt "$version_b" + $DPKG --compare-versions "$version_a" gt "$version_b" return "$?" } -list=$(dpkg -l 'linux-image-[0-9]*'|awk '/^ii/ { print $2 }' | sed -e's/linux-image-//') +list=$($DPKG -l 'linux-image-[0-9]*'|awk '/^ii/ { print $2 }' | sed -e's/linux-image-//') latest_version="" previous_version="" -- cgit v1.2.3 From 50dba2a9ad755f2ce476576f54698128df9ba327 Mon Sep 17 00:00:00 2001 From: Adam Conrad Date: Tue, 6 Nov 2012 15:54:31 -0700 Subject: * Fix up two things in debian/apt.auto-removal.sh: - Use exact matches with $-terminated regexes, so we don't get confusion between similarly-named kernel flavours. - Keep linux-backports-modules in sync with installed kernels. Conflicts: configure.in debian/changelog doc/apt-verbatim.ent --- configure.in | 2 +- debian/apt.auto-removal.sh | 7 ++++--- debian/changelog | 6 ++++++ doc/apt-verbatim.ent | 2 +- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/configure.in b/configure.in index 541d0e95f..4c25ba5d4 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) PACKAGE="apt" -PACKAGE_VERSION="0.9.8.1" +PACKAGE_VERSION="0.9.7.6ubuntu2" PACKAGE_MAIL="APT Development Team " AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION") diff --git a/debian/apt.auto-removal.sh b/debian/apt.auto-removal.sh index 17becd30e..8b0f1cf69 100644 --- a/debian/apt.auto-removal.sh +++ b/debian/apt.auto-removal.sh @@ -81,9 +81,10 @@ APT { EOF for kernel in $kernels; do - echo " \"^linux-image-$kernel.*\";" >> "$config_file".dpkg-new - echo " \"^linux-image-extra-$kernel.*\";" >> "$config_file".dpkg-new - echo " \"^linux-signed-image-$kernel.*\";" >> "$config_file".dpkg-new + echo " \"^linux-image-${kernel}$\";" >> "$config_file".dpkg-new + echo " \"^linux-image-extra-${kernel}$\";" >> "$config_file".dpkg-new + echo " \"^linux-signed-image-${kernel}$\";" >> "$config_file".dpkg-new + echo " \"^linux-backports-modules-.*-${kernel}$\";" >> "$config_file".dpkg-new done cat >> "$config_file".dpkg-new < Fri, 05 Jul 2013 16:39:34 +0200 apt (0.9.9) unstable; urgency=low diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 1ab7b6056..c9bb06123 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -213,7 +213,7 @@ "> - + -- cgit v1.2.3 From 90b9659c9a959601d5ed1cc77f7c8b9e0d5b8939 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 11 Jul 2013 07:52:34 +0200 Subject: debian/apt.auto-removal.sh: merge the remaining bits --- debian/apt.auto-removal.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/apt.auto-removal.sh b/debian/apt.auto-removal.sh index 8b0f1cf69..4ada56556 100644 --- a/debian/apt.auto-removal.sh +++ b/debian/apt.auto-removal.sh @@ -22,7 +22,6 @@ set -e # will overwrite the db when it exits. -# eval $(apt-config shell APT_CONF_D Dir::Etc::parts/d) test -n "${APT_CONF_D}" || APT_CONF_D="/etc/apt/apt.conf.d" config_file=${APT_CONF_D}/01autoremove-kernels @@ -43,7 +42,7 @@ version_test_gt () return "$?" } -list=$($DPKG -l 'linux-image-[0-9]*'|awk '/^ii/ { print $2 }' | sed -e's/linux-image-//') +list=$(${DPKG} -l 'linux-image-[0-9]*'|awk '/^ii/ { print $2 }' | sed -e's/linux-image-//') latest_version="" previous_version="" @@ -74,7 +73,7 @@ EOF ) cat > "$config_file".dpkg-new <> "$config_file".dpkg-new echo " \"^linux-signed-image-${kernel}$\";" >> "$config_file".dpkg-new echo " \"^linux-backports-modules-.*-${kernel}$\";" >> "$config_file".dpkg-new + echo " \"^linux-headers-${kernel}$\";" >> "$config_file".dpkg-new done cat >> "$config_file".dpkg-new < Date: Wed, 26 Jun 2013 17:37:57 +0200 Subject: Version 3 for DPkg::Pre-Install-Pkgs with MultiArch info Adds on top of Version 2 to all displayed version numbers the architecture as well as the MultiArch flag for consumption by the hooks. Most of the time the architecture will be the same for both versions displayed, but packages might change from "all" to "any" (or back) between versions so we can't display the architecture for packages. Pseudo-Format for Version 3: Examples: stuff - - none < 1 amd64 none **CONFIGURE** libsame 1 i386 same < 2 i386 same **CONFIGURE** stuff 2 i386 none > 1 i386 none **CONFIGURE** libsame 2 i386 same > - - none **REMOVE** toolkit 1 all foreign > - - none **REMOVE** Closes: #712116 --- apt-pkg/cacheiterators.h | 1 + apt-pkg/deb/dpkgpm.cc | 71 +++++++++++----- apt-pkg/deb/dpkgpm.h | 4 +- apt-pkg/pkgcache.cc | 12 +++ doc/apt.conf.5.xml | 14 +++- ...bug-712116-dpkg-pre-install-pkgs-hook-multiarch | 95 ++++++++++++++++++++++ 6 files changed, 171 insertions(+), 26 deletions(-) create mode 100755 test/integration/test-bug-712116-dpkg-pre-install-pkgs-hook-multiarch diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index 179a0e963..886d84838 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -220,6 +220,7 @@ class pkgCache::VerIterator : public Iterator { inline VerFileIterator FileList() const; bool Downloadable() const; inline const char *PriorityType() const {return Owner->Priority(S->Priority);}; + const char *MultiArchType() const; std::string RelStr() const; bool Automatic() const; diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 3bc31dc37..fb0473535 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -238,15 +238,23 @@ bool pkgDPkgPM::Remove(PkgIterator Pkg,bool Purge) return true; } /*}}}*/ -// DPkgPM::SendV2Pkgs - Send version 2 package info /*{{{*/ +// DPkgPM::SendPkgInfo - Send info for install-pkgs hook /*{{{*/ // --------------------------------------------------------------------- /* This is part of the helper script communication interface, it sends very complete information down to the other end of the pipe.*/ bool pkgDPkgPM::SendV2Pkgs(FILE *F) { - fprintf(F,"VERSION 2\n"); - - /* Write out all of the configuration directives by walking the + return SendPkgsInfo(F, 2); +} +bool pkgDPkgPM::SendPkgsInfo(FILE * const F, unsigned int const &Version) +{ + // This version of APT supports only v3, so don't sent higher versions + if (Version <= 3) + fprintf(F,"VERSION %u\n", Version); + else + fprintf(F,"VERSION 3\n"); + + /* Write out all of the configuration directives by walking the configuration tree */ const Configuration::Item *Top = _config->Tree(0); for (; Top != 0;) @@ -280,30 +288,51 @@ bool pkgDPkgPM::SendV2Pkgs(FILE *F) pkgDepCache::StateCache &S = Cache[I->Pkg]; fprintf(F,"%s ",I->Pkg.Name()); - // Current version - if (I->Pkg->CurrentVer == 0) - fprintf(F,"- "); + + // Current version which we are going to replace + pkgCache::VerIterator CurVer = I->Pkg.CurrentVer(); + if (CurVer.end() == true && (I->Op == Item::Remove || I->Op == Item::Purge)) + CurVer = FindNowVersion(I->Pkg); + + else if (CurVer.end() == true) + { + if (Version <= 2) + fprintf(F, "- "); + else + fprintf(F, "- - none "); + } else - fprintf(F,"%s ",I->Pkg.CurrentVer().VerStr()); - - // Show the compare operator - // Target version + { + fprintf(F, "%s ", CurVer.VerStr()); + if (Version >= 3) + fprintf(F, "%s %s ", CurVer.Arch(), CurVer.MultiArchType()); + } + + // Show the compare operator between current and install version if (S.InstallVer != 0) { + pkgCache::VerIterator const InstVer = S.InstVerIter(Cache); int Comp = 2; - if (I->Pkg->CurrentVer != 0) - Comp = S.InstVerIter(Cache).CompareVer(I->Pkg.CurrentVer()); + if (CurVer.end() == false) + Comp = InstVer.CompareVer(CurVer); if (Comp < 0) fprintf(F,"> "); - if (Comp == 0) + else if (Comp == 0) fprintf(F,"= "); - if (Comp > 0) + else if (Comp > 0) fprintf(F,"< "); - fprintf(F,"%s ",S.InstVerIter(Cache).VerStr()); + fprintf(F, "%s ", InstVer.VerStr()); + if (Version >= 3) + fprintf(F, "%s %s ", InstVer.Arch(), InstVer.MultiArchType()); } else - fprintf(F,"> - "); - + { + if (Version <= 2) + fprintf(F, "> - "); + else + fprintf(F, "> - - none "); + } + // Show the filename/operation if (I->Op == Item::Install) { @@ -313,9 +342,9 @@ bool pkgDPkgPM::SendV2Pkgs(FILE *F) else fprintf(F,"%s\n",I->File.c_str()); } - if (I->Op == Item::Configure) + else if (I->Op == Item::Configure) fprintf(F,"**CONFIGURE**\n"); - if (I->Op == Item::Remove || + else if (I->Op == Item::Remove || I->Op == Item::Purge) fprintf(F,"**REMOVE**\n"); @@ -404,7 +433,7 @@ bool pkgDPkgPM::RunScriptsWithPkgs(const char *Cnf) } } else - SendV2Pkgs(F); + SendPkgsInfo(F, Version); fclose(F); diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h index aab39f633..c31d56f8e 100644 --- a/apt-pkg/deb/dpkgpm.h +++ b/apt-pkg/deb/dpkgpm.h @@ -14,6 +14,7 @@ #include #include #include +#include #ifndef APT_8_CLEANER_HEADERS using std::vector; @@ -79,7 +80,8 @@ class pkgDPkgPM : public pkgPackageManager // Helpers bool RunScriptsWithPkgs(const char *Cnf); - bool SendV2Pkgs(FILE *F); + __deprecated bool SendV2Pkgs(FILE *F); + bool SendPkgsInfo(FILE * const F, unsigned int const &Version); void WriteHistoryTag(std::string const &tag, std::string value); // apport integration diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index d7725563b..52e814c0b 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -924,6 +924,18 @@ string pkgCache::VerIterator::RelStr() const return Res; } /*}}}*/ +// VerIterator::MultiArchType - string representing MultiArch flag /*{{{*/ +const char * pkgCache::VerIterator::MultiArchType() const +{ + if ((S->MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same) + return "same"; + else if ((S->MultiArch & pkgCache::Version::Foreign) == pkgCache::Version::Foreign) + return "foreign"; + else if ((S->MultiArch & pkgCache::Version::Allowed) == pkgCache::Version::Allowed) + return "allowed"; + return "none"; +} + /*}}}*/ // PkgFileIterator::IsOk - Checks if the cache is in sync with the file /*{{{*/ // --------------------------------------------------------------------- /* This stats the file and compares its stats with the ones that were diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 3cf3136d3..9973fe42b 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -688,11 +688,17 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; will abort. APT will pass the filenames of all .deb files it is going to install to the commands, one per line on standard input. - Version 2 of this protocol dumps more information, including the + Version 2 of this protocol dumps more information, including the protocol version, the APT configuration space and the packages, files - and versions being changed. Version 2 is enabled by setting - DPkg::Tools::options::cmd::Version to 2. cmd is a - command given to Pre-Install-Pkgs. + and versions being changed. Version 3 adds the architecture and MultiArch + flag to each version being dumped. + + The version of the protocol to be used for the command + cmd can be chosen by setting + DPkg::Tools::options::cmd::Version + accordingly, the default being version 1. If APT isn't supporting the requested + version it will send the information in the highest version it has support for instead. + diff --git a/test/integration/test-bug-712116-dpkg-pre-install-pkgs-hook-multiarch b/test/integration/test-bug-712116-dpkg-pre-install-pkgs-hook-multiarch new file mode 100755 index 000000000..aee44f76b --- /dev/null +++ b/test/integration/test-bug-712116-dpkg-pre-install-pkgs-hook-multiarch @@ -0,0 +1,95 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework +setupenvironment +configarchitecture 'amd64' 'i386' + +buildsimplenativepackage 'toolkit' 'all' '1' 'stable' 'Multi-Arch: foreign' +buildsimplenativepackage 'toolkit' 'amd64' '2' 'unstable' 'Multi-Arch: foreign' +buildsimplenativepackage 'libsame' 'i386,amd64' '1' 'stable' 'Multi-Arch: same' +buildsimplenativepackage 'libsame' 'i386,amd64' '2' 'unstable' 'Multi-Arch: same' +buildsimplenativepackage 'stuff' 'i386,amd64' '1' 'stable' 'Depends: libsame (= 1), toolkit (= 1)' +buildsimplenativepackage 'stuff' 'i386,amd64' '2' 'unstable' 'Depends: libsame (= 2), toolkit (= 2)' + +setupaptarchive + +hook='pre-install-pkgs' + +enablehookversion() { + echo "#!/bin/sh +while read line; do + if echo \"\$line\" | grep -Fq '**'; then + echo \"\$line\" + fi +done > ${hook}-v${1}.list" > ${hook}-v${1}.sh + chmod +x ${hook}-v${1}.sh + echo "dpkg::${hook}:: \"./${hook}-v${1}.sh --foo -bar\"; +DPkg::Tools::options::\"./${hook}-v${1}.sh\"::Version \"$1\";" > rootdir/etc/apt/apt.conf.d/hook-v$1 +} + +enablehookversion 2 +enablehookversion 3 + +observehook() { + rm -f ${hook}-v2.list ${hook}-v3.list + msgtest 'Observe hooks while' "$*" + aptget "$@" -y --force-yes >/dev/null 2>&1 && msgpass || msgfail +} + +observehook install stuff -t stable +testfileequal "${hook}-v2.list" 'libsame - < 1 **CONFIGURE** +toolkit - < 1 **CONFIGURE** +stuff - < 1 **CONFIGURE**' +testfileequal "${hook}-v3.list" 'libsame - - none < 1 amd64 same **CONFIGURE** +toolkit - - none < 1 all foreign **CONFIGURE** +stuff - - none < 1 amd64 none **CONFIGURE**' + +observehook install stuff -t unstable +testfileequal "${hook}-v2.list" 'libsame 1 < 2 **CONFIGURE** +toolkit 1 < 2 **CONFIGURE** +stuff 1 < 2 **CONFIGURE**' +testfileequal "${hook}-v3.list" 'libsame 1 amd64 same < 2 amd64 same **CONFIGURE** +toolkit 1 all foreign < 2 amd64 foreign **CONFIGURE** +stuff 1 amd64 none < 2 amd64 none **CONFIGURE**' + +observehook install stuff:i386 -t unstable +testfileequal "${hook}-v2.list" 'stuff 2 > - **REMOVE** +libsame - < 2 **CONFIGURE** +stuff - < 2 **CONFIGURE**' +testfileequal "${hook}-v3.list" 'stuff 2 amd64 none > - - none **REMOVE** +libsame - - none < 2 i386 same **CONFIGURE** +stuff - - none < 2 i386 none **CONFIGURE**' + +observehook remove libsame +testfileequal "${hook}-v2.list" 'libsame 2 > - **REMOVE**' +testfileequal "${hook}-v3.list" 'libsame 2 amd64 same > - - none **REMOVE**' + +observehook install stuff:i386/stable libsame:i386/stable toolkit/stable +testfileequal "${hook}-v2.list" 'libsame 2 > 1 **CONFIGURE** +toolkit 2 > 1 **CONFIGURE** +stuff 2 > 1 **CONFIGURE**' +testfileequal "${hook}-v3.list" 'libsame 2 i386 same > 1 i386 same **CONFIGURE** +toolkit 2 amd64 foreign > 1 all foreign **CONFIGURE** +stuff 2 i386 none > 1 i386 none **CONFIGURE**' + +observehook install 'libsame:*' +testfileequal "${hook}-v2.list" 'libsame 1 < 2 **CONFIGURE** +libsame - < 2 **CONFIGURE** +toolkit 1 < 2 **CONFIGURE** +stuff 1 < 2 **CONFIGURE**' +testfileequal "${hook}-v3.list" 'libsame 1 i386 same < 2 i386 same **CONFIGURE** +libsame - - none < 2 amd64 same **CONFIGURE** +toolkit 1 all foreign < 2 amd64 foreign **CONFIGURE** +stuff 1 i386 none < 2 i386 none **CONFIGURE**' + +observehook purge stuff:i386 'libsame:*' toolkit +testfileequal "${hook}-v2.list" 'libsame 2 > - **REMOVE** +stuff 2 > - **REMOVE** +libsame 2 > - **REMOVE** +toolkit 2 > - **REMOVE**' +testfileequal "${hook}-v3.list" 'libsame 2 amd64 same > - - none **REMOVE** +stuff 2 i386 none > - - none **REMOVE** +libsame 2 i386 same > - - none **REMOVE** +toolkit 2 amd64 foreign > - - none **REMOVE**' -- cgit v1.2.3 From 3d1be93dc4242df2b93de632715a8aa7dd34f96f Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 28 Jun 2013 20:42:18 +0200 Subject: implement arch+= and arch-= for sources.list Default is to acquire all architectures from APT::Architectures which can be changed by arch=, but this isn't very flexible if you want "mostly" the default as you have to hardcode the architectures then, so arch-= and arch+= can be used to add/remove architectures from the default set. On a machine with 'amd64' and 'i386' configured the lines: deb [arch+=armel] http://example.org/debian wheezy rocks deb [arch-=amd64] http://example.org/debian jessie rocks will result in the download of: wheezy Packages for 'amd64', 'i386' and 'armel' jessie Packages for 'i386' --- apt-pkg/deb/debmetaindex.cc | 23 +++++- doc/sources.list.5.xml | 6 +- .../test-sourceslist-arch-plusminus-options | 85 ++++++++++++++++++++++ 3 files changed, 111 insertions(+), 3 deletions(-) create mode 100755 test/integration/test-sourceslist-arch-plusminus-options diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index 7a88d71e3..7dd5ab2bf 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -373,10 +373,29 @@ class debSLTypeDebian : public pkgSourceList::Type string const &Dist, string const &Section, bool const &IsSrc, map const &Options) const { - map::const_iterator const arch = Options.find("arch"); - vector const Archs = + // parse arch=, arch+= and arch-= settings + map::const_iterator arch = Options.find("arch"); + vector Archs = (arch != Options.end()) ? VectorizeString(arch->second, ',') : APT::Configuration::getArchitectures(); + if ((arch = Options.find("arch+")) != Options.end()) + { + std::vector const plusArch = VectorizeString(arch->second, ','); + for (std::vector::const_iterator plus = plusArch.begin(); plus != plusArch.end(); ++plus) + if (std::find(Archs.begin(), Archs.end(), *plus) == Archs.end()) + Archs.push_back(*plus); + } + if ((arch = Options.find("arch-")) != Options.end()) + { + std::vector const minusArch = VectorizeString(arch->second, ','); + for (std::vector::const_iterator minus = minusArch.begin(); minus != minusArch.end(); ++minus) + { + std::vector::iterator kill = std::find(Archs.begin(), Archs.end(), *minus); + if (kill != Archs.end()) + Archs.erase(kill); + } + } + map::const_iterator const trusted = Options.find("trusted"); for (vector::const_iterator I = List.begin(); diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index 5c539798a..fa32297c2 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -114,10 +114,14 @@ setting=value. Multiple settings are separated by spaces. The following settings are supported by APT (note however that unsupported settings will be ignored silently): - arch=arch1,arch2,… + + arch=arch1,arch2,… can be used to specify for which architectures information should be downloaded. If this option is not set all architectures defined by the APT::Architectures option will be downloaded. + arch+=arch1,arch2,… + and arch-=arch1,arch2,… + which can be used to add/remove architectures from the set which will be downloaded. trusted=yes can be set to indicate that packages from this source are always authenticated even if the Release file is not signed or the signature can't be checked. This disables parts of &apt-secure; diff --git a/test/integration/test-sourceslist-arch-plusminus-options b/test/integration/test-sourceslist-arch-plusminus-options new file mode 100755 index 000000000..0d4d7448f --- /dev/null +++ b/test/integration/test-sourceslist-arch-plusminus-options @@ -0,0 +1,85 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework +setupenvironment +configarchitecture 'amd64' + +testbinaries() { + msgtest 'Test acquired archs for' "$1" + shift + rm -f gotarchs.list + aptget update --print-uris | grep -o '/binary-[a-z0-9-]\+/Packages' | sort > gotarchs.list + while [ -n "$1" ]; do + echo "/binary-${1}/Packages" + shift + done | sort | checkdiff - gotarchs.list && msgpass || msgfail +} + +echo 'deb http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list +testbinaries 'default & native' 'amd64' +configarchitecture 'amd64' 'i386' +testbinaries 'default & native + foreign' 'amd64' 'i386' +configarchitecture 'amd64' 'i386' 'armel' 'armhf' 'mips' 'mipsel' +testbinaries 'default & native + many foreigns' 'amd64' 'i386' 'armel' 'armhf' 'mips' 'mipsel' + +echo 'deb [arch=amd64] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list +testbinaries 'arch=native' 'amd64' + +echo 'deb [arch=mips] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list +testbinaries 'arch=foreign' 'mips' + +echo 'deb [arch=kfreebsd-armel] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list +testbinaries 'arch=unknown' 'kfreebsd-armel' + +echo 'deb [arch=amd64,i386] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list +testbinaries 'arch=native,foreign' 'amd64' 'i386' + +echo 'deb [arch=mips,armhf] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list +testbinaries 'arch=foreign,foreign' 'mips' 'armhf' + +echo 'deb [arch=kfreebsd-armel,hurd-powerpc,mipsel,armel] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list +testbinaries 'arch=unknown,unknown,foreign,foreign' 'kfreebsd-armel' 'hurd-powerpc' 'mipsel' 'armel' + +echo 'deb [arch+=amd64] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list +testbinaries 'arch+=native' 'amd64' 'i386' 'armel' 'armhf' 'mips' 'mipsel' + +echo 'deb [arch+=mips] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list +testbinaries 'arch+=foreign' 'amd64' 'i386' 'armel' 'armhf' 'mips' 'mipsel' + +echo 'deb [arch+=mips,armhf,i386] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list +testbinaries 'arch+=foreign,foreign,foreign' 'amd64' 'i386' 'armel' 'armhf' 'mips' 'mipsel' + +echo 'deb [arch+=hurd-powerpc] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list +testbinaries 'arch+=unknown' 'amd64' 'i386' 'armel' 'armhf' 'mips' 'mipsel' 'hurd-powerpc' + +echo 'deb [arch+=mips,hurd-powerpc,i386] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list +testbinaries 'arch+=foreign,unknown,foreign' 'amd64' 'i386' 'armel' 'armhf' 'mips' 'mipsel' 'hurd-powerpc' + +echo 'deb [arch-=amd64] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list +testbinaries 'arch-=native' 'i386' 'armel' 'armhf' 'mips' 'mipsel' + +echo 'deb [arch-=mips] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list +testbinaries 'arch-=foreign' 'amd64' 'i386' 'armel' 'armhf' 'mipsel' + +echo 'deb [arch-=mips,armhf,i386] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list +testbinaries 'arch-=foreign,foreign,foreign' 'amd64' 'armel' 'mipsel' + +echo 'deb [arch-=hurd-powerpc] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list +testbinaries 'arch-=unknown' 'amd64' 'i386' 'armel' 'armhf' 'mips' 'mipsel' + +echo 'deb [arch-=mips,hurd-powerpc,i386] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list +testbinaries 'arch-=foreign,unknown,foreign' 'amd64' 'armel' 'armhf' 'mipsel' + +echo 'deb [arch=mips,i386 arch-=mips] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list +testbinaries 'substract from a arch-set' 'i386' + +echo 'deb [arch=mips,i386 arch-=mips] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list +testbinaries 'useless substract from a arch-set' 'i386' + +echo 'deb [arch=mips,i386 arch+=armhf] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list +testbinaries 'addition to a arch-set' 'i386' 'mips' 'armhf' + +echo 'deb [arch=mips,i386 arch+=mips] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list +testbinaries 'useless addition to a arch-set' 'i386' 'mips' -- cgit v1.2.3 From 486d190d3c66bb7271509dc002f8ec9e9eb0166c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 10 Jul 2013 13:06:05 +0200 Subject: prevent MarkInstall of unsynced Multi-Arch:same siblings Multi-Arch: same packages can be co-installed, but need to have the same version for all installed packages (aka "siblings"). Otherwise the unsynced versions will fight against each other and the auto-install as wel as the problem resolver will later have to decide between holding the packages or to remove one of the siblings (usually a foreign) taking a bunch of packages (like the entire foreign setup) with them. The idea here is now to be more pro-active: MarkInstall will fail for a package if the siblings aren't synced, so we don't allow a situation in which a resolver has to decide if to hold or to remove-upgrade under the assumption that the remove-upgrade decision is always wrong and doesn't deserve to be explored (expect valid out-of-syncs of course). Thats a pretty bold move to take for a library which is used by different solvers so this check is done in IsInstallOk and can be overridden if front-ends want to. --- apt-pkg/depcache.cc | 53 ++++++++++- apt-pkg/depcache.h | 30 ++++--- ...prevent-markinstall-multiarch-same-versionscrew | 100 +++++++++++++++++++++ 3 files changed, 166 insertions(+), 17 deletions(-) create mode 100755 test/integration/test-prevent-markinstall-multiarch-same-versionscrew diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 9f8422fec..2c6eb43bf 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -864,6 +864,11 @@ bool pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge, dpkg holds are enforced by the private IsModeChangeOk */ bool pkgDepCache::IsDeleteOk(PkgIterator const &Pkg,bool rPurge, unsigned long Depth, bool FromUser) +{ + return IsDeleteOkProtectInstallRequests(Pkg, rPurge, Depth, FromUser); +} +bool pkgDepCache::IsDeleteOkProtectInstallRequests(PkgIterator const &Pkg, + bool const rPurge, unsigned long const Depth, bool const FromUser) { if (FromUser == false && Pkg->CurrentVer == 0) { @@ -1047,9 +1052,10 @@ bool pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, return true; } - // check if we are allowed to install the package - if (IsInstallOk(Pkg,AutoInst,Depth,FromUser) == false) - return false; + // check if we are allowed to install the package (if we haven't already) + if (P.Mode != ModeInstall || P.InstallVer != P.CandidateVer) + if (IsInstallOk(Pkg,AutoInst,Depth,FromUser) == false) + return false; ActionGroup group(*this); P.iFlags &= ~AutoKept; @@ -1271,11 +1277,50 @@ bool pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, /*}}}*/ // DepCache::IsInstallOk - check if it is ok to install this package /*{{{*/ // --------------------------------------------------------------------- -/* The default implementation does nothing. +/* The default implementation checks if the installation of an M-A:same + package would lead us into a version-screw and if so forbids it. dpkg holds are enforced by the private IsModeChangeOk */ bool pkgDepCache::IsInstallOk(PkgIterator const &Pkg,bool AutoInst, unsigned long Depth, bool FromUser) { + return IsInstallOkMultiArchSameVersionSynced(Pkg,AutoInst, Depth, FromUser); +} +bool pkgDepCache::IsInstallOkMultiArchSameVersionSynced(PkgIterator const &Pkg, + bool const AutoInst, unsigned long const Depth, bool const FromUser) +{ + if (FromUser == true) // as always: user is always right + return true; + + // ignore packages with none-M-A:same candidates + VerIterator const CandVer = PkgState[Pkg->ID].CandidateVerIter(*this); + if (unlikely(CandVer.end() == true) || CandVer == Pkg.CurrentVer() || + (CandVer->MultiArch & pkgCache::Version::Same) != pkgCache::Version::Same) + return true; + + GrpIterator const Grp = Pkg.Group(); + for (PkgIterator P = Grp.PackageList(); P.end() == false; P = Grp.NextPkg(P)) + { + // not installed or version synced: fine by definition + // (simple string-compare as stuff like '1' == '0:1-0' can't happen here) + if (P->CurrentVer == 0 || strcmp(Pkg.CandVersion(), P.CandVersion()) == 0) + continue; + // packages loosing M-A:same can be out-of-sync + VerIterator CV = PkgState[P->ID].CandidateVerIter(*this); + if (unlikely(CV.end() == true) || + (CV->MultiArch & pkgCache::Version::Same) != pkgCache::Version::Same) + continue; + + // not downloadable means the package is obsolete, so allow out-of-sync + if (CV.Downloadable() == false) + continue; + + PkgState[Pkg->ID].iFlags |= AutoKept; + if (unlikely(DebugMarker == true)) + std::clog << OutputInDepth(Depth) << "Ignore MarkInstall of " << Pkg + << " as its M-A:same siblings are not version-synced" << std::endl; + return false; + } + return true; } /*}}}*/ diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index 7358048ed..d9c95349b 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -442,16 +442,15 @@ class pkgDepCache : protected pkgCache::Namespace /** \return \b true if it's OK for MarkInstall to install * the given package. * - * See the default implementation for a simple example how this - * method can be used. - * Overriding implementations should use the hold-state-flag to cache - * results from previous checks of this package - also it should - * be used if the default resolver implementation is also used to - * ensure that these packages are handled like "normal" dpkg holds. + * The default implementation simply calls all IsInstallOk* + * method mentioned below. + * + * Overriding implementations should use the hold-state-flag to + * cache results from previous checks of this package - if possible. * * The parameters are the same as in the calling MarkInstall: * \param Pkg the package that MarkInstall wants to install. - * \param AutoInst needs a previous MarkInstall this package? + * \param AutoInst install this and all its dependencies * \param Depth recursive deep of this Marker call * \param FromUser was the install requested by the user? */ @@ -461,12 +460,8 @@ class pkgDepCache : protected pkgCache::Namespace /** \return \b true if it's OK for MarkDelete to remove * the given package. * - * See the default implementation for a simple example how this - * method can be used. - * Overriding implementations should use the hold-state-flag to cache - * results from previous checks of this package - also it should - * be used if the default resolver implementation is also used to - * ensure that these packages are handled like "normal" dpkg holds. + * The default implementation simply calls all IsDeleteOk* + * method mentioned below, see also #IsInstallOk. * * The parameters are the same as in the calling MarkDelete: * \param Pkg the package that MarkDelete wants to remove. @@ -498,6 +493,15 @@ class pkgDepCache : protected pkgCache::Namespace pkgDepCache(pkgCache *Cache,Policy *Plcy = 0); virtual ~pkgDepCache(); + protected: + // methods call by IsInstallOk + bool IsInstallOkMultiArchSameVersionSynced(PkgIterator const &Pkg, + bool const AutoInst, unsigned long const Depth, bool const FromUser); + + // methods call by IsDeleteOk + bool IsDeleteOkProtectInstallRequests(PkgIterator const &Pkg, + bool const rPurge, unsigned long const Depth, bool const FromUser); + private: bool IsModeChangeOk(ModeList const mode, PkgIterator const &Pkg, unsigned long const Depth, bool const FromUser); diff --git a/test/integration/test-prevent-markinstall-multiarch-same-versionscrew b/test/integration/test-prevent-markinstall-multiarch-same-versionscrew new file mode 100755 index 000000000..fed12dad0 --- /dev/null +++ b/test/integration/test-prevent-markinstall-multiarch-same-versionscrew @@ -0,0 +1,100 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework +setupenvironment +configarchitecture 'amd64' 'i386' 'armel' + +insertpackage 'stable' 'allarchs' 'all' '1' +insertpackage 'unstable' 'allarchs' 'all' '2' + +insertinstalledpackage 'fine' 'i386,amd64' '1' 'Multi-Arch: same' +insertpackage 'stable' 'fine' 'i386,amd64' '1' 'Multi-Arch: same' +insertpackage 'unstable' 'fine' 'amd64,i386' '2' 'Multi-Arch: same' + +insertinstalledpackage 'fine-installed' 'i386,amd64' '1' 'Multi-Arch: same' +insertpackage 'stable' 'fine-installed' 'i386,amd64,armel' '1' 'Multi-Arch: same' +insertpackage 'unstable' 'fine-installed' 'i386,amd64' '2' 'Multi-Arch: same' + +insertinstalledpackage 'out-of-sync-native' 'i386,amd64' '1' 'Multi-Arch: same' +insertpackage 'stable' 'out-of-sync-native' 'i386,amd64' '1' 'Multi-Arch: same' +insertpackage 'unstable' 'out-of-sync-native' 'amd64' '2' 'Multi-Arch: same' + +insertinstalledpackage 'out-of-sync-foreign' 'i386,amd64' '1' 'Multi-Arch: same' +insertpackage 'stable' 'out-of-sync-foreign' 'i386,amd64' '1' 'Multi-Arch: same' +insertpackage 'unstable' 'out-of-sync-foreign' 'i386' '2' 'Multi-Arch: same' + +insertinstalledpackage 'out-of-sync-gone-native' 'i386,amd64' '1' 'Multi-Arch: same' +insertpackage 'stable' 'out-of-sync-gone-native' 'i386' '1' 'Multi-Arch: same' +insertpackage 'unstable' 'out-of-sync-gone-native' 'i386' '2' 'Multi-Arch: same' + +insertinstalledpackage 'out-of-sync-gone-foreign' 'i386,amd64' '1' 'Multi-Arch: same' +insertpackage 'stable' 'out-of-sync-gone-foreign' 'amd64' '1' 'Multi-Arch: same' +insertpackage 'unstable' 'out-of-sync-gone-foreign' 'amd64' '2' 'Multi-Arch: same' + +insertpackage 'stable' 'libsame2' 'i386' '1' 'Multi-Arch: same' +insertpackage 'unstable' 'libsame2' 'amd64' '2' 'Multi-Arch: same' +insertpackage 'unstable' 'depender2' 'all' '2' 'Depends: libsame2 (= 2)' +insertpackage 'stable' 'libsame3' 'i386' '1' 'Multi-Arch: same' +insertpackage 'unstable' 'libsame3' 'i386,amd64' '3' 'Multi-Arch: same' +insertpackage 'unstable' 'depender3' 'all' '3' 'Depends: libsame3 (= 3)' +setupaptarchive + +testequal 'Reading package lists... +Building dependency tree... +The following packages will be REMOVED: + out-of-sync-gone-foreign:i386 out-of-sync-gone-native +The following packages have been kept back: + out-of-sync-foreign:i386 out-of-sync-native +The following packages will be upgraded: + fine fine:i386 fine-installed fine-installed:i386 out-of-sync-gone-foreign + out-of-sync-gone-native:i386 +6 upgraded, 0 newly installed, 2 to remove and 2 not upgraded. +Remv out-of-sync-gone-foreign:i386 [1] +Remv out-of-sync-gone-native [1] +Inst fine [1] (2 unstable [amd64]) [fine:amd64 on fine:i386] [fine:i386 on fine:amd64] [fine:i386 ] +Inst fine:i386 [1] (2 unstable [i386]) +Conf fine (2 unstable [amd64]) +Conf fine:i386 (2 unstable [i386]) +Inst fine-installed [1] (2 unstable [amd64]) [fine-installed:amd64 on fine-installed:i386] [fine-installed:i386 on fine-installed:amd64] [fine-installed:i386 ] +Inst fine-installed:i386 [1] (2 unstable [i386]) +Conf fine-installed (2 unstable [amd64]) +Conf fine-installed:i386 (2 unstable [i386]) +Inst out-of-sync-gone-foreign [1] (2 unstable [amd64]) +Inst out-of-sync-gone-native:i386 [1] (2 unstable [i386]) +Conf out-of-sync-gone-foreign (2 unstable [amd64]) +Conf out-of-sync-gone-native:i386 (2 unstable [i386])' aptget dist-upgrade -s #-o Debug::pkgDepCache::Marker=1 + +rm rootdir/var/lib/dpkg/status +insertinstalledpackage 'libsame2' 'i386' '1' 'Multi-Arch: same' +insertinstalledpackage 'libsame3' 'i386' '1' 'Multi-Arch: same' + +# the error message isn't great, but better than nothing, right? +testequal 'Reading package lists... +Building dependency tree... +Some packages could not be installed. This may mean that you have +requested an impossible situation or if you are using the unstable +distribution that some required packages have not yet been created +or been moved out of Incoming. +The following information may help to resolve the situation: + +The following packages have unmet dependencies: + depender2 : Depends: libsame2 (= 2) but it is not going to be installed +E: Unable to correct problems, you have held broken packages.' aptget install depender2 -s + +testequal 'Reading package lists... +Building dependency tree... +The following extra packages will be installed: + libsame3:i386 libsame3 +The following NEW packages will be installed: + depender3 libsame3 +The following packages will be upgraded: + libsame3:i386 +1 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +Inst libsame3:i386 [1] (3 unstable [i386]) +Inst libsame3 (3 unstable [amd64]) +Inst depender3 (3 unstable [all]) +Conf libsame3:i386 (3 unstable [i386]) +Conf libsame3 (3 unstable [amd64]) +Conf depender3 (3 unstable [all])' aptget install depender3 -s -- cgit v1.2.3 From c7a629dd114c41a1244744e2f5085df2f505dc90 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 11 Jul 2013 20:44:52 +0200 Subject: update changelog --- debian/changelog | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 185322bb6..49dee8800 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,12 @@ -apt (0.9.9.1) UNRELEASED; urgency=low +apt (0.9.9.1) unstable; urgency=low [ Michael Vogt ] * debian/rules: - call dh_clean in clean (closes: #714980) * apt-pkg/packagemanager.cc: - increate APT::pkgPackageManager::MaxLoopCount to 5000 + * cherry pick debian/apt.auto-removal.sh feature from the + ubuntu/master branch [ Steve Langasek ] * debian/apt.conf.autoremove: don't include linux-image*, @@ -22,7 +24,12 @@ apt (0.9.9.1) UNRELEASED; urgency=low confusion between similarly-named kernel flavours. - Keep linux-backports-modules in sync with installed kernels. - -- Michael Vogt Fri, 05 Jul 2013 16:39:34 +0200 + [ David Kalnischkies ] + * Version 3 for DPkg::Pre-Install-Pkgs with MultiArch info (Closes: #712116) + * implement arch+= and arch-= for sources.list + * prevent MarkInstall of unsynced Multi-Arch:same siblings + + -- Michael Vogt Thu, 11 Jul 2013 20:44:31 +0200 apt (0.9.9) unstable; urgency=low -- cgit v1.2.3 From 2b9c9b7f28b18f6ae3e422020e8934872b06c9f3 Mon Sep 17 00:00:00 2001 From: Raphael Geissert Date: Sun, 14 Jul 2013 18:38:03 +0200 Subject: Do not send a connection: keep-alive, at all --- methods/http.cc | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/methods/http.cc b/methods/http.cc index db1085a2d..6e03e9d63 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -683,27 +683,14 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out) if (Itm->Uri.length() >= sizeof(Buf)) abort(); - /* Build the request. We include a keep-alive header only for non-proxy - requests. This is to tweak old http/1.0 servers that do support keep-alive - but not HTTP/1.1 automatic keep-alive. Doing this with a proxy server - will glitch HTTP/1.0 proxies because they do not filter it out and - pass it on, HTTP/1.1 says the connection should default to keep alive - and we expect the proxy to do this */ - if (Proxy.empty() == true || Proxy.Host.empty()) - { - // see LP bugs #1003633 and #1086997. The "+" is encoded as a workaround - // for a amazon S3 bug - sprintf(Buf,"GET %s HTTP/1.1\r\nHost: %s\r\nConnection: keep-alive\r\n", - QuoteString(Uri.Path,"+~ ").c_str(),ProperHost.c_str()); - } - else - { - /* Generate a cache control header if necessary. We place a max - cache age on index files, optionally set a no-cache directive - and a no-store directive for archives. */ - sprintf(Buf,"GET %s HTTP/1.1\r\nHost: %s\r\n", - Itm->Uri.c_str(),ProperHost.c_str()); - } + /* Build the request. No keep-alive is included as it is the default + in 1.1, can cause problems with proxies, and we are an HTTP/1.1 + client anyway. + C.f. https://tools.ietf.org/wg/httpbis/trac/ticket/158 */ + // see LP bugs #1003633 and #1086997. The "+" is encoded as a workaround + // for a amazon S3 bug + sprintf(Buf,"GET %s HTTP/1.1\r\nHost: %s\r\n", + QuoteString(Uri.Path,"+~ ").c_str(),ProperHost.c_str()); // generate a cache control header (if needed) if (_config->FindB("Acquire::http::No-Cache",false) == true) { -- cgit v1.2.3 From cd32d098b22a3aaf900e4f400ef92922ebecd6a1 Mon Sep 17 00:00:00 2001 From: Christian PERRIER Date: Tue, 16 Jul 2013 07:14:05 +0200 Subject: Vietnamese updated by Tran Ngoc Quan. Closes: #717016 --- debian/changelog | 7 + po/vi.po | 426 +++++++++++++++++++++++++++++-------------------------- 2 files changed, 230 insertions(+), 203 deletions(-) diff --git a/debian/changelog b/debian/changelog index 49dee8800..8473d5820 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.9.9.2) UNRELEASED; urgency=low + + [ Programs translations ] + * Vietnamese updated by Tran Ngoc Quan. Closes: #717016 + + -- Christian Perrier Tue, 16 Jul 2013 07:13:08 +0200 + apt (0.9.9.1) unstable; urgency=low [ Michael Vogt ] diff --git a/po/vi.po b/po/vi.po index 54807e201..6b11b6d53 100644 --- a/po/vi.po +++ b/po/vi.po @@ -1,14 +1,14 @@ # Vietnamese Translation for Apt. # This file is put in the public domain. # Clytie Siddall , 2005, 2006, 2007, 2008, 2009, 2010. -# Trần Ngọc Quân , 2012. +# Trần Ngọc Quân , 2012-2013. # msgid "" msgstr "" -"Project-Id-Version: apt 0.9.7.5\n" +"Project-Id-Version: apt-0.9.9.1\n" "Report-Msgid-Bugs-To: APT Development Team \n" "POT-Creation-Date: 2013-06-26 07:37+0200\n" -"PO-Revision-Date: 2012-11-20 14:12+0700\n" +"PO-Revision-Date: 2013-07-16 08:10+0700\n" "Last-Translator: Trần Ngọc Quân \n" "Language-Team: Vietnamese \n" "Language: vi\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Team-Website: \n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: LocFactoryEditor 1.8\n" +"X-Generator: Poedit 1.5.5\n" "X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-Basepath: ../\n" @@ -72,11 +72,11 @@ msgstr "Tổng liên quan phiên bản và tập tin: " #: cmdline/apt-cache.cc:343 msgid "Total Desc/File relations: " -msgstr "Tổng liên quan mô tả/tập tin: " +msgstr "Tổng quan hệ mô-tả/tập-tin: " #: cmdline/apt-cache.cc:345 msgid "Total Provides mappings: " -msgstr "Tổng ánh xạ Miễn là: " +msgstr "Tổng ánh xạ Cung cấp: " #: cmdline/apt-cache.cc:357 msgid "Total globbed strings: " @@ -92,7 +92,7 @@ msgstr "Tổng chỗ nghỉ: " #: cmdline/apt-cache.cc:384 msgid "Total space accounted for: " -msgstr "Tổng chỗ đã tính: " +msgstr "Tổng chỗ đã tính dành cho: " #: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 #, c-format @@ -107,7 +107,7 @@ msgstr "Không tìm thấy gói" #: cmdline/apt-cache.cc:1243 msgid "You must give at least one search pattern" -msgstr "Bạn phải đưa ra ít nhất 1 chuỗi tìm kiếm" +msgstr "Bạn phải đưa ra ít nhất một chuỗi tìm kiếm" #: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." @@ -164,7 +164,7 @@ msgstr " Bảng phiên bản:" #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" -msgstr "%s %s dành cho %s được biên dịch %s %s\n" +msgstr "%s %s dành cho %s được biên dịch trên %s %s\n" #: cmdline/apt-cache.cc:1730 msgid "" @@ -247,14 +247,18 @@ msgid "" "You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" "cdrom' for more information about the CD-ROM auto-detection and mount point." msgstr "" +"Không tìm thấy CD-ROM bằng cách dò tìm hay sử dụng điểm gắn mặc định.\n" +"Bạn có lẽ nên dùng tùy chọn --cdrom để đặt điểm gắn CD-ROM.\n" +"Xem 'man apt-cdrom' để có thêm thông tin về tự động dò tìm và điểm gắn CD-" +"ROM." #: cmdline/apt-cdrom.cc:85 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" -msgstr "Hãy cung cấp tên cho Đĩa này, như “Debian 5.0.3 Đĩa 1”" +msgstr "Hãy cung cấp tên cho Đĩa này, ví dụ như là: “Debian 5.0.3 Đĩa 1”" #: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" -msgstr "Hãy nạp đĩa vào ổ và bấm nút Enter" +msgstr "Hãy đưa đĩa vào ổ và bấm nút Enter" #: cmdline/apt-cdrom.cc:135 #, c-format @@ -267,7 +271,7 @@ msgstr "Hãy lặp lại tiến trình này cho các Đĩa còn lại trong bộ #: cmdline/apt-config.cc:46 msgid "Arguments not in pairs" -msgstr "Không có các đối số dạng cặp" +msgstr "Các đối số không thành cặp" #: cmdline/apt-config.cc:87 msgid "" @@ -314,7 +318,7 @@ msgstr "Lỗi biên dịch biểu thức chính quy - %s" #: cmdline/apt-get.cc:260 msgid "The following packages have unmet dependencies:" -msgstr "Những gói theo đây phụ thuộc vào phần mềm chưa có:" +msgstr "Những gói theo đây có phần phụ thuộc chưa có:" #: cmdline/apt-get.cc:350 #, c-format @@ -380,8 +384,8 @@ msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -"CẢNH BÁO: theo đây có những gói chủ yếu sẽ bị gỡ bỏ.\n" -"ĐỪNG làm như thế trừ khi bạn biết làm gì ở đây nó một cách chính xác." +"CẢNH BÁO: Có những gói chủ yếu sau đây sẽ bị gỡ bỏ.\n" +"ĐỪNG làm như thế trừ khi bạn biết chính xác mình đang làm gì!" #: cmdline/apt-get.cc:602 #, c-format @@ -433,7 +437,7 @@ msgstr " [Không phải phiên bản ứng cử]" #: cmdline/apt-get.cc:679 msgid "You should explicitly select one to install." -msgstr "Bạn nên chọn một cách dứt khoát gói cần cài." +msgstr "Bạn nên chọn một rõ ràng gói cần cài." #: cmdline/apt-get.cc:682 #, c-format @@ -443,8 +447,8 @@ msgid "" "is only available from another source\n" msgstr "" "Gói %s không phải sẵn sàng, nhưng mà một gói khác\n" -"đã tham chiếu đến nó. Có lẽ có nghĩa là gói còn thiếu,\n" -"đã trở thành cũ, hay chỉ sẵn sàng từ nguồn khác.\n" +"đã tham chiếu đến nó. Có lẽ có gói còn thiếu,\n" +"không còn dùng nữa, hay chỉ sẵn sàng từ một nguồn khác.\n" #: cmdline/apt-get.cc:700 msgid "However the following packages replace it:" @@ -464,12 +468,12 @@ msgstr "Không thể gỡ bỏ được gói ảo như “%s”\n" #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 #, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -msgstr "Chưa cài đặt gói %s nên không thể gỡ bỏ nó. Có phải bạn muốn '%s'?\n" +msgstr "Chưa cài đặt gói %s nên không thể gỡ bỏ nó. Có phải ý bạn là '%s'?\n" #: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 #, c-format msgid "Package '%s' is not installed, so not removed\n" -msgstr "Chưa cài đặt gói %s nên không thể gỡ bỏ nó\n" +msgstr "Gói %s chưa được cài đặt, thế nên không thể gỡ bỏ nó\n" #: cmdline/apt-get.cc:788 #, c-format @@ -485,7 +489,7 @@ msgstr "Đang bỏ qua %s vì nó đã được cài đặt và chưa lập tùy #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "" -"Đang bỏ qua %s vì nó không phải được cài đặt và chỉ yêu cầu Nâng cấp.\n" +"Đang bỏ qua %s vì nó chưa được cài đặt và chỉ Nâng cấp là được yêu cầu.\n" #: cmdline/apt-get.cc:834 #, c-format @@ -495,7 +499,7 @@ msgstr "Không thể cài đặt lại %s vì không thể tải về nó.\n" #: cmdline/apt-get.cc:839 #, c-format msgid "%s is already the newest version.\n" -msgstr "%s là phiên bản mơi nhất.\n" +msgstr "%s là phiên bản mới nhất.\n" #: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, c-format @@ -522,19 +526,19 @@ msgstr " gặp lỗi." #: cmdline/apt-get.cc:1031 msgid "Unable to correct dependencies" -msgstr "Không thể sửa cách phụ thuộc" +msgstr "Không thể sửa phần phụ thuộc" #: cmdline/apt-get.cc:1034 msgid "Unable to minimize the upgrade set" -msgstr "Không thể cực tiểu hóa tập hợp nâng cấp" +msgstr "Không thể tối thiểu hóa tập hợp nâng cấp" #: cmdline/apt-get.cc:1036 msgid " Done" -msgstr " Hoàn tất" +msgstr " Xong" #: cmdline/apt-get.cc:1040 msgid "You might want to run 'apt-get -f install' to correct these." -msgstr "Có lẽ bạn hãy chay lệnh “apt-get -f install” để sửa hết." +msgstr "Bạn có thể chạy lệnh “apt-get -f install” để sửa những lỗi trên." #: cmdline/apt-get.cc:1043 msgid "Unmet dependencies. Try using -f." @@ -544,7 +548,7 @@ msgstr "" #: cmdline/apt-get.cc:1068 msgid "WARNING: The following packages cannot be authenticated!" -msgstr "CẢNH BÁO: không thể xác thực những gói theo đây." +msgstr "CẢNH BÁO: Không thể xác thực những gói theo đây!" #: cmdline/apt-get.cc:1072 msgid "Authentication warning overridden.\n" @@ -552,7 +556,7 @@ msgstr "Cảnh báo xác thực bị đè.\n" #: cmdline/apt-get.cc:1079 msgid "Install these packages without verification [y/N]? " -msgstr "Cài đặt những gói này mà không kiểm chứng không? [y/N] [c/K] " +msgstr "Cài đặt những gói này mà không cần thẩm tra không? [y/N] [c/K] " #: cmdline/apt-get.cc:1081 msgid "Some packages could not be authenticated" @@ -564,7 +568,7 @@ msgstr "Gập lỗi và đã dùng tùy chọn “-y” mà không có “--for #: cmdline/apt-get.cc:1131 msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "Lỗi nội bộ: InstallPackages (cài đặt gói) được gọi với gói bị hỏng." +msgstr "Lỗi nội bộ: InstallPackages (cài đặt gói) được gọi với gói bị hỏng!" #: cmdline/apt-get.cc:1140 msgid "Packages need to be removed but remove is disabled." @@ -572,12 +576,12 @@ msgstr "Cần phải gỡ bỏ một số gói, nhưng mà khả năng Gỡ bỏ #: cmdline/apt-get.cc:1151 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" +msgstr "Gặp lỗi nội bộ: Tiến trình Sắp xếp chưa xong" #: cmdline/apt-get.cc:1189 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -"Lạ nhỉ... kích cỡ không khớp nhau. Hãy gửi thư cho " +"Lạ nhỉ... Kích cỡ không khớp nhau. Hãy gửi thư cho " #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB @@ -621,7 +625,8 @@ msgstr "Bạn không có đủ dung lượng đĩa còn trống trong %s." #: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -"Đã đưa ra “Chỉ không đáng kể” (Trivial Only) nhưng mà thao tác này đáng kể." +"Đã đưa ra “Chỉ không đáng kể” (Trivial Only) nhưng mà thao tác này là đáng " +"kể." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) @@ -636,8 +641,8 @@ msgid "" "To continue type in the phrase '%s'\n" " ?] " msgstr "" -"Bạn sắp làm gì có thể làm hại.\n" -"Để tiếp tục thì gõ cụm từ “%s”\n" +"Bạn sắp làm việc mà nó có thể gây hư hại cho hệ thống.\n" +"Nếu vẫn muốn tiếp tục thì hãy gõ cụm từ “%s”\n" "?]" #: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 @@ -651,7 +656,7 @@ msgstr "Bạn có muốn tiếp tục không? [C/k] " #: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 #, c-format msgid "Failed to fetch %s %s\n" -msgstr "Việc lấy %s bị lỗi %s\n" +msgstr "Gặp lỗi khi lấy %s %s\n" #: cmdline/apt-get.cc:1374 msgid "Some files failed to download" @@ -667,13 +672,13 @@ msgid "" "missing?" msgstr "" "Không thể lấy một số kho, có lẽ hãy chạy lệnh “apt-get update” (apt lấy cập " -"nhật) hay cố với “--fix-missing” (sửa thiếu sót) không?" +"nhật)\n" +"hay dùng tùy chọn “--fix-missing” (sửa thiếu sót) không?" #: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -"Chưa hô trợ tùy chọn “--fix-missing” (sửa khi thiếu điều) và trao đổi phương " -"tiện." +"Chưa hỗ trợ tùy chọn “--fix-missing” (sửa khi thiếu) và trao đổi phương tiện." #: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." @@ -696,7 +701,7 @@ msgstr[0] "" #: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." -msgstr "Ghi chú: thay đổi này được tự động thực hiệnbởi dpkg." +msgstr "Ghi chú: Thay đổi này được tự động thực hiện bởi dpkg." #: cmdline/apt-get.cc:1561 #, c-format @@ -706,7 +711,7 @@ msgstr "Bỏ qua bản phát hành đích không sẵn sàng “%s” của gói #: cmdline/apt-get.cc:1593 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" -msgstr "Đang chọn “%s” làm gói nguồn, thay cho “%s”\n" +msgstr "Đang chọn “%s” làm gói nguồn, thay thế cho “%s”\n" #. if (VerTag.empty() == false && Last == 0) #: cmdline/apt-get.cc:1631 @@ -742,11 +747,11 @@ msgstr "" #. #: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 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:" +msgstr "Có lẽ thông tin theo đây sẽ giúp đỡ bạn giải quyết tình trạng này:" #: cmdline/apt-get.cc:1824 msgid "Internal Error, AutoRemover broke stuff" -msgstr "Lỗi nội bộ: Bộ Gỡ bỏ Tự động đã làm hư gì." +msgstr "Lỗi nội bộ: Bộ Gỡ bỏ Tự động đã làm hỏng một thứ gì đó" #: cmdline/apt-get.cc:1831 msgid "" @@ -755,7 +760,7 @@ msgid_plural "" "The following packages were automatically installed and are no longer " "required:" msgstr[0] "" -"Gói nào theo đây đã được tự động cài đặt nên không còn cần thiết lại:" +"(Các) gói sau đây đã được tự động cài đặt nên không còn cần thiết lại:" #: cmdline/apt-get.cc:1835 #, c-format @@ -771,11 +776,11 @@ msgstr[0] "Hãy dùng lệnh `apt-get autoremove' để gỡ bỏ chúng." #: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" -msgstr "Lỗi nội bộ: AllUpgrade (toàn bộ nâng cấp) đã ngắt gì" +msgstr "Lỗi nội bộ: AllUpgrade (toàn bộ nâng cấp) đã làm hỏng thứ gì đó" #: cmdline/apt-get.cc:1955 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:" +msgstr "Có lẽ bạn cần chạy lệnh “apt-get -f install” để sửa những cái đó:" #: cmdline/apt-get.cc:1959 msgid "" @@ -783,7 +788,7 @@ msgid "" "solution)." 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)." +"install” mà không có gói nào (hoặc chỉ định cách thức giải quyết)." #: cmdline/apt-get.cc:1973 msgid "" @@ -792,10 +797,10 @@ msgid "" "distribution that some required packages have not yet been created\n" "or been moved out of Incoming." msgstr "" -"Không thể cài đặt một số gói. Có lẽ có nghĩa là bạn đa yêu cầu\n" +"Không thể cài đặt một số gói. Điều đó có nghĩa là bạn đã yêu cầu\n" "một trường hợp không thể, hoặc nếu bạn sử dụng bản phân phối\n" -"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)." +"chưa ổn định cái mà yêu cầu các gói mà nó chưa được tạo\n" +"hoặc di chuyển chúng ra khỏi phần Incoming (Đến)." #: cmdline/apt-get.cc:1994 msgid "Broken packages" @@ -841,7 +846,7 @@ msgstr "Gặp lỗi" #: cmdline/apt-get.cc:2192 msgid "Done" -msgstr "Hoàn tất" +msgstr "Xong" #: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 msgid "Internal error, problem resolver broke stuff" @@ -863,7 +868,7 @@ msgstr "Đang tải về %s %s" #: cmdline/apt-get.cc:2452 msgid "Must specify at least one package to fetch source for" -msgstr "Phải ghi rõ ít nhất một gói cho đó cần lấy mã nguồn" +msgstr "Phải chỉ định ít nhất một gói để mà lấy mã nguồn về cho nó" #: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, c-format @@ -876,7 +881,7 @@ msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -"GHI CHÚ: sự đóng gói “%s” được bảo tồn trong hệ thống điều khiển phiên bản " +"GHI CHÚ: sự đóng gói “%s” được bảo trì trong hệ thống điều khiển phiên bản " "“%s” tại:\n" "%s\n" @@ -899,7 +904,7 @@ msgstr "Đang bỏ qua tập tin đã được tải về “%s”\n" #: cmdline/apt-get.cc:2604 #, 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" +msgstr "Không đủ chỗ trống trên %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB @@ -918,11 +923,11 @@ msgstr "Cần phải lấy %sB từ kho nguồn.\n" #: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" -msgstr "Lấy nguồn %s\n" +msgstr "Lấy mã nguồn %s\n" #: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." -msgstr "Việc lấy một số kho bị lỗi." +msgstr "Gặp lỗi lkhi lấy một số kho." #: cmdline/apt-get.cc:2693 #, c-format @@ -937,12 +942,12 @@ msgstr "Lệnh giải nén “%s” bị lỗi.\n" #: cmdline/apt-get.cc:2706 #, 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" +msgstr "Hãy kiểm tra xem gói “dpkg-dev” đã được cài đặt chưa.\n" #: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" -msgstr "Lệnh xây dụng “%s” bị lỗi.\n" +msgstr "Lệnh xây dựng “%s” bị lỗi.\n" #: cmdline/apt-get.cc:2748 msgid "Child process failed" @@ -991,7 +996,7 @@ msgstr "cách phụ thuộc %s cho %s không thể được thỏa vì không t #, 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" +"Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi vì gói đã cài đặt %s là quá mới" #: cmdline/apt-get.cc:3089 #, c-format @@ -1098,7 +1103,7 @@ msgstr "" " install - Cài đặt gói mới (gói có dạng libc6 không phải libc6.deb)\n" " remove - Gỡ bỏ gói phần mềm\n" " autoremove - Tự động gỡ bỏ tất cả các gói không dùng\n" -" purge - Gỡ bỏ và tẩy gói\n" +" purge - Gỡ bỏ và tẩy xóa gói\n" " source - Tải về kho nguồn\n" " build-dep - Định cấu hình quan hệ phụ thuộc khi xây dụng, cho gói nguồn\n" " dist-upgrade - Nâng cấp bản phân phối hãy xem apt-get(8)\n" @@ -1125,7 +1130,7 @@ msgstr "" " -o=? Đặt tùy chọn cấu hình tùy ý, v.d. -o dir::cache=/tmp\n" "Để có thêm thông tin và tùy chọn thì hãy xem trang hướng dẫn\n" " apt-get(8), sources.list(5) và apt.conf(5).\n" -" Trình APT này có năng lực của siêu bò.\n" +" Trình APT này có năng lực của siêu bò.\n" #: cmdline/apt-get.cc:3572 msgid "" @@ -1134,10 +1139,10 @@ msgid "" " Keep also in mind that locking is deactivated,\n" " so don't depend on the relevance to the real current situation!" msgstr "" -"GHI CHÚ: đây chỉ là một sự mô phỏng !\n" -" apt-get yêu cầu quyền người chủ để thực hiện thật.\n" -" Cũng ghi nhớ rằng chức năng khoá bị tắt,\n" -" thì không nên thấy đây là trường hợp hiện thời thật." +"GHI CHÚ: đây chỉ là một sự mô phỏng!\n" +" apt-get yêu cầu quyền root để thực hiện thật.\n" +" Cũng cần nhớ rằng chức năng khoá bị tắt,\n" +" thì không nên thấy đây là trường hợp hiện thời thật!" #: cmdline/acqprogress.cc:60 msgid "Hit " @@ -1158,7 +1163,7 @@ msgstr "Lỗi " #: cmdline/acqprogress.cc:140 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "Đã lấy %sB trong %s (%sB/g).\n" +msgstr "Đã lấy %sB trong tổng số %s (%sB/g).\n" #: cmdline/acqprogress.cc:230 #, c-format @@ -1172,7 +1177,7 @@ msgid "" " '%s'\n" "in the drive '%s' and press enter\n" msgstr "" -"Chuyển đổi vật chứa: hãy nạp đĩa có nhãn\n" +"Chuyển đổi thiết bị lưu trữ: hãy nạp đĩa có nhãn\n" " “%s”\n" "vào ổ “%s” và bấm nút Enter\n" @@ -1194,24 +1199,24 @@ msgstr "%s đã sẵn được đặt thành cài đặt tự động rồi.\n" #: cmdline/apt-mark.cc:228 #, c-format msgid "%s was already set on hold.\n" -msgstr "%s đã sẵn được đặt là nắm giữ.\n" +msgstr "%s đã sẵn được đặt là giữ lại.\n" #: cmdline/apt-mark.cc:230 #, c-format msgid "%s was already not hold.\n" -msgstr "%s đã sẵn được đặt là chưa nắm giữ.\n" +msgstr "%s đã sẵn được đặt là không giữ lại.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 #: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" -msgstr "Đã đợi %s nhưng mà chưa gặp nó" +msgstr "Cần %s nhưng mà không thấy nó ở đây" #: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309 #, c-format msgid "%s set on hold.\n" -msgstr "%s được đặt là nắm giữ.\n" +msgstr "%s được đặt là giữ lại.\n" #: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314 #, c-format @@ -1220,7 +1225,8 @@ msgstr "Hủy bỏ nắm giữ %s.\n" #: cmdline/apt-mark.cc:332 msgid "Executing dpkg failed. Are you root?" -msgstr "Thực thi dpkg gặp lỗi. Bạn có quyền siêu người dùng không vậy?" +msgstr "" +"Thực thi lệnh dpkg gặp lỗi. Bạn có quyền siêu người dùng (root) không vậy?" #: cmdline/apt-mark.cc:379 msgid "" @@ -1250,7 +1256,7 @@ msgstr "" "dấu.\n" "\n" "Lệnh:\n" -" auto - Đánh dấu các gói đưa ra là đã được cài rồi\n" +" auto - Đánh dấu các gói đưa ra là được cài đặt tự động\n" " manual - Đánh dấu các gói đưa ra là được cài đặt bằng tay\n" "\n" "Tùy chọn:\n" @@ -1279,16 +1285,16 @@ msgstr "" #: methods/cdrom.cc:222 msgid "Wrong CD-ROM" -msgstr "CD-ROM không đúng" +msgstr "CD-ROM sai" #: methods/cdrom.cc:249 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." -msgstr "Không thể tháo gắn kết đĩa CD-ROM trong %s. Có lẽ nó còn dùng." +msgstr "Không thể bỏ gắn đĩa CD-ROM trong %s. Có lẽ nó vẫn đang được dùng." #: methods/cdrom.cc:254 msgid "Disk not found." -msgstr "Không tìm thấy đĩa" +msgstr "Không tìm thấy đĩa." #: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 msgid "File not found" @@ -1297,15 +1303,15 @@ msgstr "Không tìm thấy tập tin" #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 #: methods/rred.cc:512 methods/rred.cc:521 msgid "Failed to stat" -msgstr "Việc lấy các thông tin bị lỗi" +msgstr "Gặp lỗi khi lấy thống kê" #: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 msgid "Failed to set modification time" -msgstr "Việc lập giờ sửa đổi bị lỗi" +msgstr "Gặp lỗi khi đặt giờ sửa đổi" #: methods/file.cc:47 msgid "Invalid URI, local URIS must not start with //" -msgstr "Địa chỉ URI không hợp lệ: URI không thể bắt đầu với “//”" +msgstr "Địa chỉ URI không hợp lệ, URI nội bộ không thể bắt đầu với “//”" #. Login must be before getpeername otherwise dante won't work. #: methods/ftp.cc:173 @@ -1328,12 +1334,12 @@ msgstr "Máy phục vụ đã từ chối kết nối, và đã nói: %s" #: methods/ftp.cc:221 #, c-format msgid "USER failed, server said: %s" -msgstr "Lệnh USER (người dùng) đã thất bại: máy phục vụ nói: %s" +msgstr "Lệnh USER (người dùng) đã thất bại: máy chủ nói: %s" #: methods/ftp.cc:228 #, c-format msgid "PASS failed, server said: %s" -msgstr "Lệnh PASS (mật khẩu) đã thất bại: máy phục vụ nói: %s" +msgstr "Lệnh PASS (mật khẩu) đã thất bại: máy chủ nói: %s" #: methods/ftp.cc:248 msgid "" @@ -1346,12 +1352,12 @@ msgstr "" #: methods/ftp.cc:276 #, c-format msgid "Login script command '%s' failed, server said: %s" -msgstr "Lệnh tập lệnh đăng nhập “%s” đã thất bại: máy phục vụ nói: %s" +msgstr "Văn lệnh đăng nhập “%s” đã thất bại: máy chủ nói: %s" #: methods/ftp.cc:302 #, c-format msgid "TYPE failed, server said: %s" -msgstr "Lệnh TYPE (kiểu) đã thất bại: máy phục vụ nói: %s" +msgstr "Lệnh TYPE (kiểu) đã thất bại: máy chủ nói: %s" #: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 msgid "Connection timeout" @@ -1415,12 +1421,12 @@ msgstr "Không thể gửi lệnh PORT (cổng)" #: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" -msgstr "Không biết nhóm địa chỉ %u (AF_*)" +msgstr "Không biết họ địa chỉ %u (AF_*)" #: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" -msgstr "Lệnh EPRT (thông báo lỗi) đã thất bại: máy phục vụ nói: %s" +msgstr "Lệnh EPRT (thông báo lỗi) đã thất bại: máy chủ nói: %s" #: methods/ftp.cc:826 msgid "Data socket connect timed out" @@ -1432,7 +1438,7 @@ msgstr "Không thể chấp nhận kết nối" #: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" -msgstr "Gặp khó khăn khi tạo chuỗi duy nhất cho tập tin" +msgstr "Gặp vấn đề băm tập tin" #: methods/ftp.cc:885 #, c-format @@ -1460,7 +1466,7 @@ msgstr "Không thể gọi " #: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" -msgstr "Đang kết nối đến %s (%s)..." +msgstr "Đang kết nối đến %s (%s)" #: methods/connect.cc:87 #, c-format @@ -1475,7 +1481,7 @@ msgstr "Không thể tạo ổ cắm cho %s (f=%u t=%u p=%u)" #: methods/connect.cc:100 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." -msgstr "Không thể sở khởi kết nối đến %s:%s (%s)." +msgstr "Không thể khởi tạo kết nối đến %s:%s (%s)." #: methods/connect.cc:108 #, c-format @@ -1492,27 +1498,27 @@ msgstr "Không thể kết nối đến %s:%s (%s)." #: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" -msgstr "Đang kết nối đến %s..." +msgstr "Đang kết nối đến %s" #: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" -msgstr "Không thể tháo gỡ “%s”" +msgstr "Không thể phân giải “%s”" #: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" -msgstr "Việc tháo gỡ “%s” bị lỗi tạm thời" +msgstr "Việc phân giải “%s” bị lỗi tạm thời" #: methods/connect.cc:209 -#, fuzzy, c-format +#, c-format msgid "System error resolving '%s:%s'" -msgstr "Gặp lỗi nghiệm trọng khi tháo gỡ “%s:%s” (%i - %s)" +msgstr "Lỗi hệ thống khi phân giải '%s:%s'" #: methods/connect.cc:211 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" -msgstr "Gặp lỗi nghiệm trọng khi tháo gỡ “%s:%s” (%i - %s)" +msgstr "Một số hư hỏng đã xảy ra khi phân giải “%s:%s” (%i - %s)" #: methods/connect.cc:258 #, c-format @@ -1522,8 +1528,7 @@ msgstr "Không thể kết nối đến %s: %s:" #: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" -msgstr "" -"Lỗi nội bộ: chữ ký đúng, nhưng không thể quyết định vân tay của khóa ?!" +msgstr "Lỗi nội bộ: Chữ ký đúng, nhưng không thể xác định vân tay của khóa?!" #: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." @@ -1541,6 +1546,8 @@ msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" +"Tập tin Clearsigned không hợp lệ, nhận được '%s' (mạng yêu cầu xác nhận " +"phải không?)" #: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" @@ -1548,14 +1555,14 @@ msgstr "Gặp lỗi không rõ khi thực hiện gpgv" #: methods/gpgv.cc:215 methods/gpgv.cc:222 msgid "The following signatures were invalid:\n" -msgstr "Những chữ ký theo đây vẫn không hợp lệ:\n" +msgstr "Những chữ ký theo đây không hợp lệ:\n" #: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" -"Không thể kiểm chứng những chữ ký theo đây, vì khóa công không sẵn sàng:\n" +"Không thể kiểm chứng những chữ ký theo đây, vì khóa công không sẵn có:\n" #: methods/gzip.cc:65 msgid "Empty files can't be valid archives" @@ -1582,16 +1589,16 @@ msgstr "" #: methods/http.cc:621 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 " +"Máy phục vụ HTTP đã gửi một dòng đầu Content-Range (phạm vi nội dung) không " "hợp lệ" #: methods/http.cc:623 msgid "This HTTP server has broken range support" -msgstr "Máy phục vụ HTTP đã ngắt cách hỗ trợ phạm vị" +msgstr "Máy phục vụ HTTP đã ngắt cách hỗ trợ phạm vi" #: methods/http.cc:647 msgid "Unknown date format" -msgstr "Không rõ dạng ngày" +msgstr "Không rõ định dạng ngày" #: methods/http.cc:827 msgid "Select failed" @@ -1611,7 +1618,7 @@ msgstr "Gặp lỗi khi ghi vào tập tin" #: methods/http.cc:914 msgid "Error writing to the file" -msgstr "Gặp lỗi khi ghi vào tập tin đó" +msgstr "Gặp lỗi khi ghi vào tập tin" #: methods/http.cc:928 msgid "Error reading from server. Remote end closed connection" @@ -1667,14 +1674,14 @@ msgid "Can not read mirror file '%s'" msgstr "Không thể đọc tập tin mirror '%s'" #: methods/mirror.cc:315 -#, fuzzy, c-format +#, c-format msgid "No entry found in mirror file '%s'" -msgstr "Không thể đọc tập tin mirror '%s'" +msgstr "Không tìm thấy điểm vào trong tập tin mirror '%s'" #: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" -msgstr "[Nhân bản: %s]" +msgstr "[Bản sao: %s]" #: methods/rred.cc:491 #, c-format @@ -1682,8 +1689,7 @@ msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " "to be corrupt." msgstr "" -"Không thể vá lỗi %s dùng mmap và cách sử dụng tập tin: có vẻ là đắp vá bị " -"hỏng." +"Không thể vá %s dùng mmap và cách sử dụng tập tin: có vẻ là miếng vá bị hỏng." #: methods/rred.cc:496 #, c-format @@ -1691,8 +1697,8 @@ msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " "to be corrupt." msgstr "" -"Không thể vá lỗi %s dùng mmap (mà không có lỗi đặc trưng cho mmap): có vẻ là " -"đắp vá bị hỏng." +"Không thể vá %s dùng mmap (mà không có lỗi đặc trưng cho mmap): có vẻ là " +"miếng vá bị hỏng." #: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" @@ -1704,20 +1710,20 @@ msgstr "Kết nối bị đóng quá sớm." #: dselect/install:32 msgid "Bad default setting!" -msgstr "Thiết lập mặc định sai." +msgstr "Cài đặt mặc định sai!" #: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 #: dselect/install:105 dselect/update:45 msgid "Press enter to continue." -msgstr "Bấm phím Enter để tiếp tục lại." +msgstr "Bấm phím Enter để tiếp tục." #: dselect/install:91 msgid "Do you want to erase any previously downloaded .deb files?" -msgstr "Bạn có muốn xoá bất kỳ tập tin .deb đã tải về trước không?" +msgstr "Bạn có muốn xoá mọi tập tin .deb đã được tải về trước đây không?" #: dselect/install:101 msgid "Some errors occurred while unpacking. Packages that were installed" -msgstr "Gập một số lỗi trong khi giải nén. Những gói đã được cài đặt" +msgstr "Gặp một số lỗi trong khi giải nén. Những gói đã được cài đặt" #: dselect/install:102 msgid "will be configured. This may result in duplicate errors" @@ -1736,7 +1742,7 @@ msgstr "" #: dselect/update:30 msgid "Merging available information" -msgstr "Đang hợp nhất các thông tin sẵn sàng..." +msgstr "Đang hòa trộn các thông tin sẵn sàng..." #: cmdline/apt-extracttemplates.cc:102 #, c-format @@ -1852,7 +1858,7 @@ msgstr "" "Lệnh: \tpackages binarypath [tập_tin_đè [tiền_tố_đường_dẫn]]\n" " \tsources srcpath [tập_tin_đè[tiền_tố_đường_dẫn]]\n" " \tcontents path\n" -" \trelease path\n" +" \trelease path\n" " \tgenerate config [groups]\n" " \tclean config\n" "\n" @@ -1893,16 +1899,16 @@ msgstr "" " -h \t\t_Trợ giúp_ này\n" " --md5 \t\tĐiều khiển cách tạo ra MD5\n" " -s=? \t\tTập tin đè nguồn\n" -" -q \t\t_Im_ (không xuất chi tiết)\n" +" -q \t\t_Im lặng_ (không xuất chi tiết)\n" " -d=? \t\tChọn _cơ sở dữ liệu_ nhớ tạm tùy chọn\n" " --no-delink \tMở chế độ gỡ lỗi _bỏ liên kết_\n" " --contents \tĐiều khiển cách tạo ra tập tin _nội dung_\n" " -c=? \t\tĐọc tập tin cấu hình này\n" -" -o=? \t\tLập một tùy chọn cấu hình nhiệm ý, v.d. “-o dir::cache=/tmp”" +" -o=? \t\tĐặt một tùy chọn cấu hình nhiệm ý, v.d. “-o dir::cache=/tmp”" #: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" -msgstr "Không có điều đã chọn khớp được" +msgstr "Không có cái được chọn khớp được" #: ftparchive/apt-ftparchive.cc:881 #, c-format @@ -1924,8 +1930,8 @@ msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" -"Định dạng co sở dữ liệu không hợp lệ. Nếu bạn đã nâng cấp từ một phiên bản " -"apt cũ, hãy gỡ bỏ nó và sau đó tạo lại co sở dữ liệu." +"Định dạng cơ sở dữ liệu không hợp lệ. Nếu bạn đã nâng cấp từ một phiên bản " +"apt cũ, hãy gỡ bỏ nó và sau đó tạo lại cơ sở dữ liệu." #: ftparchive/cachedb.cc:81 #, c-format @@ -1936,7 +1942,7 @@ msgstr "Không thể mở tập tin cơ sở dữ liệu %s: %s." #: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" -msgstr "Việc lấy thông tin toàn bộ cho %s bị lỗi" +msgstr "Việc lấy thông tin thống kê cho %s bị lỗi" #: ftparchive/cachedb.cc:249 msgid "Archive has no control record" @@ -1944,7 +1950,7 @@ msgstr "Kho không có mục ghi điều khiển" #: ftparchive/cachedb.cc:490 msgid "Unable to get a cursor" -msgstr "Không thể lấy con chạy" +msgstr "Không thể lấy con trỏ" #: ftparchive/writer.cc:82 #, c-format @@ -1954,7 +1960,7 @@ msgstr "CB: Không thể đọc thư mục %s\n" #: ftparchive/writer.cc:87 #, c-format msgid "W: Unable to stat %s\n" -msgstr "CB: Không thể lấy thông tin toàn bộ cho %s\n" +msgstr "CB: Không thể lấy thông tin thống kê %s\n" #: ftparchive/writer.cc:143 msgid "E: " @@ -1971,7 +1977,7 @@ msgstr "LỖI: có lỗi áp dụng vào tập tin " #: ftparchive/writer.cc:170 ftparchive/writer.cc:202 #, c-format msgid "Failed to resolve %s" -msgstr "Việc quyết định %s bị lỗi" +msgstr "Gặp lỗi khi phân giải %s" #: ftparchive/writer.cc:183 msgid "Tree walking failed" @@ -2014,7 +2020,7 @@ msgstr "Kho không có trường gói" #: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" -msgstr " %s không có mục ghi đè\n" +msgstr " %s không có mục ghi đè (override)\n" #: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format @@ -2024,12 +2030,12 @@ msgstr " người bảo trì %s là %s không phải %s\n" #: ftparchive/writer.cc:711 #, c-format msgid " %s has no source override entry\n" -msgstr " %s không có mục ghi đè nguồn\n" +msgstr " %s không có mục ghi đè (override) nguồn\n" #: ftparchive/writer.cc:715 #, c-format msgid " %s has no binary override entry either\n" -msgstr " %s cũng không có mục ghi đè nhị phân\n" +msgstr " %s cũng không có mục ghi đè (override) nhị phân\n" #: ftparchive/contents.cc:341 ftparchive/contents.cc:372 msgid "realloc - Failed to allocate memory" @@ -2076,7 +2082,7 @@ msgstr "Việc tạo TẬP_TIN* bị lỗi" #: ftparchive/multicompress.cc:192 msgid "Failed to fork" -msgstr "Việc tạo tiến trình con bị lỗi" +msgstr "Gặp lỗi khi rẽ nhánh tiến trình" #: ftparchive/multicompress.cc:206 msgid "Compress child" @@ -2085,15 +2091,15 @@ msgstr "Nén con" #: ftparchive/multicompress.cc:229 #, c-format msgid "Internal error, failed to create %s" -msgstr "Lỗi nội bộ, việc tạo %s bị lỗi" +msgstr "Lỗi nội bộ, gặp lỗi khi tạo %s" #: ftparchive/multicompress.cc:304 msgid "IO to subprocess/file failed" -msgstr "việc nhập/xuất vào tiến trình con/tập tin bị lỗi" +msgstr "Gặp lỗi khi nhập/xuất vào tiến-trình-con/tập-tin" #: ftparchive/multicompress.cc:342 msgid "Failed to read while computing MD5" -msgstr "Việc đọc khi tính MD5 bị lỗi" +msgstr "Gặp lỗi khi đọc trong khi tính MD5" #: ftparchive/multicompress.cc:358 #, c-format @@ -2162,7 +2168,7 @@ msgstr "" #: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" -msgstr "Việc tạo những ống bị lỗi" +msgstr "Gặp lỗi khi tạo các đường ống dẫn lệnh" #: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " @@ -2269,12 +2275,12 @@ msgstr "Gói này đang cố ghi vào đích trệch đi %s/%s" #: apt-inst/extract.cc:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" -msgstr "Đường dẫn trệch đi quá dài." +msgstr "Đường dẫn trệch đi quá dài" #: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" -msgstr "Thư mục %s đang được thay thế do điều không phải là thư mục" +msgstr "Thư mục %s đang được thay thế do một cái không phải là thư mục" #: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" @@ -2292,17 +2298,17 @@ msgstr "Ghi đè lên gói đã khớp mà không có phiên bản cho %s" #: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" -msgstr "Tập tin %s/%s ghi đè lên điều trong gói %s" +msgstr "Tập tin %s/%s ghi đè lên một tập tin trong gói %s" #: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" -msgstr "Không thể lấy các thông tin về %s" +msgstr "Không thể lấy thông tin thống kê %s" #: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Đây không phải là một kho DEB hợp lệ vì còn thiếu bộ phận “%s”" +msgstr "Đây không phải là một kho DEB hợp lệ vì còn thiếu thành viên “%s”" #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain #: apt-inst/deb/debfile.cc:55 @@ -2315,7 +2321,7 @@ msgstr "" #: apt-inst/deb/debfile.cc:120 #, c-format msgid "Internal error, could not locate member %s" -msgstr "Gặp lỗi nội bộ, không thể định vị bộ phận %s" +msgstr "Gặp lỗi nội bộ, không thể định vị thành viên %s" #: apt-inst/deb/debfile.cc:214 msgid "Unparsable control file" @@ -2374,31 +2380,31 @@ msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" "Không thể tăng kích cỡ của ánh xạ bộ nhớ, vì chức năng tự động tăng bị người " -"dùng tắt." +"dùng tắt đi." #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:378 #, c-format msgid "%lid %lih %limin %lis" -msgstr "%lingày %ligiờ %liphút %ligiây" +msgstr "%li ngày %li giờ %li phút %li giây" #. h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:385 #, c-format msgid "%lih %limin %lis" -msgstr "%ligiờ %liphút %ligiây" +msgstr "%li giờ %li phút %li giây" #. min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:392 #, c-format msgid "%limin %lis" -msgstr "%liphút %ligiây" +msgstr "%li phút %li giây" #. s means seconds #: apt-pkg/contrib/strutl.cc:397 #, c-format msgid "%lis" -msgstr "%ligiây" +msgstr "%li giây" #: apt-pkg/contrib/strutl.cc:1173 #, c-format @@ -2408,7 +2414,7 @@ msgstr "Không tìm thấy vùng chọn %s" #: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Unrecognized type abbreviation: '%c'" -msgstr "Không nhận biết viết tắt kiểu: “%c”" +msgstr "Không nhận biết kiểu viết tắt: “%c”" #: apt-pkg/contrib/configuration.cc:605 #, c-format @@ -2418,48 +2424,49 @@ msgstr "Đang mở tập tin cấu hình %s..." #: apt-pkg/contrib/configuration.cc:773 #, c-format msgid "Syntax error %s:%u: Block starts with no name." -msgstr "Gặp lỗi cú pháp %s:%u: khối bắt đầu không có tên." +msgstr "Gặp lỗi cú pháp %s:%u: Khối bắt đầu không có tên." #: apt-pkg/contrib/configuration.cc:792 #, c-format msgid "Syntax error %s:%u: Malformed tag" -msgstr "Gặp lỗi cú pháp %s:%u: thẻ dạng sai" +msgstr "Gặp lỗi cú pháp %s:%u: Sai dạng thẻ" #: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk after value" -msgstr "Gặp lỗi cú pháp %s:%u: có rác thêm sau giá trị" +msgstr "Gặp lỗi cú pháp %s:%u: Có rác sau giá trị" #: apt-pkg/contrib/configuration.cc:849 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" -msgstr "Gặp lỗi cú pháp %s:%u: có thể thực hiện chỉ thị chỉ tại mức đầu" +msgstr "Gặp lỗi cú pháp %s:%u: Chỉ có thể thực hiện chỉ thị mức đầu" #: apt-pkg/contrib/configuration.cc:856 #, c-format msgid "Syntax error %s:%u: Too many nested includes" -msgstr "Gặp lỗi cú pháp %s:%u: quá nhiều điều bao gồm lồng nhau" +msgstr "Gặp lỗi cú pháp %s:%u: Quá nhiều chỉ thị bao gồm lồng nhau" #: apt-pkg/contrib/configuration.cc:860 apt-pkg/contrib/configuration.cc:865 #, c-format msgid "Syntax error %s:%u: Included from here" -msgstr "Gặp lỗi cú pháp %s:%u: đã bao gồm từ đây" +msgstr "Gặp lỗi cú pháp %s:%u: Đã được bao gồm từ đây" #: apt-pkg/contrib/configuration.cc:869 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "Gặp lỗi cú pháp %s:%u: chưa hỗ trợ chỉ thị “%s”" +msgstr "Gặp lỗi cú pháp %s:%u: Chưa hỗ trợ chỉ thị “%s”" #: apt-pkg/contrib/configuration.cc:872 #, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" -"Gặp lỗi cú pháp %s:%u: chỉ thị rõ thì yêu cầu một cây tuỳ chọn làm đối số" +"Gặp lỗi cú pháp %s:%u: chỉ thị `clear' thì yêu cầu một cây tuỳ chọn làm đối " +"số" #: apt-pkg/contrib/configuration.cc:922 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" -msgstr "Gặp lỗi cú pháp %s:%u: gặp rác thêm tại kết thúc tập tin" +msgstr "Gặp lỗi cú pháp %s:%u: Gặp rác tại kết thúc tập tin" #: apt-pkg/contrib/progress.cc:146 #, c-format @@ -2469,17 +2476,17 @@ msgstr "%c%s... Lỗi!" #: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Done" -msgstr "%c%s... Hoàn tất" +msgstr "%c%s... Xong" #: apt-pkg/contrib/progress.cc:179 msgid "..." -msgstr "" +msgstr "..." #. Print the spinner #: apt-pkg/contrib/progress.cc:195 -#, fuzzy, c-format +#, c-format msgid "%c%s... %u%%" -msgstr "%c%s... Hoàn tất" +msgstr "%c%s... %u%%" #: apt-pkg/contrib/cmndline.cc:80 #, c-format @@ -2495,7 +2502,7 @@ msgstr "Không hiểu tùy chọn dòng lệnh %s" #: apt-pkg/contrib/cmndline.cc:127 #, c-format msgid "Command line option %s is not boolean" -msgstr "Tùy chọn dòng lệnh %s không phải bun (đúng/không đúng)" +msgstr "Tùy chọn dòng lệnh %s không phải dạng lôgíc (đúng/sai)" #: apt-pkg/contrib/cmndline.cc:168 apt-pkg/contrib/cmndline.cc:189 #, c-format @@ -2505,7 +2512,7 @@ msgstr "Tùy chọn %s yêu cầu một đối số." #: apt-pkg/contrib/cmndline.cc:202 apt-pkg/contrib/cmndline.cc:208 #, c-format msgid "Option %s: Configuration item specification must have an =." -msgstr "Tùy chọn %s: đặc tả mục cấu hình phải có một “=”." +msgstr "Tùy chọn %s: Đặc tả mục cấu hình phải có một “=”." #: apt-pkg/contrib/cmndline.cc:237 #, c-format @@ -2520,7 +2527,7 @@ msgstr "Tùy chọn “%s” quá dài" #: apt-pkg/contrib/cmndline.cc:300 #, c-format msgid "Sense %s is not understood, try true or false." -msgstr "Không hiểu %s: hãy cố dùng true (đúng) hay false (không đúng)." +msgstr "Không hiểu %s: hãy cố dùng true (đúng) hay false (sai)." #: apt-pkg/contrib/cmndline.cc:350 #, c-format @@ -2534,7 +2541,7 @@ msgstr "Không thể lấy các thông tin cho điểm gắn kết %s" #: apt-pkg/contrib/cdromutl.cc:224 msgid "Failed to stat the cdrom" -msgstr "Việc lấy cac thông tin cho đĩa CD-ROM bị lỗi" +msgstr "Việc lấy các thông tin thống kê đĩa CD-ROM bị lỗi" #: apt-pkg/contrib/fileutl.cc:93 #, c-format @@ -2594,17 +2601,17 @@ msgstr "Tiến trình phụ %s đã nhận một lỗi chia ra từng đoạn." #: apt-pkg/contrib/fileutl.cc:843 #, c-format msgid "Sub-process %s received signal %u." -msgstr "Tiến trình phụ %s đã nhận tín hiệu %u." +msgstr "Tiến trình con %s đã nhận tín hiệu %u." #: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" -msgstr "Tiến trình phụ %s đã trả lời mã lỗi (%u)" +msgstr "Tiến trình con %s đã trả về một mã lỗi (%u)" #: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" -msgstr "Tiến trình phụ %s đã thoát bất thường" +msgstr "Tiến trình con %s đã thoát bất thường" #: apt-pkg/contrib/fileutl.cc:985 #, c-format @@ -2622,7 +2629,7 @@ msgstr "Việc tạo tiến trình con IPC bị lỗi" #: apt-pkg/contrib/fileutl.cc:1202 msgid "Failed to exec compressor " -msgstr "Việc thực hiện bô nén bị lỗi " +msgstr "Gặp lỗi khi thực hiện nén" #: apt-pkg/contrib/fileutl.cc:1297 #, c-format @@ -2642,7 +2649,7 @@ msgstr "Gặp vấn đề khi đóng tập tin %s" #: apt-pkg/contrib/fileutl.cc:1693 #, c-format msgid "Problem renaming the file %s to %s" -msgstr "Gặp vấn đề khi thay tên tập tin %s bằng %s" +msgstr "Gặp vấn đề khi đổi tên tập tin %s thành %s" #: apt-pkg/contrib/fileutl.cc:1704 #, c-format @@ -2682,7 +2689,7 @@ msgstr "Trình APT này không hỗ trợ hệ thống điều khiển phiên b #: apt-pkg/pkgcache.cc:172 msgid "The package cache was built for a different architecture" -msgstr "Bộ nhớ tạm gói được xây dựng cho một kiến trức khác" +msgstr "Bộ nhớ tạm gói được xây dựng cho một kiến trúc khác" #: apt-pkg/pkgcache.cc:314 msgid "Depends" @@ -2714,7 +2721,7 @@ msgstr "Làm cũ" #: apt-pkg/pkgcache.cc:316 msgid "Breaks" -msgstr "Làm hư" +msgstr "Làm hỏng" #: apt-pkg/pkgcache.cc:316 msgid "Enhances" @@ -2780,8 +2787,8 @@ msgstr "Không thể phân tích tập tin gói %s (2)" #, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" -"Gặp dòng dạng sai %lu trong danh sách nguồn %s ([tùy chọn] không phân tích " -"được)" +"Gặp dòng dạng sai %lu trong danh sách nguồn %s ([tùy chọn] không thể phân " +"tích được)" #: apt-pkg/sourcelist.cc:99 #, c-format @@ -2792,7 +2799,7 @@ msgstr "Gặp dòng dạng sai %lu trong danh sách nguồn %s ([tùy chọn] qu #, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" -"Gặp dòng dạng sai %lu trong danh sách nguồn %s ([%s] không phải là một sự " +"Gặp dòng dạng sai %lu trong danh sách nguồn %s ([%s] không phải là một phép " "gán)" #: apt-pkg/sourcelist.cc:116 @@ -2932,12 +2939,12 @@ msgstr "Không thể khoá thư mục %s" #: apt-pkg/acquire.cc:893 #, c-format msgid "Retrieving file %li of %li (%s remaining)" -msgstr "Đang lấy tập tin %li trên %li (%s còn lại)" +msgstr "Đang tải tập tin thứ %li trong tổng số %li (còn lại %s)" #: apt-pkg/acquire.cc:895 #, c-format msgid "Retrieving file %li of %li" -msgstr "Đang lấy tập tin %li trên %li" +msgstr "Đang tải tập tin %li trong tổng số %li" #: apt-pkg/acquire-worker.cc:112 #, c-format @@ -2952,7 +2959,7 @@ msgstr "Phương pháp %s đã không bắt đầu cho đúng." #: apt-pkg/acquire-worker.cc:447 #, 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." +msgstr "Hãy cho đĩa có nhãn “%s” vào ổ “%s” rồi bấm nút Enter." #: apt-pkg/init.cc:151 #, c-format @@ -3012,7 +3019,7 @@ msgstr "Chưa ghi rõ ưu tiên (hay số không) cho ghim" #: apt-pkg/pkgcachegen.cc:87 msgid "Cache has an incompatible versioning system" -msgstr "Bộ nhớ tạm có hệ thống điêu khiển phiên bản không tương thích" +msgstr "Bộ nhớ tạm có hệ thống điều khiển phiên bản không tương thích" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info @@ -3071,16 +3078,16 @@ msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn" #: apt-pkg/acquire-item.cc:139 #, c-format msgid "rename failed, %s (%s -> %s)." -msgstr "việc thay đổi tên bị lỗi, %s (%s → %s)." +msgstr "gặp lỗi khi đổi tên, %s (%s → %s)." #: apt-pkg/acquire-item.cc:599 msgid "MD5Sum mismatch" -msgstr "Sai khớp MD5Sum (tổng kiểm)" +msgstr "Mã băm tổng kiểm MD5Sum không khớp" #: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 #: apt-pkg/acquire-item.cc:2019 msgid "Hash Sum mismatch" -msgstr "Sai khớp tổng chuỗi duy nhất (hash sum)" +msgstr "Mã băm tổng kiểm tra (hash sum) không khớp" #: apt-pkg/acquire-item.cc:1377 #, c-format @@ -3112,7 +3119,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:1495 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" -msgstr "Bản phát hành xung đột: %s (mong đợi %s còn nhận %s)" +msgstr "Bản phát hành xung đột: %s (cần %s nhưng lại nhận được %s)" #: apt-pkg/acquire-item.cc:1525 #, c-format @@ -3158,7 +3165,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:1868 msgid "Size mismatch" -msgstr "Sai khớp kích cỡ" +msgstr "Kích cỡ không khớp nhau" #: apt-pkg/indexrecords.cc:68 #, c-format @@ -3199,8 +3206,8 @@ msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -"Đang dùng điểm lắp đĩa CD-ROM %s\n" -"Đang lắp đĩa CD-ROM...\n" +"Đang dùng thư mục gắn đĩa CD-ROM %s\n" +"Đang gắn đĩa CD-ROM...\n" #: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 msgid "Identifying.. " @@ -3213,16 +3220,16 @@ msgstr "Nhãn đã lưu: %s\n" #: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 msgid "Unmounting CD-ROM...\n" -msgstr "Đang tháo lắp đĩa CD-ROM...\n" +msgstr "Đang bỏ gắn CD-ROM...\n" #: apt-pkg/cdrom.cc:642 #, c-format msgid "Using CD-ROM mount point %s\n" -msgstr "Đang dùng điểm lắp đĩa CD-ROM %s\n" +msgstr "Đang dùng điểm gắn đĩa CD-ROM %s\n" #: apt-pkg/cdrom.cc:660 msgid "Unmounting CD-ROM\n" -msgstr "Đang tháo lắp đĩa CD-ROM...\n" +msgstr "Đang bỏ gắn CD-ROM...\n" #: apt-pkg/cdrom.cc:665 msgid "Waiting for disc...\n" @@ -3250,7 +3257,7 @@ msgid "" "wrong architecture?" msgstr "" "Không tìm thấy tập tin gói nào, có thể vì đây không phải là một Đĩa Debian, " -"hoặc có kiến trúc không đúng ?" +"hoặc có kiến trúc không đúng?" #: apt-pkg/cdrom.cc:782 #, c-format @@ -3285,29 +3292,29 @@ msgstr "Các mục nhập danh sách nguồn cho đĩa này:\n" #: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 #, c-format msgid "Wrote %i records.\n" -msgstr "Mới ghi %i mục ghi.\n" +msgstr "Đã ghi %i bản ghi.\n" #: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 #, c-format msgid "Wrote %i records with %i missing files.\n" -msgstr "Mới ghi %i mục ghi với %i tập tin còn thiếu.\n" +msgstr "Đã ghi %i bản ghi với %i tập tin còn thiếu.\n" #: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 #, c-format msgid "Wrote %i records with %i mismatched files\n" -msgstr "Mới ghi %i mục ghi với %i tập tin không khớp với nhau\n" +msgstr "Đã ghi %i bản ghi với %i tập tin không khớp với nhau\n" #: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -"Mới ghi %i mục ghi với %i tập tin còn thiếu và %i tập tin không khớp với " +"Đã ghi %i bản ghi với %i tập tin còn thiếu và %i tập tin không khớp với " "nhau\n" #: apt-pkg/indexcopy.cc:515 #, c-format msgid "Can't find authentication record for: %s" -msgstr "Không tìm thấy mục ghi xác thực cho: %s" +msgstr "Không tìm thấy bản ghi xác thực cho: %s" #: apt-pkg/indexcopy.cc:521 #, c-format @@ -3413,7 +3420,7 @@ msgstr "Đang ghi lưu sự biến mất của %s" #: apt-pkg/deb/dpkgpm.cc:78 #, c-format msgid "Running post-installation trigger %s" -msgstr "Đang chạy bộ gây nên tiến trình cuối cùng cài đặt %s" +msgstr "Đang chạy bẫy sau-cài-đặt %s" #. FIXME: use a better string after freeze #: apt-pkg/deb/dpkgpm.cc:705 @@ -3464,11 +3471,11 @@ msgstr "Đang chuẩn bị gỡ bỏ hoàn toàn %s" #: apt-pkg/deb/dpkgpm.cc:966 #, c-format msgid "Completely removed %s" -msgstr "Mới gỡ bỏ hoàn toàn %s" +msgstr "Gỡ bỏ hoàn toàn %s" #: apt-pkg/deb/dpkgpm.cc:1213 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" +msgstr "Không thể ghi nhật ký, openpty() bị lỗi (“/dev/pts” chưa gắn?)\n" #: apt-pkg/deb/dpkgpm.cc:1243 msgid "Running dpkg" @@ -3486,33 +3493,36 @@ msgstr "" #. check if its not a follow up error #: apt-pkg/deb/dpkgpm.cc:1482 msgid "dependency problems - leaving unconfigured" -msgstr "gặp vấn đề về quan hệ phụ thuộc nên để lại không có cấu hình" +msgstr "gặp vấn đề về quan hệ phụ thuộc nên để lại không cấu hình" #: apt-pkg/deb/dpkgpm.cc:1484 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -"Không ghi báo cáo apport, vì thông điệp lỗi ngụ ý rằng nó là một lỗi kế tiếp " -"do một sự thất bại trước." +"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi kế tiếp " +"do một sự thất bại trước đó." #: apt-pkg/deb/dpkgpm.cc:1490 msgid "" "No apport report written because the error message indicates a disk full " "error" -msgstr "Không ghi báo cáo apport, vì thông điệp lỗi ngụ ý một lỗi “đĩa đầy”" +msgstr "" +"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “đĩa đầy”" #: apt-pkg/deb/dpkgpm.cc:1496 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -"Không ghi báo cáo apport, vì thông điệp lỗi ngụ ý một lỗi “không đủ bộ nhớ”" +"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “không đủ " +"bộ nhớ”" #: apt-pkg/deb/dpkgpm.cc:1503 msgid "" "No apport report written because the error message indicates a dpkg I/O error" -msgstr "Không ghi báo cáo apport, vì thông điệp lỗi ngụ ý một lỗi “V/R dpkg”" +msgstr "" +"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “V/R dpkg”" #: apt-pkg/deb/debsystem.cc:84 #, c-format @@ -3520,13 +3530,13 @@ msgid "" "Unable to lock the administration directory (%s), is another process using " "it?" msgstr "" -"Không thể khoá thư mục quản lý (%s): có một tiến trình khác đang sử dụng nó " -"không?" +"Không thể khoá thư mục quản trị (%s), có một tiến trình khác đang sử dụng nó " +"phải không?" #: apt-pkg/deb/debsystem.cc:87 #, c-format msgid "Unable to lock the administration directory (%s), are you root?" -msgstr "Không thể khoá thư mục quản lý (%s): bạn có quyền người chủ không?" +msgstr "Không thể khoá thư mục quản trị (%s), bạn có quyền root không?" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a @@ -3534,12 +3544,22 @@ msgstr "Không thể khoá thư mục quản lý (%s): bạn có quyền ngườ #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " -msgstr "dpkg bị gián đoạn, bạn cần phải tự động chạy “%s” để giải vấn đề này." +msgstr "" +"dpkg bị ngắt giữa chừng, bạn cần phải chạy “%s” một cách thủ công để giải " +"vấn đề này." #: apt-pkg/deb/debsystem.cc:121 msgid "Not locked" msgstr "Chưa được khoá" +#~ 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 "" +#~ "Gặp lỗi trong khi thẩm tra chữ ký.\n" +#~ "Kho lưu chưa được cập nhật nên dùng những tập tin chỉ mục trước.\n" +#~ "Lỗi GPG: %s: %s\n" + #~ msgid "File %s doesn't start with a clearsigned message" #~ msgstr "Tập tin %s không bắt đầu bằng một đoạn chữ ký (gpg)" -- cgit v1.2.3 From 86fdeec2a76f6b134ee8400eb1e53d06fe0974fe Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 16 Jul 2013 23:15:55 +0200 Subject: fix if-clause to generate hook-info for 'rc' packages The code incorrectly skips printing of current version information, if the package has no current version (for APT, but for dpkg as it is the case for packages which are removed but not purged) by using an unintended "else if" rather than an "if". Closes: 717006 --- apt-pkg/deb/dpkgpm.cc | 2 +- ...bug-712116-dpkg-pre-install-pkgs-hook-multiarch | 25 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index fb0473535..d8fc8ef68 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -294,7 +294,7 @@ bool pkgDPkgPM::SendPkgsInfo(FILE * const F, unsigned int const &Version) if (CurVer.end() == true && (I->Op == Item::Remove || I->Op == Item::Purge)) CurVer = FindNowVersion(I->Pkg); - else if (CurVer.end() == true) + if (CurVer.end() == true) { if (Version <= 2) fprintf(F, "- "); diff --git a/test/integration/test-bug-712116-dpkg-pre-install-pkgs-hook-multiarch b/test/integration/test-bug-712116-dpkg-pre-install-pkgs-hook-multiarch index aee44f76b..a89cb7191 100755 --- a/test/integration/test-bug-712116-dpkg-pre-install-pkgs-hook-multiarch +++ b/test/integration/test-bug-712116-dpkg-pre-install-pkgs-hook-multiarch @@ -13,6 +13,13 @@ buildsimplenativepackage 'libsame' 'i386,amd64' '2' 'unstable' 'Multi-Arch: same buildsimplenativepackage 'stuff' 'i386,amd64' '1' 'stable' 'Depends: libsame (= 1), toolkit (= 1)' buildsimplenativepackage 'stuff' 'i386,amd64' '2' 'unstable' 'Depends: libsame (= 2), toolkit (= 2)' +setupsimplenativepackage 'confpkg' 'amd64' '1' 'unstable' +BUILDDIR='incoming/confpkg-1' +echo 'foo "bar";' > ${BUILDDIR}/pkg.conf +echo 'pkg.conf /etc/pkg.conf' >> ${BUILDDIR}/debian/install +buildpackage "$BUILDDIR" 'unstable' 'main' 'amd64' +rm -rf "$BUILDDIR" + setupaptarchive hook='pre-install-pkgs' @@ -93,3 +100,21 @@ testfileequal "${hook}-v3.list" 'libsame 2 amd64 same > - - none **REMOVE** stuff 2 i386 none > - - none **REMOVE** libsame 2 i386 same > - - none **REMOVE** toolkit 2 amd64 foreign > - - none **REMOVE**' + +observehook install confpkg +testfileequal "${hook}-v2.list" 'confpkg - < 1 **CONFIGURE**' +testfileequal "${hook}-v3.list" 'confpkg - - none < 1 amd64 none **CONFIGURE**' + +observehook remove confpkg +testfileequal "${hook}-v2.list" 'confpkg 1 > - **REMOVE**' +testfileequal "${hook}-v3.list" 'confpkg 1 amd64 none > - - none **REMOVE**' + +msgtest 'Conffiles of package remained after remove' 'confpkg' +dpkg -l confpkg | grep -q '^rc' && msgpass || msgfail + +observehook purge confpkg +testfileequal "${hook}-v2.list" 'confpkg 1 > - **REMOVE**' +testfileequal "${hook}-v3.list" 'confpkg 1 amd64 none > - - none **REMOVE**' + +msgtest 'Conffiles are gone after purge' 'confpkg' +dpkg -l confpkg 2>/dev/null | grep -q '^rc' && msgfail || msgpass -- cgit v1.2.3 From 209a7f82159e67aa32f6b3e6052245b707f27979 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 17 Jul 2013 14:56:47 +0200 Subject: fix if-clause to generate hook-info for 'rc' packages (Closes: 717006) --- debian/changelog | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8473d5820..f7c8f8a5a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,12 @@ -apt (0.9.9.2) UNRELEASED; urgency=low +apt (0.9.9.2) unstable; urgency=low [ Programs translations ] * Vietnamese updated by Tran Ngoc Quan. Closes: #717016 - -- Christian Perrier Tue, 16 Jul 2013 07:13:08 +0200 + [ David Kalnischkies ] + * fix if-clause to generate hook-info for 'rc' packages (Closes: 717006) + + -- Michael Vogt Wed, 17 Jul 2013 14:56:34 +0200 apt (0.9.9.1) unstable; urgency=low -- cgit v1.2.3 From 61843f539513b3e661dac55717e6d7cc0b8f9b0c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 18 Jul 2013 16:52:31 +0200 Subject: skip all Description fields in apt-cache, not just first MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Given a Packages file like: […] Description: foo bar baz moo moo moo Multi-Arch: foreign Description-md5: 97e204a9f4ad8c681dbd54ec7c505251 […] We have to display the Multi-Arch flag field as well as the fields after the Description-md5, but not this field itself, as we already have one printed alongside the Description we display. Closes: 717254 --- cmdline/apt-cache.cc | 52 +++++++++++++++------- .../test-bug-712435-missing-descriptions | 52 +++++++++++++++++++++- 2 files changed, 86 insertions(+), 18 deletions(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index fb4467c2c..336ac544b 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1127,6 +1127,22 @@ bool Dotty(CommandLine &CmdL) // --------------------------------------------------------------------- /* This displays the package record from the proper package index file. It is not used by DumpAvail for performance reasons. */ + +static unsigned char const* skipDescriptionFields(unsigned char const * DescP) +{ + while ((DescP = (unsigned char*)strchr((char*)DescP, '\n')) != NULL) + { + if (DescP[1] == ' ') + DescP += 2; + else if (strncmp((char*)DescP, "\nDescription", strlen("\nDescription")) == 0) + DescP += strlen("\nDescription"); + else + break; + } + if (DescP != NULL) + ++DescP; + return DescP; +} bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V) { pkgCache *Cache = CacheFile.GetPkgCache(); @@ -1184,32 +1200,34 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V) cout << std::endl << "Description-md5: " << Desc.md5() << std::endl; // Find the first field after the description (if there is any) - while ((DescP = (unsigned char*)strchr((char*)DescP, '\n')) != NULL) - { - if (DescP[1] == ' ') - DescP += 2; - else if (strncmp((char*)DescP, "\nDescription", strlen("\nDescription")) == 0) - DescP += strlen("\nDescription"); - else - break; - } - if (DescP != NULL) - ++DescP; + DescP = skipDescriptionFields(DescP); } - // if we have no translation, we found a lonely Description-md5, so don't skip it + // else we have no translation, so we found a lonely Description-md5 -> don't skip it - if (DescP != NULL) + // write the rest of the buffer, but skip mixed in Descriptions* fields + while (DescP != NULL) { - // write the rest of the buffer - const unsigned char *end=&Buffer[V.FileList()->Size]; - if (fwrite(DescP,1,end-DescP,stdout) < (size_t)(end-DescP)) + const unsigned char * const Start = DescP; + const unsigned char *End = (unsigned char*)strstr((char*)DescP, "\nDescription"); + if (End == NULL) + { + End = &Buffer[V.FileList()->Size]; + DescP = NULL; + } + else + { + ++End; // get the newline into the output + DescP = skipDescriptionFields(End + strlen("Description")); + } + size_t const length = End - Start; + if (fwrite(Start, 1, length, stdout) < length) { delete [] Buffer; return false; } } - // write a final newline (after the description) + // write a final newline after the last field cout< aptarchive/Packages +$PACKAGESTANZA + +Package: apt-intermixed +$PACKAGESTANZA +$DESCRIPTION +X-Some-Flag: yes +Description-md5: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + +Package: apt-intermixed2 +$PACKAGESTANZA +$DESCRIPTION +X-Some-Flag: yes +$TRANSDESCRIPTION +X-Foo-Flag: Something with a Description +Description-md5: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +X-Bar-Flag: no + +Package: apt-intermixed3 +$PACKAGESTANZA +$DESCRIPTION +X-Some-Flag: yes +$TRANSDESCRIPTION +X-Foo-Flag: Something with a Description +X-Bar-Flag: no +Description-md5: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" > aptarchive/Packages + setupaptarchive @@ -87,3 +112,28 @@ Description-md5: dddddddddddddddddddddddddddddddd testequal "Package: apt-none $PACKAGESTANZA " aptcache show apt-none + +testequal "Package: apt-intermixed +$PACKAGESTANZA +$DESCRIPTION +Description-md5: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +X-Some-Flag: yes +" aptcache show apt-intermixed + +testequal "Package: apt-intermixed2 +$PACKAGESTANZA +$DESCRIPTION +Description-md5: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +X-Some-Flag: yes +X-Foo-Flag: Something with a Description +X-Bar-Flag: no +" aptcache show apt-intermixed2 + +testequal "Package: apt-intermixed3 +$PACKAGESTANZA +$DESCRIPTION +Description-md5: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +X-Some-Flag: yes +X-Foo-Flag: Something with a Description +X-Bar-Flag: no +" aptcache show apt-intermixed3 -- cgit v1.2.3 From 922f07986b93ce7866f89917e3a475e6a4b3941c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 18 Jul 2013 19:22:29 +0200 Subject: fix 'apt-cache search' crash with missing description Beside the earlier fixed 'apt-cache show', 'showpkg' and 'search' deal with descriptions. 'showpkg' was fixed by fixing the cache generation for 'show', but 'search' still segfaulted. On the upside, it doesn't segfault any longer, on the downside, if a package has no description at all (aka: not in the Packages file and not in a Translation-* file) the package can't be found with 'search', even if we search only by name. That is a shortcoming in the code, but fixing it means rewriting it completely for dubious gain at best. So this commit just skips packages without a description and is done. Closes: 647590 --- cmdline/apt-cache.cc | 33 ++++++++++++++-------- .../test-bug-712435-missing-descriptions | 26 +++++++++++++++++ 2 files changed, 48 insertions(+), 11 deletions(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 336ac544b..5d1ee5615 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1130,12 +1130,14 @@ bool Dotty(CommandLine &CmdL) static unsigned char const* skipDescriptionFields(unsigned char const * DescP) { + char const * const TagName = "\nDescription"; + size_t const TagLen = strlen(TagName); while ((DescP = (unsigned char*)strchr((char*)DescP, '\n')) != NULL) { if (DescP[1] == ' ') DescP += 2; - else if (strncmp((char*)DescP, "\nDescription", strlen("\nDescription")) == 0) - DescP += strlen("\nDescription"); + else if (strncmp((char*)DescP, TagName, TagLen) == 0) + DescP += TagLen; else break; } @@ -1166,11 +1168,12 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V) if (PkgF.Open(I.FileName(), FileFd::ReadOnly, FileFd::Extension) == false) return false; - // Read the record - unsigned char *Buffer = new unsigned char[Cache->HeaderP->MaxVerFileSize+1]; - Buffer[V.FileList()->Size] = '\n'; - if (PkgF.Seek(V.FileList()->Offset) == false || - PkgF.Read(Buffer,V.FileList()->Size) == false) + // Read the record (and ensure that it ends with a newline and NUL) + unsigned char *Buffer = new unsigned char[Cache->HeaderP->MaxVerFileSize+2]; + Buffer[Vf->Size] = '\n'; + Buffer[Vf->Size+1] = '\0'; + if (PkgF.Seek(Vf->Offset) == false || + PkgF.Read(Buffer,Vf->Size) == false) { delete [] Buffer; return false; @@ -1181,7 +1184,7 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V) if (DescP != NULL) ++DescP; else - DescP = Buffer + V.FileList()->Size; + DescP = Buffer + Vf->Size; // Write all but Description if (fwrite(Buffer,1,DescP - Buffer,stdout) < (size_t)(DescP - Buffer)) @@ -1211,7 +1214,7 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V) const unsigned char *End = (unsigned char*)strstr((char*)DescP, "\nDescription"); if (End == NULL) { - End = &Buffer[V.FileList()->Size]; + End = &Buffer[Vf->Size]; DescP = NULL; } else @@ -1318,7 +1321,11 @@ bool Search(CommandLine &CmdL) pkgCache::VerIterator V = Plcy->GetCandidateVer(P); if (V.end() == false) { - DFList[G->ID].Df = V.TranslatedDescription().FileList(); + pkgCache::DescIterator const D = V.TranslatedDescription(); + //FIXME: packages without a description can't be found + if (D.end() == true) + continue; + DFList[G->ID].Df = D.FileList(); DFList[G->ID].ID = G->ID; } @@ -1333,7 +1340,11 @@ bool Search(CommandLine &CmdL) continue; unsigned long id = Prv.OwnerPkg().Group()->ID; - DFList[id].Df = V.TranslatedDescription().FileList(); + pkgCache::DescIterator const D = V.TranslatedDescription(); + //FIXME: packages without a description can't be found + if (D.end() == true) + continue; + DFList[id].Df = D.FileList(); DFList[id].ID = id; size_t const PrvPatternOffset = id * NumPatterns; diff --git a/test/integration/test-bug-712435-missing-descriptions b/test/integration/test-bug-712435-missing-descriptions index c61bea452..53ecbbeb3 100755 --- a/test/integration/test-bug-712435-missing-descriptions +++ b/test/integration/test-bug-712435-missing-descriptions @@ -137,3 +137,29 @@ X-Some-Flag: yes X-Foo-Flag: Something with a Description X-Bar-Flag: no " aptcache show apt-intermixed3 + +msgtest 'Test that no description does not destroy' 'showpkg' +aptcache showpkg apt-none | sed 's#/tmp/.*_aptarchive_#/tmp/aptarchive_#' >showpkg.explosion && msgpass || msgfail +testfileequal showpkg.explosion 'Package: apt-none +Versions: +0.9.7.8 (/tmp/aptarchive_Packages) + + +Reverse Depends: +Dependencies: +0.9.7.8 - +Provides: +0.9.7.8 - +Reverse Provides: ' + +testempty aptcache search nonexistentstring + +# packages without a description can't be found +testequal 'apt-normal - commandline package manager +apt-both-below - commandline package manager +apt-both-middle - commandline package manager +apt-both-top - commandline package manager +apt-trans - commandline package manager +apt-intermixed - commandline package manager +apt-intermixed2 - commandline package manager +apt-intermixed3 - commandline package manager' aptcache search apt -- cgit v1.2.3 From 267275c59cc35704789a228c6e9b1464c4cabd74 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 23 Jul 2013 15:00:53 +0200 Subject: remove double list include --- apt-pkg/cacheset.h | 1 - 1 file changed, 1 deletion(-) diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h index 2a45910ba..d7328d705 100644 --- a/apt-pkg/cacheset.h +++ b/apt-pkg/cacheset.h @@ -11,7 +11,6 @@ // Include Files /*{{{*/ #include #include -#include #include #include #include -- cgit v1.2.3 From c1f8f8c0b070b52e7d85ed932418bc3497cc7990 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 23 Jul 2013 19:55:14 +0200 Subject: debian/apt.auto-removal.sh: * debian/apt.auto-removal.sh: - do not include debug symbol packages for the kernel in the blacklist (closes: #717616) --- debian/apt.auto-removal.sh | 2 +- debian/changelog | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/apt.auto-removal.sh b/debian/apt.auto-removal.sh index 4ada56556..d105f440a 100644 --- a/debian/apt.auto-removal.sh +++ b/debian/apt.auto-removal.sh @@ -42,7 +42,7 @@ version_test_gt () return "$?" } -list=$(${DPKG} -l 'linux-image-[0-9]*'|awk '/^ii/ { print $2 }' | sed -e's/linux-image-//') +list=$(${DPKG} -l 'linux-image-[0-9]*'|awk '/^ii/ && $2 !~ /-dbg$/ { print $2 }' | sed -e's/linux-image-//') latest_version="" previous_version="" diff --git a/debian/changelog b/debian/changelog index f7c8f8a5a..acb27293f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +apt (0.9.9.3) UNRELEASED; urgency=low + + [ Ben Hutchings ] + * debian/apt.auto-removal.sh: + - do not include debug symbol packages for the kernel in the + blacklist (closes: #717616) + + -- Michael Vogt Tue, 23 Jul 2013 19:54:31 +0200 + apt (0.9.9.2) unstable; urgency=low [ Programs translations ] -- cgit v1.2.3 From d3213963281a4f910b78679dad35bf59ddbd721c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 23 Jul 2013 20:09:05 +0200 Subject: debian/apt.postinst: * debian/apt.postinst: - run /etc/kernel/postinst.d/apt-auto-removal once on upgrade to ensure that the correct auto-removal list is generated (closes: #717615) --- debian/apt.postinst | 4 ++++ debian/changelog | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/debian/apt.postinst b/debian/apt.postinst index bd814e1af..9ff1e031c 100644 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -28,6 +28,10 @@ case "$1" in chmod -f 0640 /var/log/apt/term.log* || true fi + # create kernel autoremoval blacklist on update + if dpkg --compare-versions "$2" lt-nl 0.9.9.3; then + /etc/kernel/postinst.d/apt-auto-removal + fi ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/changelog b/debian/changelog index acb27293f..119f09ec3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,12 @@ apt (0.9.9.3) UNRELEASED; urgency=low * debian/apt.auto-removal.sh: - do not include debug symbol packages for the kernel in the blacklist (closes: #717616) + + [ Michael Vogt ] + * debian/apt.postinst: + - run /etc/kernel/postinst.d/apt-auto-removal once on upgrade + to ensure that the correct auto-removal list is generated + (closes: #717615) -- Michael Vogt Tue, 23 Jul 2013 19:54:31 +0200 -- cgit v1.2.3 From 462cfb71b8ebfa4da6b5681cee96931c927ae232 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 25 Jul 2013 17:15:18 +0200 Subject: skip all Description fields in apt-cache, not just first (Closes: 717254) * skip all Description fields in apt-cache, not just first (Closes: 717254) * fix 'apt-cache search' crash with missing description (Closes: 647590) --- debian/changelog | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 119f09ec3..745cf7930 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.9.9.3) UNRELEASED; urgency=low +apt (0.9.9.3) unstable; urgency=low [ Ben Hutchings ] * debian/apt.auto-removal.sh: @@ -11,7 +11,11 @@ apt (0.9.9.3) UNRELEASED; urgency=low to ensure that the correct auto-removal list is generated (closes: #717615) - -- Michael Vogt Tue, 23 Jul 2013 19:54:31 +0200 + [ David Kalnischkies ] + * skip all Description fields in apt-cache, not just first (Closes: 717254) + * fix 'apt-cache search' crash with missing description (Closes: 647590) + + -- Michael Vogt Thu, 25 Jul 2013 17:14:58 +0200 apt (0.9.9.2) unstable; urgency=low -- cgit v1.2.3 From 96ab3c6f62becde2fc67b81c65eef2881856fd22 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 25 Jul 2013 20:14:31 +0200 Subject: always "delete d" in FileFd::~FileFd to coverity happy --- apt-pkg/contrib/fileutl.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 0f88923cf..edf612810 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -1218,11 +1218,9 @@ FileFd::~FileFd() { Close(); if (d != NULL) - { d->CloseDown(FileName); - delete d; - d = NULL; - } + delete d; + d = NULL; } /*}}}*/ // FileFd::Read - Read a bit of the file /*{{{*/ -- cgit v1.2.3 From 26d5b68a008cfedec113ebdde782c3d18478a5b4 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 25 Jul 2013 20:14:59 +0200 Subject: fix off-by-one error and do not use magic constant of 100 when checking StackPost --- apt-pkg/contrib/configuration.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index 808a708a1..376617401 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -811,7 +811,7 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool const &AsSectio // Go down a level if (TermChar == '{') { - if (StackPos <= 100) + if (StackPos < sizeof(Stack)/sizeof(std::string)) Stack[StackPos++] = ParentTag; /* Make sectional tags incorperate the section into the -- cgit v1.2.3 From c104200045ef19f5ee061c4a00b468482ac65dc4 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 25 Jul 2013 20:16:31 +0200 Subject: =?UTF-8?q?fix=20off-by-one=20error=20in=20HttpMethod::=E2=80=8BAu?= =?UTF-8?q?toDetectProxy()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- methods/http.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/methods/http.cc b/methods/http.cc index db1085a2d..ec5b1ff52 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -1401,7 +1401,7 @@ bool HttpMethod::AutoDetectProxy() char buf[512]; int InFd = Pipes[0]; close(Pipes[1]); - int res = read(InFd, buf, sizeof(buf)); + int res = read(InFd, buf, sizeof(buf)-1); ExecWait(Process, "ProxyAutoDetect", true); if (res < 0) -- cgit v1.2.3 From fe0036dd7e3bbd808fa526e2e142fdb89105caae Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 25 Jul 2013 20:22:43 +0200 Subject: rework the code in cdromutl.cc to make coverity (more) happy --- apt-pkg/contrib/cdromutl.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apt-pkg/contrib/cdromutl.cc b/apt-pkg/contrib/cdromutl.cc index 187f6bd59..afa01a562 100644 --- a/apt-pkg/contrib/cdromutl.cc +++ b/apt-pkg/contrib/cdromutl.cc @@ -122,8 +122,9 @@ bool MountCdrom(string Path, string DeviceName) if (Child == 0) { // Make all the fds /dev/null + int null_fd = open("/dev/null",O_RDWR); for (int I = 0; I != 3; I++) - dup2(open("/dev/null",O_RDWR),I); + dup2(null_fd, I); if (_config->Exists("Acquire::cdrom::"+Path+"::Mount") == true) { -- cgit v1.2.3 From 3d165906327828990bec2c58a3c1f4ee77467523 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 25 Jul 2013 20:26:11 +0200 Subject: fix resource leak (thanks coverity) --- apt-pkg/contrib/fileutl.cc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index edf612810..398830ff5 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -244,17 +244,21 @@ int GetLock(string File,bool Errors) fl.l_len = 0; if (fcntl(FD,F_SETLK,&fl) == -1) { + // always close to not leak resources + int Tmp = errno; + close(FD); + errno = Tmp; + if (errno == ENOLCK) { + _error->Warning(_("Not using locking for nfs mounted lock file %s"),File.c_str()); return dup(0); // Need something for the caller to close - } + } + if (Errors == true) _error->Errno("open",_("Could not get lock %s"),File.c_str()); - int Tmp = errno; - close(FD); - errno = Tmp; return -1; } -- cgit v1.2.3 From db0e2486a18332154b6c8ac6a6f0f74f40b40a05 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 25 Jul 2013 20:30:59 +0200 Subject: add .travis.yml --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..df16858be --- /dev/null +++ b/.travis.yml @@ -0,0 +1,5 @@ +language: cpp +before_install: + - sudo apt-get update -qq + - sudo apt-get install -qq dpkg-dev, debhelper, libdb-dev, gettext, libcurl4-gnutls-dev, zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, po4a, autotools-dev, autoconf, automake, doxygen, debiandoc-sgml +script: test/integration/run-tests -- cgit v1.2.3 From a80a03448fe11f8ea3fd4a8c525fc413c9ce9037 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 25 Jul 2013 20:36:23 +0200 Subject: call fdopen() after FileFd was checked --- apt-pkg/indexcopy.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index 1d61b974d..a2adb2d00 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -714,9 +714,9 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name, /*{{{*/ } else { Target.Open(TargetF,FileFd::WriteAtomic); } - FILE *TargetFl = fdopen(dup(Target.Fd()),"w"); if (_error->PendingError() == true) return false; + FILE *TargetFl = fdopen(dup(Target.Fd()),"w"); if (TargetFl == 0) return _error->Errno("fdopen","Failed to reopen fd"); -- cgit v1.2.3 From 60fc4f21783fddaae481494f99ec157e08a9bfdb Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 25 Jul 2013 20:41:03 +0200 Subject: apt-pkg/indexcopy.cc: check for pending errors before calling fdopen() --- apt-pkg/indexcopy.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index a2adb2d00..4920efff8 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -106,9 +106,9 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector &List, } else { Target.Open(TargetF,FileFd::WriteAtomic); } - FILE *TargetFl = fdopen(dup(Target.Fd()),"w"); if (_error->PendingError() == true) return false; + FILE *TargetFl = fdopen(dup(Target.Fd()),"w"); if (TargetFl == 0) return _error->Errno("fdopen","Failed to reopen fd"); -- cgit v1.2.3 From a9d6b0ad873fdf38e7a7077fd1f07289ad66d45a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 25 Jul 2013 20:45:53 +0200 Subject: fix resource leak when verification fails --- apt-pkg/indexcopy.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index 4920efff8..7694cb1dd 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -601,6 +601,7 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector &SigList, (useInRelease ? inrelease.c_str() : releasegpg.c_str())); // something went wrong, don't copy the Release.gpg // FIXME: delete any existing gpg file? + delete MetaIndex; continue; } -- cgit v1.2.3 From 6612c86ef3d8f2b8bccc6212791996ab9e053082 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 25 Jul 2013 20:46:08 +0200 Subject: delete targets data --- apt-pkg/deb/debmetaindex.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index 7dd5ab2bf..b597b6f3c 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -238,6 +238,7 @@ bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool const &GetAll) const new pkgAcqIndex(Owner, (*Target)->URI, (*Target)->Description, (*Target)->ShortDesc, HashString()); } + delete targets; // this is normally created in pkgAcqMetaSig, but if we run // in --print-uris mode, we add it here -- cgit v1.2.3 From de24f8ce508edd02690947d8dff7f0a4090a67fe Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 25 Jul 2013 20:55:02 +0200 Subject: fix potential GetLock() fd leak --- cmdline/apt-get.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 85ed80a95..73b396795 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2290,9 +2290,10 @@ bool DoClean(CommandLine &CmdL) FileFd Lock; if (_config->FindB("Debug::NoLocking",false) == false) { - Lock.Fd(GetLock(archivedir + "lock")); - if (_error->PendingError() == true) + int lock_fd = GetLock(archivedir + "lock"); + if (lock_fd < 0) return _error->Error(_("Unable to lock the download directory")); + Lock.Fd(lock_fd); } pkgAcquire Fetcher; @@ -2326,9 +2327,10 @@ bool DoAutoClean(CommandLine &CmdL) FileFd Lock; if (_config->FindB("Debug::NoLocking",false) == false) { - Lock.Fd(GetLock(_config->FindDir("Dir::Cache::Archives") + "lock")); - if (_error->PendingError() == true) + int lock_fd = GetLock(_config->FindDir("Dir::Cache::Archives") + "lock"); + if (lock_fd < 0) return _error->Error(_("Unable to lock the download directory")); + Lock.Fd(lock_fd); } CacheFile Cache; -- cgit v1.2.3 From 1b7bf822ad9504f6d01cd4422d830e8815143912 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 25 Jul 2013 20:55:18 +0200 Subject: add missing "free(buffer) for allocated buffer --- apt-pkg/contrib/fileutl.cc | 1 - methods/gpgv.cc | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 398830ff5..0b6e07f75 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -251,7 +251,6 @@ int GetLock(string File,bool Errors) if (errno == ENOLCK) { - _error->Warning(_("Not using locking for nfs mounted lock file %s"),File.c_str()); return dup(0); // Need something for the caller to close } diff --git a/methods/gpgv.cc b/methods/gpgv.cc index fe8bac6c9..ea8a26fd4 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -152,6 +152,7 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, } } fclose(pipein); + free(buffer); int status; waitpid(pid, &status, 0); -- cgit v1.2.3 From 079706b449d359366bf9342de1b0897eb0dbd2b9 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 25 Jul 2013 21:06:40 +0200 Subject: fix travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index df16858be..392a2f3ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: cpp before_install: - sudo apt-get update -qq - - sudo apt-get install -qq dpkg-dev, debhelper, libdb-dev, gettext, libcurl4-gnutls-dev, zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, po4a, autotools-dev, autoconf, automake, doxygen, debiandoc-sgml + - sudo apt-get install -qq dpkg-dev debhelper libdb-dev gettext libcurl4-gnutls-dev zlib1g-dev libbz2-dev xsltproc docbook-xsl docbook-xml po4a autotools-dev autoconf automake doxygen debiandoc-sgml script: test/integration/run-tests -- cgit v1.2.3 From a5b9f4890fc2b367b8f89d10ea2bdb88b8aa071a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 25 Jul 2013 18:51:16 +0200 Subject: pick up Translation-* even if only compressed available On CD-ROMs Translation-* files are only in compressed form included in the Release file. This used to work while we had no record of Translation-* files in the Release file at all as APT would have just guessed the (compressed) filename and accepted it (unchecked), but now that it checks for the presents of entries and if it finds records it expects the uncompressed to be verifiable. This commit relaxes this requirement again to fix the regression. We are still secure "enough" as we can validate the compressed file we have downloaded, so we don't loose anything by not requiring a hashsum for the uncompressed files to double-check them. Closes: 717665 --- apt-pkg/acquire-item.cc | 15 +++++- .../test-bug-624218-Translation-file-handling | 55 +++++++++++++--------- 2 files changed, 47 insertions(+), 23 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index c48443eff..7bcdf285b 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -1369,9 +1369,20 @@ void pkgAcqMetaIndex::QueueIndexes(bool verify) /*{{{*/ { HashString ExpectedIndexHash; const indexRecords::checkSum *Record = MetaIndexParser->Lookup((*Target)->MetaKey); + bool compressedAvailable = false; if (Record == NULL) { - if (verify == true && (*Target)->IsOptional() == false) + if ((*Target)->IsOptional() == true) + { + std::vector types = APT::Configuration::getCompressionTypes(); + for (std::vector::const_iterator t = types.begin(); t != types.end(); ++t) + if (MetaIndexParser->Exists(string((*Target)->MetaKey).append(".").append(*t)) == true) + { + compressedAvailable = true; + break; + } + } + else if (verify == true) { Status = StatAuthError; strprintf(ErrorText, _("Unable to find expected entry '%s' in Release file (Wrong sources.list entry or malformed file)"), (*Target)->MetaKey.c_str()); @@ -1400,7 +1411,7 @@ void pkgAcqMetaIndex::QueueIndexes(bool verify) /*{{{*/ if ((*Target)->IsSubIndex() == true) new pkgAcqSubIndex(Owner, (*Target)->URI, (*Target)->Description, (*Target)->ShortDesc, ExpectedIndexHash); - else if (transInRelease == false || MetaIndexParser->Exists((*Target)->MetaKey) == true) + else if (transInRelease == false || Record != NULL || compressedAvailable == true) { if (_config->FindB("Acquire::PDiffs",true) == true && transInRelease == true && MetaIndexParser->Exists(string((*Target)->MetaKey).append(".diff/Index")) == true) diff --git a/test/integration/test-bug-624218-Translation-file-handling b/test/integration/test-bug-624218-Translation-file-handling index d146b943c..d3c5b08ac 100755 --- a/test/integration/test-bug-624218-Translation-file-handling +++ b/test/integration/test-bug-624218-Translation-file-handling @@ -14,34 +14,47 @@ changetowebserver rm -rf rootdir/var/lib/apt/lists -msgtest 'No download of non-existent locals' 'with Index' -LC_ALL="" aptget update -o Acquire::Languages=en | grep -q -e 'Translation-[^e][^n] ' && msgfail || msgpass -rm -rf rootdir/var/lib/apt/lists +translationslisted() { + msgtest 'No download of non-existent locals' "$1" + LC_ALL="" aptget update -o Acquire::Languages=en | grep -q -e 'Translation-[^e][^n] ' && msgfail || msgpass + rm -rf rootdir/var/lib/apt/lists -msgtest 'Download of existent locals' 'with Index' -LC_ALL="" aptget update | grep -q -e 'Translation-en ' && msgpass || msgfail -rm -rf rootdir/var/lib/apt/lists + msgtest 'Download of existent locals' "$1" + LC_ALL="" aptget update | grep -q -e 'Translation-en ' && msgpass || msgfail + rm -rf rootdir/var/lib/apt/lists -msgtest 'Download of en in LC_ALL=C' 'with Index' -LC_ALL=C aptget update | grep -q -e 'Translation-en ' && msgpass || msgfail -rm -rf rootdir/var/lib/apt/lists + msgtest 'Download of en in LC_ALL=C' "$1" + LC_ALL=C aptget update | grep -q -e 'Translation-en ' && msgpass || msgfail + rm -rf rootdir/var/lib/apt/lists -msgtest 'Download of en as forced language' 'with Index' -aptget update -o Acquire::Languages=en | grep -q -e 'Translation-en ' && msgpass || msgfail -rm -rf rootdir/var/lib/apt/lists + msgtest 'Download of en as forced language' "$1" + aptget update -o Acquire::Languages=en | grep -q -e 'Translation-en ' && msgpass || msgfail + rm -rf rootdir/var/lib/apt/lists -msgtest 'Download of nothing else in forced language' 'with Index' -aptget update -o Acquire::Languages=en | grep -q -e 'Translation-[^e][^n] ' && msgfail || msgpass -rm -rf rootdir/var/lib/apt/lists + msgtest 'Download of nothing else in forced language' "$1" + aptget update -o Acquire::Languages=en | grep -q -e 'Translation-[^e][^n] ' && msgfail || msgpass + rm -rf rootdir/var/lib/apt/lists -msgtest 'Download no Translation- if forced language is non-existent' 'with Index' -aptget update -o Acquire::Languages=ast_DE | grep -q -e 'Translation-' && msgfail || msgpass -rm -rf rootdir/var/lib/apt/lists + msgtest 'Download no Translation- if forced language is non-existent' "$1" + aptget update -o Acquire::Languages=ast_DE | grep -q -e 'Translation-' && msgfail || msgpass + rm -rf rootdir/var/lib/apt/lists + + msgtest 'Download of nothing if none is forced' "$1" + aptget update -o Acquire::Languages=none | grep -q -e 'Translation' && msgfail || msgpass + rm -rf rootdir/var/lib/apt/lists +} + +translationslisted 'with full Index' + + +# only compressed files available (as it happens on CD-ROM) +sed -i '/i18n\/Translation-[^.]*$/ d' $(find aptarchive -name 'Release') +signreleasefiles + +translationslisted 'with partial Index' -msgtest 'Download of nothing if none is forced' 'with Index' -aptget update -o Acquire::Languages=none | grep -q -e 'Translation' && msgfail || msgpass -rm -rf rootdir/var/lib/apt/lists +# no records at all about Translation files (fallback to guessing) sed -i '/i18n\/Translation-.*$/ d' $(find aptarchive -name 'Release') signreleasefiles -- cgit v1.2.3 From 49e1672884bf8d50713812bdd4eca26ab2076711 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 26 Jul 2013 07:10:21 +0200 Subject: make setup in travis.yml a bit more verbose --- .travis.yml | 4 ++-- Makefile | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 392a2f3ea..ec1e1de77 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: cpp before_install: - - sudo apt-get update -qq - - sudo apt-get install -qq dpkg-dev debhelper libdb-dev gettext libcurl4-gnutls-dev zlib1g-dev libbz2-dev xsltproc docbook-xsl docbook-xml po4a autotools-dev autoconf automake doxygen debiandoc-sgml + - sudo apt-get update -q + - sudo apt-get install -q dpkg-dev debhelper libdb-dev gettext libcurl4-gnutls-dev zlib1g-dev libbz2-dev xsltproc docbook-xsl docbook-xml po4a autotools-dev autoconf automake doxygen debiandoc-sgml script: test/integration/run-tests diff --git a/Makefile b/Makefile index 98b6d337a..ad51da3ef 100644 --- a/Makefile +++ b/Makefile @@ -17,9 +17,6 @@ all headers library clean veryclean binary program doc manpages debiandoc test u $(MAKE) -C cmdline $@ $(MAKE) -C ftparchive $@ $(MAKE) -C dselect $@ - $(MAKE) -C doc $@ - $(MAKE) -C po $@ - $(MAKE) -C test $@ all headers library clean veryclean binary program doc manpages debiandoc test update-po: startup dirs -- cgit v1.2.3 From 8672ae9d47780e288ad97816670b78ece399074d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 26 Jul 2013 07:20:23 +0200 Subject: build tree first --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ec1e1de77..c1b1e120c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,4 +2,4 @@ language: cpp before_install: - sudo apt-get update -q - sudo apt-get install -q dpkg-dev debhelper libdb-dev gettext libcurl4-gnutls-dev zlib1g-dev libbz2-dev xsltproc docbook-xsl docbook-xml po4a autotools-dev autoconf automake doxygen debiandoc-sgml -script: test/integration/run-tests +script: make && test/integration/run-tests -- cgit v1.2.3 From f2380a78aa90ff8a3b76607c0c140810aff84086 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 26 Jul 2013 09:22:52 +0200 Subject: request absolute URIs from proxies again (0.9.9.3 regession) Commit 2b9c9b7f28b18f6ae3e422020e8934872b06c9f3 not only removes keep-alive, but also changes the request URI send to proxies which are required to be absolute URIs rather than the usual absolute paths. Closes: 717891 --- methods/http.cc | 20 +++++++++--- .../test-bug-717891-abolute-uris-for-proxies | 28 +++++++++++++++++ test/interactive-helper/aptwebserver.cc | 36 +++++++++++++++++----- 3 files changed, 72 insertions(+), 12 deletions(-) create mode 100755 test/integration/test-bug-717891-abolute-uris-for-proxies diff --git a/methods/http.cc b/methods/http.cc index 6e03e9d63..82456d78b 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -682,15 +682,27 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out) // Just in case. if (Itm->Uri.length() >= sizeof(Buf)) abort(); - + + /* RFC 2616 §5.1.2 requires absolute URIs for requests to proxies, + but while its a must for all servers to accept absolute URIs, + it is assumed clients will sent an absolute path for non-proxies */ + std::string requesturi; + if (Proxy.empty() == true || Proxy.Host.empty()) + requesturi = Uri.Path; + else + requesturi = Itm->Uri; + + // The "+" is encoded as a workaround for a amazon S3 bug + // see LP bugs #1003633 and #1086997. + requesturi = QuoteString(requesturi, "+~ "); + /* Build the request. No keep-alive is included as it is the default in 1.1, can cause problems with proxies, and we are an HTTP/1.1 client anyway. C.f. https://tools.ietf.org/wg/httpbis/trac/ticket/158 */ - // see LP bugs #1003633 and #1086997. The "+" is encoded as a workaround - // for a amazon S3 bug sprintf(Buf,"GET %s HTTP/1.1\r\nHost: %s\r\n", - QuoteString(Uri.Path,"+~ ").c_str(),ProperHost.c_str()); + requesturi.c_str(),ProperHost.c_str()); + // generate a cache control header (if needed) if (_config->FindB("Acquire::http::No-Cache",false) == true) { diff --git a/test/integration/test-bug-717891-abolute-uris-for-proxies b/test/integration/test-bug-717891-abolute-uris-for-proxies new file mode 100755 index 000000000..e9c38492e --- /dev/null +++ b/test/integration/test-bug-717891-abolute-uris-for-proxies @@ -0,0 +1,28 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework +setupenvironment +configarchitecture 'amd64' + +buildsimplenativepackage 'unrelated' 'all' '0.5~squeeze1' 'unstable' + +setupaptarchive +changetowebserver --request-absolute='uri' + +msgtest 'Check that absolute paths are' 'not accepted' +aptget update >/dev/null 2>&1 && msgfail || msgpass + +echo 'Acquire::http::Proxy "http://localhost:8080";' > rootdir/etc/apt/apt.conf.d/99proxy + +msgtest 'Check that requests to proxies are' 'absolute uris' +aptget update >/dev/null 2>&1 && msgpass || msgfail + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + unrelated +0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. +Inst unrelated (0.5~squeeze1 unstable [all]) +Conf unrelated (0.5~squeeze1 unstable [all])' aptget install unrelated -s diff --git a/test/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc index a8d191d0e..fde95fec9 100644 --- a/test/interactive-helper/aptwebserver.cc +++ b/test/interactive-helper/aptwebserver.cc @@ -319,6 +319,33 @@ bool parseFirstLine(int const client, std::string const &request, /*{{{*/ sendError(client, 500, request, sendContent, "Filename contains an unencoded space"); return false; } + + std::string host = LookupTag(request, "Host", ""); + if (host.empty() == true) + { + // RFC 2616 §14.23 requires Host + sendError(client, 400, request, sendContent, "Host header is required"); + return false; + } + host = "http://" + host; + + // Proxies require absolute uris, so this is a simple proxy-fake option + std::string const absolute = _config->Find("aptwebserver::request::absolute", "uri,path"); + if (strncmp(host.c_str(), filename.c_str(), host.length()) == 0) + { + if (absolute.find("uri") == std::string::npos) + { + sendError(client, 400, request, sendContent, "Request is absoluteURI, but configured to not accept that"); + return false; + } + // strip the host from the request to make it an absolute path + filename.erase(0, host.length()); + } + else if (absolute.find("path") == std::string::npos) + { + sendError(client, 400, request, sendContent, "Request is absolutePath, but configured to not accept that"); + return false; + } filename = DeQuoteString(filename); // this is not a secure server, but at least prevent the obvious … @@ -342,6 +369,7 @@ int main(int const argc, const char * argv[]) { CommandLine::Args Args[] = { {0, "port", "aptwebserver::port", CommandLine::HasArg}, + {0, "request-absolute", "aptwebserver::request::absolute", CommandLine::HasArg}, {'c',"config-file",0,CommandLine::ConfigFile}, {'o',"option",0,CommandLine::ArbItem}, {0,0,0,0} @@ -447,14 +475,6 @@ int main(int const argc, const char * argv[]) if (parseFirstLine(client, *m, filename, sendContent, closeConnection) == false) continue; - std::string host = LookupTag(*m, "Host", ""); - if (host.empty() == true) - { - // RFC 2616 §14.23 requires Host - sendError(client, 400, *m, sendContent, "Host header is required"); - continue; - } - // string replacements in the requested filename ::Configuration::Item const *Replaces = _config->Tree("aptwebserver::redirect::replace"); if (Replaces != NULL) -- cgit v1.2.3 From 8b620f4b490a973bfaeaf4de30b72a270a2ef9f2 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 26 Jul 2013 09:58:55 +0200 Subject: update changelog for upload --- debian/changelog | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/debian/changelog b/debian/changelog index 745cf7930..5159e5b17 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +apt (0.9.9.4) unstable; urgency=low + + [ David Kalnischkies ] + * pick up Translation-* even if only compressed available (Closes: 717665) + * request absolute URIs from proxies again (0.9.9.3 regession) + (Closes: 717891) + + [ Michael vogt ] + * fix missing changelog entry for 0.9.9.3 (git-dch issue) + + -- Michael Vogt Fri, 26 Jul 2013 09:58:17 +0200 + apt (0.9.9.3) unstable; urgency=low [ Ben Hutchings ] @@ -15,6 +27,9 @@ apt (0.9.9.3) unstable; urgency=low * skip all Description fields in apt-cache, not just first (Closes: 717254) * fix 'apt-cache search' crash with missing description (Closes: 647590) + [ Raphael Geissert ] + * Do not send a connection: keep-alive, at all + -- Michael Vogt Thu, 25 Jul 2013 17:14:58 +0200 apt (0.9.9.2) unstable; urgency=low -- cgit v1.2.3 From 534454d4f806248dd89fadd0c411aadc55272ec3 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 26 Jul 2013 11:22:30 +0200 Subject: add missing "make test" for travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c1b1e120c..56536837f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,4 +2,4 @@ language: cpp before_install: - sudo apt-get update -q - sudo apt-get install -q dpkg-dev debhelper libdb-dev gettext libcurl4-gnutls-dev zlib1g-dev libbz2-dev xsltproc docbook-xsl docbook-xml po4a autotools-dev autoconf automake doxygen debiandoc-sgml -script: make && test/integration/run-tests +script: make && make test && test/integration/run-tests -- cgit v1.2.3 From d832304e06838275446a0b787899591061f39160 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 26 Jul 2013 11:42:02 +0200 Subject: use FileFd::Write instead of fwrite for errors Using the static FileFd::Write method gives us error messages for free so we use it here to avoid failing silently (with a fail silent error). Git-Dch: Ignore --- cmdline/apt-cache.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 5d1ee5615..e847de875 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1187,7 +1187,8 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V) DescP = Buffer + Vf->Size; // Write all but Description - if (fwrite(Buffer,1,DescP - Buffer,stdout) < (size_t)(DescP - Buffer)) + size_t const length = DescP - Buffer; + if (length != 0 && FileFd::Write(STDOUT_FILENO, Buffer, length) == false) { delete [] Buffer; return false; @@ -1223,7 +1224,7 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V) DescP = skipDescriptionFields(End + strlen("Description")); } size_t const length = End - Start; - if (fwrite(Start, 1, length, stdout) < length) + if (length != 0 && FileFd::Write(STDOUT_FILENO, Start, length) == false) { delete [] Buffer; return false; @@ -1232,8 +1233,8 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V) // write a final newline after the last field cout< Date: Fri, 26 Jul 2013 12:04:55 +0200 Subject: proper cleanup varargs in _error (uncovered by Coverity) Git-Dch: Ignore --- apt-pkg/contrib/error.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/apt-pkg/contrib/error.cc b/apt-pkg/contrib/error.cc index 122e2c809..d457781c3 100644 --- a/apt-pkg/contrib/error.cc +++ b/apt-pkg/contrib/error.cc @@ -67,9 +67,10 @@ bool GlobalError::NAME (const char *Function, const char *Description,...) { \ int const errsv = errno; \ while (true) { \ va_start(args,Description); \ - if (InsertErrno(TYPE, Function, Description, args, errsv, msgSize) == false) \ - break; \ + bool const retry = InsertErrno(TYPE, Function, Description, args, errsv, msgSize); \ va_end(args); \ + if (retry == false) \ + break; \ } \ return false; \ } @@ -88,9 +89,10 @@ bool GlobalError::InsertErrno(MsgType const &type, const char *Function, int const errsv = errno; while (true) { va_start(args,Description); - if (InsertErrno(type, Function, Description, args, errsv, msgSize) == false) - break; + bool const retry = InsertErrno(type, Function, Description, args, errsv, msgSize); va_end(args); + if (retry == false) + break; } return false; } -- cgit v1.2.3 From 638593bd058fc0c715a76de92ff5bd6691c101e4 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 26 Jul 2013 12:20:50 +0200 Subject: ensure that FileFd::Size returns 0 in error cases --- apt-pkg/contrib/fileutl.cc | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 0f88923cf..5debb4f92 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -1598,7 +1598,11 @@ unsigned long long FileFd::Size() char ignore[1000]; unsigned long long read = 0; do { - Read(ignore, sizeof(ignore), &read); + if (Read(ignore, sizeof(ignore), &read) == false) + { + Seek(oldSeek); + return 0; + } } while(read != 0); size = Tell(); Seek(oldSeek); @@ -1615,10 +1619,16 @@ unsigned long long FileFd::Size() * bits of the file */ // FIXME: Size for gz-files is limited by 32bit… no largefile support if (lseek(iFd, -4, SEEK_END) < 0) - return FileFdErrno("lseek","Unable to seek to end of gzipped file"); - size = 0L; + { + FileFdErrno("lseek","Unable to seek to end of gzipped file"); + return 0; + } + size = 0; if (read(iFd, &size, 4) != 4) - return FileFdErrno("read","Unable to read original size of gzipped file"); + { + FileFdErrno("read","Unable to read original size of gzipped file"); + return 0; + } #ifdef WORDS_BIGENDIAN uint32_t tmp_size = size; @@ -1628,7 +1638,10 @@ unsigned long long FileFd::Size() #endif if (lseek(iFd, oldPos, SEEK_SET) < 0) - return FileFdErrno("lseek","Unable to seek in gzipped file"); + { + FileFdErrno("lseek","Unable to seek in gzipped file"); + return 0; + } return size; } -- cgit v1.2.3 From ed9ba607b47feae1a435126c5fa05ac2a3690099 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 26 Jul 2013 14:12:29 +0200 Subject: make autoconf happy by "mv configure.{in,ac}" Git-Dch: Ignore --- buildlib/configure.mak | 4 +- configure.ac | 194 +++++++++++++++++++++++++++++++++++++++++++++++++ configure.in | 194 ------------------------------------------------- debian/rules | 2 +- prepare-release | 2 +- 5 files changed, 198 insertions(+), 198 deletions(-) create mode 100644 configure.ac delete mode 100644 configure.in diff --git a/buildlib/configure.mak b/buildlib/configure.mak index 68d0535b4..7052e4c56 100644 --- a/buildlib/configure.mak +++ b/buildlib/configure.mak @@ -2,7 +2,7 @@ # This make fragment is included by the toplevel make to handle configure # and setup. It defines a target called startup that when run will init -# the build directory, generate configure from configure.in, create aclocal +# the build directory, generate configure from configure.ac, create aclocal # and has rules to run config.status should one of the .in files change. # Input @@ -48,7 +48,7 @@ missing-config-files: @echo "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" exit 100 -configure: aclocal.m4 configure.in buildlib/config.guess buildlib/config.sub +configure: aclocal.m4 configure.ac buildlib/config.guess buildlib/config.sub autoconf aclocal.m4: $(wildcard buildlib/*.m4) diff --git a/configure.ac b/configure.ac new file mode 100644 index 000000000..129be5c12 --- /dev/null +++ b/configure.ac @@ -0,0 +1,194 @@ +ad +dnl Process this file with autoconf to produce a configure script. +dnl The ONLY thing this is used for is to configure for different +dnl linux architectures and configurations, it is not used to make the +dnl code more portable + +dnl You MUST have an environment that has all the POSIX functions and +dnl some of the more populare bsd/sysv ones (like select). You'll also +dnl need a C++ compiler that is semi-standard conformant, exceptions are +dnl not used but STL is. + +dnl 'make -f Makefile startup' will generate the configure file from +dnl configure.ac correctly and can be run at any time + +AC_PREREQ(2.50) +AC_INIT(configure.ac) +AC_CONFIG_AUX_DIR(buildlib) +AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) + +PACKAGE="apt" +PACKAGE_VERSION="0.9.7.6ubuntu2" +PACKAGE_MAIL="APT Development Team " +AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") +AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION") +AC_DEFINE_UNQUOTED(PACKAGE_MAIL,"$PACKAGE_MAIL") +AC_SUBST(PACKAGE) +AC_SUBST(PACKAGE_VERSION) +AC_SUBST(PACKAGE_MAIL) + +dnl Check the archs, we want the target type. +AC_CANONICAL_SYSTEM + +dnl Check our C compiler +AC_CHECK_TOOL_PREFIX +AC_PROG_CC +AC_ISC_POSIX + +dnl check for large file support and enable it if possible +dnl do this early as other stuff might depend on it +AC_SYS_LARGEFILE + +dnl Check for other programs +AC_PROG_CXX +AC_PROG_CPP +AC_PROG_RANLIB +AC_CHECK_TOOL(AR,ar,"ar") + +dnl Checks for sockets +SAVE_LIBS="$LIBS" +LIBS="" +AC_SEARCH_LIBS(gethostbyname,nsl) +AC_SEARCH_LIBS(connect,socket) +SOCKETLIBS="$LIBS" +AC_SUBST(SOCKETLIBS) +LIBS="$SAVE_LIBS" + +dnl Checks for pthread -- disabled due to glibc bugs jgg +dnl AC_CHECK_LIB(pthread, pthread_create,[AC_DEFINE(HAVE_PTHREAD) PTHREADLIB="-lpthread"]) +AC_SUBST(PTHREADLIB) +dnl if test "$PTHREADLIB" != "-lpthread"; then +dnl AC_MSG_ERROR(failed: I need posix threads, pthread) +dnl fi + +dnl Check for BDB +saveLIBS="$LIBS" +LIBS="$LIBS -ldb" + +AC_CHECK_HEADER(db.h, + [AC_MSG_CHECKING(if we can link against BerkeleyDB) + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [#include ], + [int r, s, t; db_version(&r, &s, &t);] + )], + [AC_DEFINE(HAVE_BDB) + BDBLIB="-ldb" + AC_MSG_RESULT(yes)], + [BDBLIB="" + AC_MSG_RESULT(no)] + )] +) + +LIBS="$saveLIBS" + +AC_CHECK_LIB(curl, curl_easy_init, + [AC_CHECK_HEADER(curl/curl.h, + curl_ok=yes, + curl_ok=no)], + AC_MSG_ERROR([failed: I need CURL due https support]), +) + +AC_SUBST(BDBLIB) + +HAVE_ZLIB=no +AC_CHECK_LIB(z, gzopen, + [AC_CHECK_HEADER(zlib.h, [HAVE_ZLIB=yes], AC_MSG_ERROR([failed: zlib.h not found]))], + AC_MSG_ERROR([failed: Need libz])) +AC_SUBST(HAVE_ZLIB) +if test "x$HAVE_ZLIB" = "xyes"; then + AC_DEFINE(HAVE_ZLIB) +fi + +HAVE_BZ2=no +AC_CHECK_LIB(bz2, BZ2_bzopen,[AC_CHECK_HEADER(bzlib.h, [HAVE_BZ2=yes], [])], []) +AC_SUBST(HAVE_BZ2) +if test "x$HAVE_BZ2" = "xyes"; then + AC_DEFINE(HAVE_BZ2) +fi + +dnl Converts the ARCH to be something singular for this general CPU family +dnl This is often the dpkg architecture string. +dnl First check against the full canonical canoncial-system-type in $target +dnl and if that fails, just look for the cpu +AC_MSG_CHECKING(debian architecture) +archset="`dpkg-architecture -qDEB_HOST_ARCH`" +if test "x$archset" = "x"; then + AC_MSG_ERROR([failed: use --host= or output from dpkg-architecture]) +fi +AC_MSG_RESULT($archset) +AC_DEFINE_UNQUOTED(COMMON_ARCH,"$archset") + +dnl Single Unix Spec statvfs +AC_CHECK_FUNC(statvfs,[HAVE_STATVFS=yes]) +AC_SUBST(HAVE_STATVFS) + +dnl Arg, linux and bsd put their statfs function in different places +if test x"$HAVE_STATVFS" != x"yes"; then + AC_EGREP_HEADER(statfs,sys/vfs.h,[AC_DEFINE(HAVE_VFS_H)],[ + AC_EGREP_HEADER(statfs,sys/mount.h,[AC_DEFINE(HAVE_MOUNT_H)],[AC_MSG_ERROR(failed: Need statvfs)]) + ]) +fi + +AC_CHECK_MEMBERS([struct statfs.f_type],,, + [$ac_includes_default + #include ]) + +dnl We should use the real timegm function if we have it. +AC_CHECK_FUNC(timegm,AC_DEFINE(HAVE_TIMEGM)) +AC_SUBST(HAVE_TIMEGM) + +dnl Check the architecture +AC_C_BIGENDIAN + +dnl HP-UX sux.. +AC_MSG_CHECKING(for missing socklen_t) +AC_EGREP_HEADER(socklen_t, sys/socket.h,[AC_MSG_RESULT(no)],[ + AC_DEFINE(NEED_SOCKLEN_T_DEFINE) + NEED_SOCKLEN_T_DEFINE=yes + AC_MSG_RESULT(missing.)]) +AC_SUBST(NEED_SOCKLEN_T_DEFINE) + +dnl HP-UX needs -d_XOPEN_SOURCE_EXTENDED for h_errno +AC_MSG_CHECKING(for h_errno) +AC_EGREP_HEADER(h_errno, netdb.h, [AC_MSG_RESULT(normal)], + [CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" + AC_EGREP_HEADER(h_errno, netdb.h, + [AC_MSG_RESULT(needs _XOPEN_SOURCE_EXTENDED)], + [AC_MSG_ERROR("not found.")]) + ]) + +dnl Check for debiandoc +AC_PATH_PROG(DEBIANDOC_HTML,debiandoc2html) +AC_PATH_PROG(DEBIANDOC_TEXT,debiandoc2text) + +dnl Check for doxygen +AC_PATH_PROG(DOXYGEN, doxygen) + +dnl Check for the XSLTProc tool needed to build man pages together with po4a +AC_PATH_PROG(XSLTPROC,xsltproc) + +dnl Check for the po4a tool needed to build man pages +AC_PATH_PROG(PO4A,po4a) + +dnl Check for graphviz +AC_CHECK_PROG([HAVE_DOT], [dot], [YES], [NO]) +AC_PATH_PROG([DOT], [dot], []) +DOTDIR=$(dirname $DOT) +AC_SUBST(DOTDIR) + +ah_NUM_PROCS +ah_GCC3DEP + +dnl It used to be that the user could select translations and that could get +dnl passed to the makefiles, but now that can only work if you use special +dnl gettext approved makefiles, so this feature is unsupported by this. +ALL_LINGUAS="bg bs ca cs cy da de dz el es eu fi fr gl hu it ja ko ku nb nl nn pl pt_BR pt ro ru sk sl sv th tl uk vi zn_CN zh_TW" +AM_GNU_GETTEXT(external) +if test x"$USE_NLS" = "xyes"; then + AC_DEFINE(USE_NLS) +fi +AC_SUBST(USE_NLS) +AC_PATH_PROG(BASH, bash) + +AC_OUTPUT(environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in doc/Doxyfile:doc/Doxyfile.in,make -s dirs) diff --git a/configure.in b/configure.in deleted file mode 100644 index 4c25ba5d4..000000000 --- a/configure.in +++ /dev/null @@ -1,194 +0,0 @@ -ad -dnl Process this file with autoconf to produce a configure script. -dnl The ONLY thing this is used for is to configure for different -dnl linux architectures and configurations, it is not used to make the -dnl code more portable - -dnl You MUST have an environment that has all the POSIX functions and -dnl some of the more populare bsd/sysv ones (like select). You'll also -dnl need a C++ compiler that is semi-standard conformant, exceptions are -dnl not used but STL is. - -dnl 'make -f Makefile startup' will generate the configure file from -dnl configure.in correctly and can be run at any time - -AC_PREREQ(2.50) -AC_INIT(configure.in) -AC_CONFIG_AUX_DIR(buildlib) -AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) - -PACKAGE="apt" -PACKAGE_VERSION="0.9.7.6ubuntu2" -PACKAGE_MAIL="APT Development Team " -AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") -AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION") -AC_DEFINE_UNQUOTED(PACKAGE_MAIL,"$PACKAGE_MAIL") -AC_SUBST(PACKAGE) -AC_SUBST(PACKAGE_VERSION) -AC_SUBST(PACKAGE_MAIL) - -dnl Check the archs, we want the target type. -AC_CANONICAL_SYSTEM - -dnl Check our C compiler -AC_CHECK_TOOL_PREFIX -AC_PROG_CC -AC_ISC_POSIX - -dnl check for large file support and enable it if possible -dnl do this early as other stuff might depend on it -AC_SYS_LARGEFILE - -dnl Check for other programs -AC_PROG_CXX -AC_PROG_CPP -AC_PROG_RANLIB -AC_CHECK_TOOL(AR,ar,"ar") - -dnl Checks for sockets -SAVE_LIBS="$LIBS" -LIBS="" -AC_SEARCH_LIBS(gethostbyname,nsl) -AC_SEARCH_LIBS(connect,socket) -SOCKETLIBS="$LIBS" -AC_SUBST(SOCKETLIBS) -LIBS="$SAVE_LIBS" - -dnl Checks for pthread -- disabled due to glibc bugs jgg -dnl AC_CHECK_LIB(pthread, pthread_create,[AC_DEFINE(HAVE_PTHREAD) PTHREADLIB="-lpthread"]) -AC_SUBST(PTHREADLIB) -dnl if test "$PTHREADLIB" != "-lpthread"; then -dnl AC_MSG_ERROR(failed: I need posix threads, pthread) -dnl fi - -dnl Check for BDB -saveLIBS="$LIBS" -LIBS="$LIBS -ldb" - -AC_CHECK_HEADER(db.h, - [AC_MSG_CHECKING(if we can link against BerkeleyDB) - AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [#include ], - [int r, s, t; db_version(&r, &s, &t);] - )], - [AC_DEFINE(HAVE_BDB) - BDBLIB="-ldb" - AC_MSG_RESULT(yes)], - [BDBLIB="" - AC_MSG_RESULT(no)] - )] -) - -LIBS="$saveLIBS" - -AC_CHECK_LIB(curl, curl_easy_init, - [AC_CHECK_HEADER(curl/curl.h, - curl_ok=yes, - curl_ok=no)], - AC_MSG_ERROR([failed: I need CURL due https support]), -) - -AC_SUBST(BDBLIB) - -HAVE_ZLIB=no -AC_CHECK_LIB(z, gzopen, - [AC_CHECK_HEADER(zlib.h, [HAVE_ZLIB=yes], AC_MSG_ERROR([failed: zlib.h not found]))], - AC_MSG_ERROR([failed: Need libz])) -AC_SUBST(HAVE_ZLIB) -if test "x$HAVE_ZLIB" = "xyes"; then - AC_DEFINE(HAVE_ZLIB) -fi - -HAVE_BZ2=no -AC_CHECK_LIB(bz2, BZ2_bzopen,[AC_CHECK_HEADER(bzlib.h, [HAVE_BZ2=yes], [])], []) -AC_SUBST(HAVE_BZ2) -if test "x$HAVE_BZ2" = "xyes"; then - AC_DEFINE(HAVE_BZ2) -fi - -dnl Converts the ARCH to be something singular for this general CPU family -dnl This is often the dpkg architecture string. -dnl First check against the full canonical canoncial-system-type in $target -dnl and if that fails, just look for the cpu -AC_MSG_CHECKING(debian architecture) -archset="`dpkg-architecture -qDEB_HOST_ARCH`" -if test "x$archset" = "x"; then - AC_MSG_ERROR([failed: use --host= or output from dpkg-architecture]) -fi -AC_MSG_RESULT($archset) -AC_DEFINE_UNQUOTED(COMMON_ARCH,"$archset") - -dnl Single Unix Spec statvfs -AC_CHECK_FUNC(statvfs,[HAVE_STATVFS=yes]) -AC_SUBST(HAVE_STATVFS) - -dnl Arg, linux and bsd put their statfs function in different places -if test x"$HAVE_STATVFS" != x"yes"; then - AC_EGREP_HEADER(statfs,sys/vfs.h,[AC_DEFINE(HAVE_VFS_H)],[ - AC_EGREP_HEADER(statfs,sys/mount.h,[AC_DEFINE(HAVE_MOUNT_H)],[AC_MSG_ERROR(failed: Need statvfs)]) - ]) -fi - -AC_CHECK_MEMBERS([struct statfs.f_type],,, - [$ac_includes_default - #include ]) - -dnl We should use the real timegm function if we have it. -AC_CHECK_FUNC(timegm,AC_DEFINE(HAVE_TIMEGM)) -AC_SUBST(HAVE_TIMEGM) - -dnl Check the architecture -AC_C_BIGENDIAN - -dnl HP-UX sux.. -AC_MSG_CHECKING(for missing socklen_t) -AC_EGREP_HEADER(socklen_t, sys/socket.h,[AC_MSG_RESULT(no)],[ - AC_DEFINE(NEED_SOCKLEN_T_DEFINE) - NEED_SOCKLEN_T_DEFINE=yes - AC_MSG_RESULT(missing.)]) -AC_SUBST(NEED_SOCKLEN_T_DEFINE) - -dnl HP-UX needs -d_XOPEN_SOURCE_EXTENDED for h_errno -AC_MSG_CHECKING(for h_errno) -AC_EGREP_HEADER(h_errno, netdb.h, [AC_MSG_RESULT(normal)], - [CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" - AC_EGREP_HEADER(h_errno, netdb.h, - [AC_MSG_RESULT(needs _XOPEN_SOURCE_EXTENDED)], - [AC_MSG_ERROR("not found.")]) - ]) - -dnl Check for debiandoc -AC_PATH_PROG(DEBIANDOC_HTML,debiandoc2html) -AC_PATH_PROG(DEBIANDOC_TEXT,debiandoc2text) - -dnl Check for doxygen -AC_PATH_PROG(DOXYGEN, doxygen) - -dnl Check for the XSLTProc tool needed to build man pages together with po4a -AC_PATH_PROG(XSLTPROC,xsltproc) - -dnl Check for the po4a tool needed to build man pages -AC_PATH_PROG(PO4A,po4a) - -dnl Check for graphviz -AC_CHECK_PROG([HAVE_DOT], [dot], [YES], [NO]) -AC_PATH_PROG([DOT], [dot], []) -DOTDIR=$(dirname $DOT) -AC_SUBST(DOTDIR) - -ah_NUM_PROCS -ah_GCC3DEP - -dnl It used to be that the user could select translations and that could get -dnl passed to the makefiles, but now that can only work if you use special -dnl gettext approved makefiles, so this feature is unsupported by this. -ALL_LINGUAS="bg bs ca cs cy da de dz el es eu fi fr gl hu it ja ko ku nb nl nn pl pt_BR pt ro ru sk sl sv th tl uk vi zn_CN zh_TW" -AM_GNU_GETTEXT(external) -if test x"$USE_NLS" = "xyes"; then - AC_DEFINE(USE_NLS) -fi -AC_SUBST(USE_NLS) -AC_PATH_PROG(BASH, bash) - -AC_OUTPUT(environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in doc/Doxyfile:doc/Doxyfile.in,make -s dirs) diff --git a/debian/rules b/debian/rules index 3979bd810..05dcf813c 100755 --- a/debian/rules +++ b/debian/rules @@ -76,7 +76,7 @@ build-manpages: build/build-manpages-stamp build/environment.mak: build/configure-stamp @true -configure: configure.in +configure: configure.ac build/configure-stamp: configure dh_testdir -mkdir build diff --git a/prepare-release b/prepare-release index 73c0be602..2d8502d7f 100755 --- a/prepare-release +++ b/prepare-release @@ -39,7 +39,7 @@ if [ "$1" = 'pre-export' ]; then make update-po fi - sed -i -e "s/^PACKAGE_VERSION=\".*\"$/PACKAGE_VERSION=\"${VERSION}\"/" configure.in + sed -i -e "s/^PACKAGE_VERSION=\".*\"$/PACKAGE_VERSION=\"${VERSION}\"/" configure.ac sed -i -e "s/^$//" doc/apt-verbatim.ent elif [ "$1" = 'post-build' ]; then if [ "$DISTRIBUTION" != "UNRELEASED" ]; then -- cgit v1.2.3 From df82c8b72a26ef56c0f4eb45874aad9fed8d2e6f Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 26 Jul 2013 14:38:18 +0200 Subject: remove ALL_LINGUAS as it is overruled by po/LINGUAS The list shows that it is ignored as some translations which are shipped are not included here, so remove this source of possible confusion. Git-Dch: Ignore --- configure.ac | 4 ---- 1 file changed, 4 deletions(-) diff --git a/configure.ac b/configure.ac index 129be5c12..28d77bb36 100644 --- a/configure.ac +++ b/configure.ac @@ -180,10 +180,6 @@ AC_SUBST(DOTDIR) ah_NUM_PROCS ah_GCC3DEP -dnl It used to be that the user could select translations and that could get -dnl passed to the makefiles, but now that can only work if you use special -dnl gettext approved makefiles, so this feature is unsupported by this. -ALL_LINGUAS="bg bs ca cs cy da de dz el es eu fi fr gl hu it ja ko ku nb nl nn pl pt_BR pt ro ru sk sl sv th tl uk vi zn_CN zh_TW" AM_GNU_GETTEXT(external) if test x"$USE_NLS" = "xyes"; then AC_DEFINE(USE_NLS) -- cgit v1.2.3 From a1c4ae54803f85f83815cbf0f630ee867a2182e5 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 26 Jul 2013 17:31:24 +0200 Subject: add missing test make --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index ad51da3ef..47fc23656 100644 --- a/Makefile +++ b/Makefile @@ -17,6 +17,9 @@ all headers library clean veryclean binary program doc manpages debiandoc test u $(MAKE) -C cmdline $@ $(MAKE) -C ftparchive $@ $(MAKE) -C dselect $@ + $(MAKE) -C doc $@ + $(MAKE) -C po $@ + $(MAKE) -C test $@ all headers library clean veryclean binary program doc manpages debiandoc test update-po: startup dirs -- cgit v1.2.3 From f026e89ceaacd43b24e3bf4c8e50e69e30d0a633 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 26 Jul 2013 18:01:33 +0200 Subject: add missing Turkish (tr) to po/LINGUAS And while at it ensure that this can't happen again by letting the build fail in case a po file is available but the language isn't mentioned in the LINGUAS file (not even as a disabled language). --- po/LINGUAS | 8 +++++++- po/makefile | 20 +++++++++++++++----- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/po/LINGUAS b/po/LINGUAS index c5d8999bf..6d77cf856 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1 +1,7 @@ -ar ast bg bs ca cs cy da de dz el es eu fi fr gl hu it ja km ko ku lt mr nb ne nl nn pl pt pt_BR ro ru sk sl sv th tl uk vi zh_CN zh_TW +## If a language isn't listed here but a po file is available the build will fail. +## If a language is disabled deliberately, list it in a line starting with a single '#' + +ar ast bg bs ca cs cy da de dz el es eu fi fr gl hu it ja km ko ku lt mr nb ne nl nn pl pt pt_BR ro ru sk sl sv th tl tr uk vi zh_CN zh_TW + +## disabled by translator request #313283: +# he diff --git a/po/makefile b/po/makefile index 5a3c7fb67..b239da5cc 100644 --- a/po/makefile +++ b/po/makefile @@ -14,7 +14,7 @@ SUBDIR=po # Bring in the default rules include ../buildlib/defaults.mak -CATALOGS := $(addsuffix .gmo,$(shell cat LINGUAS)) +CATALOGS := $(addsuffix .gmo, $(shell sed -e '/^\#/ d' -e '/^$$/ d' LINGUAS | tr '\n' ' ')) DOMAINS := $(notdir $(wildcard $(PO_DOMAINS)/*)) POTFILES := $(addsuffix .pot,$(addprefix $(PO)/,$(DOMAINS))) @@ -66,10 +66,10 @@ $(MOFILES) : $(PO_DOMAINS)/%.mo : $(PO_DOMAINS)/%.po mkdir -p $(LOCALE)/$(notdir $*)/LC_MESSAGES/ cp $@ $(LOCALE)/$(notdir $*)/LC_MESSAGES/$(call GETDOMAIN,$*).mo -stats: +stats: all-linguas-enabled for i in *.pot *.po; do echo -n "$$i: "; msgfmt --output-file=/dev/null --statistics $$i; done -binary: $(POTFILES) $(MOFILES) +binary: $(POTFILES) $(MOFILES) all-linguas-enabled $(PACKAGE)-all.pot: $(POTFILES) # we create our partial pot files without a header to avoid changing dates in *.mo files, @@ -80,8 +80,8 @@ $(PACKAGE)-all.pot: $(POTFILES) $(MSGCOMM) --more-than=0 $(PO)/$(PACKAGE)-dummy.pot $(POTFILES) --output=$(PACKAGE)-all.pot rm -f $(PO)/$(PACKAGE)-dummy.pot -.PHONY: update-po -update-po: $(PACKAGE)-all.pot +.PHONY: update-po all-linguas-enabled +update-po: $(PACKAGE)-all.pot all-linguas-enabled for lang in ${LINGUAS}; do \ echo "Updating $$lang.po"; \ $(MSGMERGE) $$lang.po $(PACKAGE)-all.pot -o $$lang.new.po; \ @@ -89,6 +89,16 @@ update-po: $(PACKAGE)-all.pot rm -f $$lang.new.po; \ done +all-linguas-enabled: LINGUAS +ifdef NOISY + echo "Available Translations: $(shell ls *.po | cut -d'.' -f 1 | sort | tr '\n' ' ')" + echo "Mentioned Translations: $(shell sed -e '/^\#\#/ d' -e '/^$$/ d' -e 's/# //' LINGUAS | tr ' ' '\n' | sort | tr '\n' ' ')" + echo "Build Translations: $(shell echo "$(LINGUAS)" | tr ' ' '\n' | sort | tr '\n' ' ')" +endif + test "$(shell ls *.po | cut -d'.' -f 1 | sort | tr '\n' ' ')" = \ + "$(shell sed -e '/^\#\#/ d' -e '/^$$/ d' -e 's/# //' LINGUAS | tr ' ' '\n' | sort | tr '\n' ' ')" || \ + ( echo "ERROR: Not all available translations are mentioned in po/LINGUAS!"; exit 100) + clean: clean/local clean/local: rm -f $(MOFILES) $(LANG_POFILES) $(PO)/*.d -- cgit v1.2.3 From 0571cdfc967d0876dab332aaf04fab21077496e2 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 26 Jul 2013 18:36:50 +0200 Subject: correct management-typo in description found by lintian --- debian/control | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index 7730c2491..29d67d765 100644 --- a/debian/control +++ b/debian/control @@ -43,7 +43,7 @@ Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Breaks: apt (<< 0.9.4~) Section: libs -Description: package managment runtime library +Description: package management runtime library This library provides the common functionality for searching and managing packages as well as information about packages. Higher-level package managers can depend upon this library. @@ -107,9 +107,9 @@ Package: apt-utils Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: xz-utils -Description: package managment related utility programs +Description: package management related utility programs This package contains some less used commandline utilities related - to package managment with APT. + to package management with APT. . * apt-extracttemplates is used by debconf to prompt for configuration questions before installation. -- cgit v1.2.3 From ee7ddf1294fca70088f8dcc15bf87323870bd417 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 26 Jul 2013 19:13:55 +0200 Subject: implement debian/rules build-{arch,indep} as required by policy 3.9.4 --- debian/control | 2 +- debian/rules | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/debian/control b/debian/control index 29d67d765..ca18ff01f 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: APT Development Team Uploaders: Michael Vogt , Otavio Salvador , Christian Perrier , Daniel Burrows , Julian Andres Klode -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.4~), zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, diff --git a/debian/rules b/debian/rules index 05dcf813c..4686f569d 100755 --- a/debian/rules +++ b/debian/rules @@ -66,7 +66,7 @@ LIBAPT_INST=libapt-inst$(LIBAPTINST_MAJOR) # do not fail as we are just experimenting with symbol files for now export DPKG_GENSYMBOLS_CHECK_LEVEL=0 -build: build/build-stamp +build-binary: build/build-binary-stamp build-debiandoc: build/build-debiandoc-stamp build-manpages: build/build-manpages-stamp @@ -84,7 +84,7 @@ build/configure-stamp: configure cd build && CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" ../configure $(confflags) touch $@ -build/build-stamp: build/configure-stamp +build/build-binary-stamp: build/configure-stamp # Add here commands to compile the package. $(MAKE) binary # compat symlink for the locale split @@ -120,7 +120,6 @@ clean: debian/%.install: debian/%.install.in sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@ -binary-indep: apt-doc libapt-pkg-doc # Build architecture-independent files here. libapt-pkg-doc: build-debiandoc dh_testdir -p$@ @@ -172,9 +171,8 @@ apt-doc: build-debiandoc # Build architecture-dependent files here. -binary-arch: $(LIBAPT_PKG) $(LIBAPT_INST) apt libapt-pkg-dev apt-utils apt-transport-https apt_MANPAGES = apt apt-cache apt-cdrom apt-config apt-get apt-key apt-mark apt-secure apt apt.conf apt_preferences sources.list -apt: build build-manpages +apt: build-binary build-manpages dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -220,7 +218,7 @@ apt: build build-manpages dh_md5sums -p$@ dh_builddeb -p$@ -libapt-pkg-dev: build debian/libapt-pkg-dev.install +libapt-pkg-dev: build-binary debian/libapt-pkg-dev.install dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -240,7 +238,7 @@ libapt-pkg-dev: build debian/libapt-pkg-dev.install dh_builddeb -p$@ apt-utils_MANPAGES = apt-sortpkgs apt-ftparchive apt-extracttemplates -apt-utils: build build-manpages +apt-utils: build-binary build-manpages dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -269,7 +267,7 @@ apt-utils: build build-manpages dh_md5sums -p$@ dh_builddeb -p$@ -$(LIBAPT_PKG): build debian/$(LIBAPT_PKG).install +$(LIBAPT_PKG): build-binary debian/$(LIBAPT_PKG).install dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -288,7 +286,7 @@ $(LIBAPT_PKG): build debian/$(LIBAPT_PKG).install dh_md5sums -p$@ dh_builddeb -p$@ -$(LIBAPT_INST): build debian/$(LIBAPT_INST).install +$(LIBAPT_INST): build-binary debian/$(LIBAPT_INST).install dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -307,7 +305,7 @@ $(LIBAPT_INST): build debian/$(LIBAPT_INST).install dh_md5sums -p$@ dh_builddeb -p$@ -apt-transport-https: build libapt-pkg-dev +apt-transport-https: build-binary libapt-pkg-dev dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -333,10 +331,12 @@ apt-transport-https: build libapt-pkg-dev configure: $(MAKE) configure -really-clean: clean - -find . -name Makefile.in -print0 | xargs --null --no-run-if-empty -- rm -f - find -name ChangeLog | xargs rm -f - rm -f l33ch-stamp - +# translate targets to targets required by debian-policy +binary-arch: $(LIBAPT_PKG) $(LIBAPT_INST) apt libapt-pkg-dev apt-utils apt-transport-https +binary-indep: apt-doc libapt-pkg-doc binary: binary-indep binary-arch +build-arch: build-binary +build-indep: build-manpages build-debiandoc +build: build-indep build-arch + .PHONY: build clean binary-indep binary-arch binary -- cgit v1.2.3 From 0cedc6b3fe775ccb814ee3393d4695909bcc7ece Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 26 Jul 2013 20:37:34 +0200 Subject: reenable automatic parallel build of APT It works for a while now in manual tests, now lets see how it will perform if enabled for all by default automatically. --- buildlib/defaults.mak | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak index 5b970876a..599b9ed85 100644 --- a/buildlib/defaults.mak +++ b/buildlib/defaults.mak @@ -172,12 +172,11 @@ ifeq ($(NUM_PROCS),1) PARALLEL_RUN=no endif -# mvo: commented out, lead to build failures in the arch-build target -#ifndef PARALLEL_RUN -# PARALLEL_RUN=yes -# .EXPORT: PARALLEL_RUN -# # handle recursion -# ifneq ($(NUM_PROCS),) -# MAKEFLAGS += -j $(NUM_PROCS) -# endif -#endif +ifndef PARALLEL_RUN + PARALLEL_RUN=yes + export PARALLEL_RUN + # handle recursion + ifneq ($(NUM_PROCS),) + MAKEFLAGS += -j $(NUM_PROCS) + endif +endif -- cgit v1.2.3 From 36a0c0f78675d10cae840a72268f70aed667fb96 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 26 Jul 2013 22:10:05 +0200 Subject: fix some coverity chroot() releated warnings --- apt-pkg/aptconfiguration.cc | 4 ++-- apt-pkg/deb/dpkgpm.cc | 1 + cmdline/apt-mark.cc | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index 37c846582..e32e553a4 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -388,12 +388,12 @@ std::vector const Configuration::getArchitectures(bool const &Cache if (dpkgMultiArch == 0) { close(external[0]); std::string const chrootDir = _config->FindDir("DPkg::Chroot-Directory"); - if (chrootDir != "/" && chroot(chrootDir.c_str()) != 0) - _error->WarningE("getArchitecture", "Couldn't chroot into %s for dpkg --print-foreign-architectures", chrootDir.c_str()); int const nullfd = open("/dev/null", O_RDONLY); dup2(nullfd, STDIN_FILENO); dup2(external[1], STDOUT_FILENO); dup2(nullfd, STDERR_FILENO); + if (chrootDir != "/" && chroot(chrootDir.c_str()) != 0) + _error->WarningE("getArchitecture", "Couldn't chroot into %s for dpkg --print-foreign-architectures", chrootDir.c_str()); execvp(Args[0], (char**) &Args[0]); _error->WarningE("getArchitecture", "Can't detect foreign architectures supported by dpkg!"); _exit(100); diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index fb0473535..588ab68c4 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -134,6 +134,7 @@ static void dpkgChrootDirectory() std::cerr << "Chrooting into " << chrootDir << std::endl; if (chroot(chrootDir.c_str()) != 0) _exit(100); + chdir("/"); } /*}}}*/ diff --git a/cmdline/apt-mark.cc b/cmdline/apt-mark.cc index c5b7ca496..4c0fc2893 100644 --- a/cmdline/apt-mark.cc +++ b/cmdline/apt-mark.cc @@ -202,13 +202,13 @@ bool DoHold(CommandLine &CmdL) if (dpkgAssertMultiArch == 0) { std::string const chrootDir = _config->FindDir("DPkg::Chroot-Directory"); - if (chrootDir != "/" && chroot(chrootDir.c_str()) != 0) - _error->WarningE("getArchitecture", "Couldn't chroot into %s for dpkg --assert-multi-arch", chrootDir.c_str()); // redirect everything to the ultimate sink as we only need the exit-status int const nullfd = open("/dev/null", O_RDONLY); dup2(nullfd, STDIN_FILENO); dup2(nullfd, STDOUT_FILENO); dup2(nullfd, STDERR_FILENO); + if (chrootDir != "/" && chroot(chrootDir.c_str()) != 0) + _error->WarningE("getArchitecture", "Couldn't chroot into %s for dpkg --assert-multi-arch", chrootDir.c_str()); execvp(Args[0], (char**) &Args[0]); _error->WarningE("dpkgGo", "Can't detect if dpkg supports multi-arch!"); _exit(2); -- cgit v1.2.3 From 11d0fb919954e79f929ef5e755f602a6ed3be46d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 26 Jul 2013 22:12:36 +0200 Subject: fix missing va_end() --- methods/ftp.cc | 1 + methods/rsh.cc | 2 ++ 2 files changed, 3 insertions(+) diff --git a/methods/ftp.cc b/methods/ftp.cc index d55ac1224..979adca62 100644 --- a/methods/ftp.cc +++ b/methods/ftp.cc @@ -436,6 +436,7 @@ bool FTPConn::WriteMsg(unsigned int &Ret,string &Text,const char *Fmt,...) char S[400]; vsnprintf(S,sizeof(S) - 4,Fmt,args); strcat(S,"\r\n"); + va_end(args); if (Debug == true) cerr << "-> '" << QuoteString(S,"") << "'" << endl; diff --git a/methods/rsh.cc b/methods/rsh.cc index fb3782314..d76dca6ef 100644 --- a/methods/rsh.cc +++ b/methods/rsh.cc @@ -218,6 +218,8 @@ bool RSHConn::WriteMsg(std::string &Text,bool Sync,const char *Fmt,...) // sprintf the description char S[512]; vsnprintf(S,sizeof(S) - 4,Fmt,args); + va_end(args); + if (Sync == true) strcat(S," 2> /dev/null || echo\n"); else -- cgit v1.2.3 From 163dc55bd6891008adcdf6d683a94e890a00f8c7 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 26 Jul 2013 22:18:36 +0200 Subject: fix another missing va_end() --- apt-pkg/contrib/strutl.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index d0e74d8c5..df02c3499 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -1233,12 +1233,12 @@ char *safe_snprintf(char *Buffer,char *End,const char *Format,...) va_list args; int Did; - va_start(args,Format); - if (End <= Buffer) return End; - + va_start(args,Format); Did = vsnprintf(Buffer,End - Buffer,Format,args); + va_end(args); + if (Did < 0 || Buffer + Did > End) return End; return Buffer + Did; -- cgit v1.2.3 From e941cc69cf3e90ab799dec24587bb339db07038f Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 26 Jul 2013 22:37:43 +0200 Subject: exclude config.{sub,guess} from source package Lintian complains about these links in the source package as they leave the source directory and as they are autogenerated there isn't that much sense in shipping them, we can just recreate them before calling configure. --- debian/rules | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 4686f569d..fc44d5a68 100755 --- a/debian/rules +++ b/debian/rules @@ -77,7 +77,7 @@ build/environment.mak: build/configure-stamp @true configure: configure.ac -build/configure-stamp: configure +build/configure-stamp: configure buildlib/config.sub buildlib/config.guess dh_testdir -mkdir build cp COPYING debian/copyright @@ -116,6 +116,8 @@ clean: rm -rf build rm -f debian/$(LIBAPT_PKG).install debian/$(LIBAPT_INST).install \ debian/libapt-pkg-dev.install + test ! -L buildlib/config.guess || rm -f buildlib/config.guess + test ! -L buildlib/config.sub || rm -f buildlib/config.sub debian/%.install: debian/%.install.in sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@ @@ -328,6 +330,9 @@ apt-transport-https: build-binary libapt-pkg-dev dh_md5sums -p$@ dh_builddeb -p$@ +buildlib/config.guess buildlib/config.sub: + $(MAKE) "$@" + configure: $(MAKE) configure -- cgit v1.2.3 From ed0e7e312b90b62c9de89b82d48cbe52762e74b0 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 26 Jul 2013 23:56:28 +0200 Subject: update the symbol files to reflect current state --- debian/libapt-inst1.5.symbols | 6 +-- debian/libapt-pkg4.12.symbols | 121 ++++++++++++++++++------------------------ 2 files changed, 53 insertions(+), 74 deletions(-) diff --git a/debian/libapt-inst1.5.symbols b/debian/libapt-inst1.5.symbols index 8fcd29a3e..030795382 100644 --- a/debian/libapt-inst1.5.symbols +++ b/debian/libapt-inst1.5.symbols @@ -81,12 +81,8 @@ libapt-inst.so.1.5 libapt-inst1.5 #MINVER# (c++|optional)"vtable for pkgCache::VerIterator@Base" 0.8.0 (c++|optional)"vtable for pkgCache::Iterator@Base" 0.8.0 (c++|optional)"vtable for pkgCache::Iterator@Base" 0.8.0 -### gcc-4.4 specific -# (c++|regex|optional=std)"^char\* std::[^ ]+<.+ >::_.+@Base$" 0.8.0 -# (c++|optional=std)"std::basic_string, std::allocator >& std::basic_string, std::allocator >::append(unsigned char*, unsigned char*)@Base" 0.8.0 -### gcc-4.6 specific +### gcc artefacts (c++|optional=std)"std::vector >::~vector()@Base" 0.8.12 - (c++|optional=std)"std::basic_string, std::allocator >& std::basic_string, std::allocator >::_M_replace_dispatch(__gnu_cxx::__normal_iterator, std::allocator > >, __gnu_cxx::__normal_iterator, std::allocator > >, unsigned char*, unsigned char*, std::__false_type)@Base" 0.8.0 ### try to ignore std:: template instances (c++|regex|optional=std)"^std::basic_string<.+ >\(.+\)@Base$" 0.8.0 (c++|regex|optional=std)"^typeinfo name for std::iterator<.*>@Base$" 0.8.0 diff --git a/debian/libapt-pkg4.12.symbols b/debian/libapt-pkg4.12.symbols index bf42e8b10..2b86c9676 100644 --- a/debian/libapt-pkg4.12.symbols +++ b/debian/libapt-pkg4.12.symbols @@ -36,6 +36,7 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"safe_snprintf(char*, char*, char const*, ...)@Base" 0.8.0 (c++)"stringcasecmp(__gnu_cxx::__normal_iterator, std::allocator > >, __gnu_cxx::__normal_iterator, std::allocator > >, char const*, char const*)@Base" 0.8.0 (c++)"stringcasecmp(__gnu_cxx::__normal_iterator, std::allocator > >, __gnu_cxx::__normal_iterator, std::allocator > >, __gnu_cxx::__normal_iterator, std::allocator > >, __gnu_cxx::__normal_iterator, std::allocator > >)@Base" 0.8.0 + (c++)"stringcasecmp(std::basic_string, std::allocator > const&, char const*)@Base" 0.8.0 (c++)"stringcasecmp(char const*, char const*, char const*, char const*)@Base" 0.8.0 (c++)"tolower_ascii(int)@Base" 0.8.0 (c++)"ParseQuoteWord(char const*&, std::basic_string, std::allocator >&)@Base" 0.8.0 @@ -90,6 +91,7 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"guard variable for pkgCacheGenerator::Dynamic::toReMap@Base" 0.8.0 (c++)"HashString::SupportedHashes()@Base" 0.8.0 (c++)"HashString::_SupportedHashes@Base" 0.8.0 + (c++)"HashString::HashString(HashString const&)@Base" 0.8.0 (c++)"HashString::HashString(std::basic_string, std::allocator >)@Base" 0.8.0 (c++)"HashString::HashString(std::basic_string, std::allocator >, std::basic_string, std::allocator >)@Base" 0.8.0 (c++)"HashString::HashString()@Base" 0.8.0 @@ -517,7 +519,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"pkgCacheGenerator::ListParser::~ListParser()@Base" 0.8.0 (c++)"pkgCacheGenerator::NewFileVer(pkgCache::VerIterator&, pkgCacheGenerator::ListParser&)@Base" 0.8.0 (c++)"pkgCacheGenerator::NewPackage(pkgCache::PkgIterator&, std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&)@Base" 0.8.0 - (c++)"pkgCacheGenerator::NewVersion(pkgCache::VerIterator&, std::basic_string, std::allocator > const&, unsigned long)@Base" 0.8.0 (c++)"pkgCacheGenerator::SelectFile(std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&, pkgIndexFile const&, unsigned long)@Base" 0.8.0 (c++)"pkgCacheGenerator::FinishCache(OpProgress*)@Base" 0.8.0 (c++)"pkgCacheGenerator::NewFileDesc(pkgCache::DescIterator&, pkgCacheGenerator::ListParser&)@Base" 0.8.0 @@ -1124,32 +1125,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# debVS@Base 0.8.0 pkgLibVersion@Base 0.8.0 pkgVersion@Base 0.8.0 -### demangle strangeness - buildd report it as MISSING and as new… - (c++)"pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire*, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::vector > const*, indexRecords*)@Base" 0.8.0 -### gcc-4.4 specific -# (c++|optional=inherent)"APT::PackageSet::PackageSet(APT::PackageSet const&)@Base" 0.8.0 -# (c++|optional=inline)"stringcasecmp(char const*, char const*, char const*)@Base" 0.8.0 -# (arch=armel|c++|optional=inline)"stringcasecmp(std::basic_string, std::allocator > const&, char const*)@Base" 0.8.0 -# (c++|optional=inherent)"APT::VersionSet::insert(pkgCache::VerIterator const&)@Base" 0.8.0 -# (c++|optional=inline)"APT::VersionSet::insert(APT::VersionSet const&)@Base" 0.8.0 -# (c++|optional=private)"debTranslationsIndex::IndexFile(char const*) const@Base" 0.8.0 -# (c++|optional=inline)"pkgCache::Iterator::end() const@Base" 0.8.0 -# (c++|optional=inherent)"HashString::operator=(HashString const&)@Base" 0.8.0 -# (c++|regex|optional=std)"^std::less<[^ ]+>::operator\(\)\(.+\) const@Base$" 0.8.0 -# (c++|regex|optional=std)"^std::vector<.+ >::(vector|push_back|erase|_[^ ]+)\(.+\)( const|)@Base$" 0.8.0 -# (c++|regex|optional=std)"^pkgCache::(Dep|Pkg|Ver|Grp|Prv|Desc|PkgFile)Iterator\*\* std::_.+@Base$" 0.8.0 -### gcc-4.5 specific -# (c++|regex|optional=std)"^char\* std::[^ ]+<.+ >::_.+@Base$" 0.8.0 -# (c++|optional=inline)"FileFd::FileFd(std::basic_string, std::allocator >, FileFd::OpenMode, unsigned long)@Base" 0.8.0 -# (c++|regex|optional=template)"^SPtrArray<[^ ]+>::~SPtrArray\(\)@Base$" 0.8.0 -# (c++|optional=template)"SPtrArray::~SPtrArray()@Base" 0.8.0 -### gcc-4.6 specific -# (c++|optional=template)"SPtrArray::~SPtrArray()@Base" 0.8.0 -# (c++|optional=inline)"IndexTarget::~IndexTarget()@Base" 0.8.11 - (c++|regex|optional=std)"^std::basic_string, std::allocator >::basic_string\(.+\)@Base$" 0.8.0 - (c++|regex|optional=std)"^std::vector::(vector|push_back|erase|_[^ ]+)\(.+\)( const|)@Base$" 0.8.0 - (c++|optional=template)"HashSumValue<160>::operator std::basic_string, std::allocator >() const@Base" 0.8.16~exp14 ### architecture specific: va_list (arch=armel armhf|c++)"pkgAcqMethod::PrintStatus(char const*, char const*, std::__va_list&) const@Base" 0.8.15~exp1 (arch=i386 hurd-i386 kfreebsd-i386|c++)"pkgAcqMethod::PrintStatus(char const*, char const*, char*&) const@Base" 0.8.15~exp1 @@ -1177,16 +1152,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# ### architecture specific: size_t (arch=i386 armel armhf hppa hurd-i386 kfreebsd-i386 mips mipsel powerpc powerpcspe sh4 sparc|c++)"_strtabexpand(char*, unsigned int)@Base" 0.8.0 (arch=alpha amd64 ia64 kfreebsd-amd64 s390 sparc64|c++)"_strtabexpand(char*, unsigned long)@Base" 0.8.0 -### try to ignore std:: template instances - (c++|regex|optional=std)"^(void |)std::[^ ]+<.+ >::(_|~).+\(.*\)@Base$" 0.8.0 - (c++|regex|optional=std)"^std::[^ ]+<.+ >::(append|insert|reserve|operator[^ ]+)\(.*\)@Base$" 0.8.0 - (c++|regex|optional=std)"^(void |DiffInfo\* |)std::_.*@Base$" 0.8.0 - (c++|regex|optional=std)"^(bool|void) std::(operator|sort_heap|make_heap)[^ ]+<.+ >\(.+\)@Base$" 0.8.0 - (c++|regex|optional=std)"^std::reverse_iterator<.+ > std::__.+@Base$" 0.8.0 - (c++|regex|optional=std)"^std::basic_string<.+ >\(.+\)@Base$" 0.8.0 - (c++|regex|optional=std)"^__gnu_cxx::__[^ ]+<.*@Base$" 0.8.0 - (c++|regex|optional=std)"^typeinfo name for std::iterator<.*>@Base$" 0.8.0 - (c++|regex|optional=std)"^typeinfo for std::iterator<.*>@Base$" 0.8.0 ### (c++)"Configuration::MatchAgainstConfig::clearPatterns()@Base" 0.8.1 (c++)"CreateAPTDirectoryIfNeeded(std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&)@Base" 0.8.2 @@ -1368,7 +1333,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"FileFd::Skip(unsigned long long)@Base" 0.8.16~exp6 (c++)"FileFd::Write(void const*, unsigned long long)@Base" 0.8.16~exp6 (c++)"FileFd::Truncate(unsigned long long)@Base" 0.8.16~exp6 - (c++)"pkgCache::PkgIterator::PkgIterator(pkgCache&, pkgCache::Package*)@Base" 0.8.16~exp6 (c++)"pkgPolicy::GetPriority(pkgCache::PkgFileIterator const&)@Base" 0.8.16~exp6 (c++)"OptionalIndexTarget::IsOptional() const@Base" 0.8.16~exp6 (c++)"typeinfo for pkgTagFile@Base" 0.8.16~exp6 @@ -1404,16 +1368,11 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++|optional=internal|regex)"^SHA384_.*@Base$" 0.8.16~exp2 (c++|optional=internal|regex)"^SHA512_.*@Base$" 0.8.16~exp2 ### orderlist rework: the touched methods are protected -# (c++)"pkgPackageManager::SmartConfigure(pkgCache::PkgIterator)@Base" 0.8.0 -# (c++)"pkgPackageManager::DepAdd(pkgOrderList&, pkgCache::PkgIterator, int)@Base" 0.8.0 -# (c++)"pkgPackageManager::SmartUnPack(pkgCache::PkgIterator, bool)@Base" 0.8.15~exp1 (c++)"SigINT(int)@Base" 0.8.16~exp14 (c++)"pkgPackageManager::SigINTStop@Base" 0.8.16~exp14 (c++)"pkgPackageManager::SmartUnPack(pkgCache::PkgIterator, bool, int)@Base" 0.8.16~exp14 (c++)"pkgPackageManager::SmartConfigure(pkgCache::PkgIterator, int)@Base" 0.8.16~exp14 ### FileFd rework: supporting different on-the-fly (de)compressing needs more parameter (abi), but the api is stable -# (c++)"FileFd::OpenDescriptor(int, FileFd::OpenMode, bool)@Base" 0.8.0 -# (c++)"FileFd::Open(std::basic_string, std::allocator >, FileFd::OpenMode, unsigned long)@Base" 0.8.0 (c++)"FileFd::OpenDescriptor(int, unsigned int, FileFd::CompressMode, bool)@Base" 0.8.16~exp9 (c++)"FileFd::OpenDescriptor(int, unsigned int, APT::Configuration::Compressor const&, bool)@Base" 0.8.16~exp9 (c++)"FileFd::ModificationTime()@Base" 0.8.16~exp9 @@ -1425,31 +1384,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++|optional=deprecated,previous-inline)"FileFd::gzFd()@Base" 0.8.0 (c++|optional=private)"FileFd::OpenInternDescriptor(unsigned int, APT::Configuration::Compressor const&)@Base" 0.8.16~exp9 ### CacheSet rework: making them real containers breaks bigtime the API (for the CacheSetHelper) -# (c++)"EDSP::WriteLimitedScenario(pkgDepCache&, _IO_FILE*, APT::PackageSet const&, OpProgress*)@Base" 0.8.16~exp2 -# (c++)"EDSP::WriteScenarioLimitedDependency(pkgDepCache&, _IO_FILE*, pkgCache::PkgIterator const&, pkgCache::VerIterator const&, APT::PackageSet const&)@Base" 0.8.16~exp2 -# (c++)"APT::PackageSet::FromString(pkgCacheFile&, std::basic_string, std::allocator > const&, APT::CacheSetHelper&)@Base" 0.8.0 -# (c++)"APT::PackageSet::FromCommandLine(pkgCacheFile&, char const**, APT::CacheSetHelper&)@Base" 0.8.0 -# (c++)"APT::PackageSet::GroupedFromCommandLine(pkgCacheFile&, char const**, std::list > const&, unsigned short const&, APT::CacheSetHelper&)@Base" 0.8.0 -# (c++)"APT::PackageSet::FromName(pkgCacheFile&, std::basic_string, std::allocator > const&, APT::CacheSetHelper&)@Base" 0.8.0 -# (c++)"APT::PackageSet::FromTask(pkgCacheFile&, std::basic_string, std::allocator >, APT::CacheSetHelper&)@Base" 0.8.0 -# (c++)"APT::PackageSet::FromRegEx(pkgCacheFile&, std::basic_string, std::allocator >, APT::CacheSetHelper&)@Base" 0.8.0 -# (c++)"APT::PackageSet::~PackageSet()@Base" 0.8.0 -# (c++)"APT::VersionSet::FromString(pkgCacheFile&, std::basic_string, std::allocator >, APT::VersionSet::Version const&, APT::CacheSetHelper&, bool const&)@Base" 0.8.0 -# (c++)"APT::VersionSet::FromPackage(pkgCacheFile&, pkgCache::PkgIterator const&, APT::VersionSet::Version const&, APT::CacheSetHelper&)@Base" 0.8.0 -# (c++)"APT::VersionSet::FromCommandLine(pkgCacheFile&, char const**, APT::VersionSet::Version const&, APT::CacheSetHelper&)@Base" 0.8.0 -# (c++)"APT::VersionSet::getCandidateVer(pkgCacheFile&, pkgCache::PkgIterator const&, APT::CacheSetHelper&)@Base" 0.8.0 -# (c++)"APT::VersionSet::getInstalledVer(pkgCacheFile&, pkgCache::PkgIterator const&, APT::CacheSetHelper&)@Base" 0.8.0 -# (c++)"APT::VersionSet::GroupedFromCommandLine(pkgCacheFile&, char const**, std::list > const&, unsigned short const&, APT::CacheSetHelper&)@Base" 0.8.0 -# (c++)"APT::VersionSet::~VersionSet()@Base" 0.8.0 -# (c++)"APT::CacheSetHelper::showTaskSelection(APT::PackageSet const&, std::basic_string, std::allocator > const&)@Base" 0.8.0 -# (c++)"APT::CacheSetHelper::showRegExSelection(APT::PackageSet const&, std::basic_string, std::allocator > const&)@Base" 0.8.0 -# (c++)"APT::CacheSetHelper::canNotFindTask(pkgCacheFile&, std::basic_string, std::allocator >)@Base" 0.8.0 -# (c++)"APT::CacheSetHelper::canNotFindRegEx(pkgCacheFile&, std::basic_string, std::allocator >)@Base" 0.8.0 -# (c++)"APT::CacheSetHelper::canNotFindAllVer(pkgCacheFile&, pkgCache::PkgIterator const&)@Base" 0.8.0 -# (c++)"APT::CacheSetHelper::canNotFindPackage(pkgCacheFile&, std::basic_string, std::allocator > const&)@Base" 0.8.0 -# (c++)"APT::CacheSetHelper::showSelectedVersion(pkgCache::PkgIterator const&, pkgCache::VerIterator, std::basic_string, std::allocator > const&, bool const&)@Base" 0.8.0 -# (c++)"APT::CacheSetHelper::canNotFindCandInstVer(pkgCacheFile&, pkgCache::PkgIterator const&)@Base" 0.8.0 -# (c++)"APT::CacheSetHelper::canNotFindInstCandVer(pkgCacheFile&, pkgCache::PkgIterator const&)@Base" 0.8.0 (c++)"APT::PackageContainer, std::allocator > >::const_iterator::getPkg() const@Base" 0.8.16~exp9 (c++)"APT::PackageContainer, std::allocator > >::getConstructor() const@Base" 0.8.16~exp9 (c++)"APT::PackageContainer, std::allocator > >::empty() const@Base" 0.8.16~exp9 @@ -1489,7 +1423,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"APT::VersionContainerInterface::FromModifierCommandLine(unsigned short&, APT::VersionContainerInterface*, pkgCacheFile&, char const*, std::list > const&, APT::CacheSetHelper&)@Base" 0.8.16~exp9 (c++)"EDSP::WriteLimitedScenario(pkgDepCache&, _IO_FILE*, APT::PackageContainer, std::allocator > > const&, OpProgress*)@Base" 0.8.16~exp9 (c++)"EDSP::WriteScenarioLimitedDependency(pkgDepCache&, _IO_FILE*, pkgCache::PkgIterator const&, pkgCache::VerIterator const&, APT::PackageContainer, std::allocator > > const&)@Base" 0.8.16~exp9 - (c++)"APT::VersionContainer > >::iterator std::max_element > >::iterator, CompareProviders>(APT::VersionContainer > >::iterator, APT::VersionContainer > >::iterator, CompareProviders)@Base" 0.8.16~exp9 (c++)"typeinfo for APT::PackageContainer, std::allocator > >::const_iterator@Base" 0.8.16~exp9 (c++)"typeinfo for APT::PackageContainer, std::allocator > >@Base" 0.8.16~exp9 (c++)"typeinfo for APT::PackageContainer > >::const_iterator@Base" 0.8.16~exp9 @@ -1530,3 +1463,53 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++|optional=private)"pkgCacheGenerator::MergeListVersion(pkgCacheGenerator::ListParser&, pkgCache::PkgIterator&, std::basic_string, std::allocator > const&, pkgCache::VerIterator*&)@Base" 0.8.16~exp7 (c++|optional=private)"pkgCacheGenerator::AddImplicitDepends(pkgCache::GrpIterator&, pkgCache::PkgIterator&, pkgCache::VerIterator&)@Base" 0.8.16~exp7 (c++|optional=private)"pkgCacheGenerator::AddImplicitDepends(pkgCache::VerIterator&, pkgCache::PkgIterator&)@Base" 0.8.16~exp7 + (c++)"pkgTagSection::Exists(char const*)@Base" 0.9.7.9~exp1 + (c++)"_strrstrip(char*)@Base" 0.9.7.9~exp2 + (c++)"SplitClearSignedFile(std::basic_string, std::allocator > const&, FileFd*, std::vector, std::allocator >, std::allocator, std::allocator > > >*, FileFd*)@Base" 0.9.7.9~exp2 + (c++)"OpenMaybeClearSignedFile(std::basic_string, std::allocator > const&, FileFd&)@Base" 0.9.7.9~exp2 + (c++)"ExecGPGV(std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&, int const&, int*)@Base" 0.9.7.9~exp2 + (c++)"SigVerify::RunGPGV(std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&, int const&)@Base" 0.9.7.9~exp2 + (c++)"Configuration::Dump(std::basic_ostream >&, char const*, char const*, bool)@Base" 0.9.3 + (c++)"AcquireUpdate(pkgAcquire&, int, bool, bool)@Base" 0.9.3 + (c++|optional=private)"pkgAcqMethod::Dequeue()@Base" 0.9.4 + (c++)"pkgCache::DepIterator::IsMultiArchImplicit() const@Base" 0.9.6 + (c++)"pkgCache::PrvIterator::IsMultiArchImplicit() const@Base" 0.9.6 + (c++)"APT::PackageContainerInterface::FromGroup(APT::PackageContainerInterface*, pkgCacheFile&, std::basic_string, std::allocator >, APT::CacheSetHelper&)@Base" 0.9.7 + (c++)"APT::CacheFilter::PackageArchitectureMatchesSpecification::PackageArchitectureMatchesSpecification(std::basic_string, std::allocator > const&, bool)@Base" 0.9.7 + (c++)"APT::CacheFilter::PackageArchitectureMatchesSpecification::~PackageArchitectureMatchesSpecification()@Base" 0.9.7 + (c++)"APT::CacheFilter::PackageArchitectureMatchesSpecification::operator()(pkgCache::PkgIterator const&)@Base" 0.9.7 + (c++)"APT::CacheFilter::PackageArchitectureMatchesSpecification::operator()(pkgCache::VerIterator const&)@Base" 0.9.7 + (c++)"APT::CacheFilter::PackageArchitectureMatchesSpecification::operator()(char const* const&)@Base" 0.9.7 + (c++)"APT::Configuration::checkLanguage(std::basic_string, std::allocator >, bool)@Base" 0.9.7.5 + (c++)"pkgCdrom::DropTranslation(std::vector, std::allocator >, std::allocator, std::allocator > > >&)@Base" 0.9.7.5 + (c++)"pkgCache::DepIterator::IsSatisfied(pkgCache::PrvIterator const&) const@Base" 0.9.8 + (c++)"pkgCache::DepIterator::IsSatisfied(pkgCache::VerIterator const&) const@Base" 0.9.8 + (c++)"pkgCacheGenerator::NewDepends(pkgCache::PkgIterator&, pkgCache::VerIterator&, unsigned int, unsigned int const&, unsigned int const&, unsigned int*&)@Base" 0.9.8 + (c++)"pkgCacheGenerator::NewVersion(pkgCache::VerIterator&, std::basic_string, std::allocator > const&, unsigned int, unsigned long, unsigned long)@Base" 0.9.8 + (c++)"FileFd::FileFdErrno(char const*, char const*, ...)@Base" 0.9.9 + (c++)"FileFd::FileFdError(char const*, ...)@Base" 0.9.9 + (c++)"operator<<(std::basic_ostream >&, GlobalError::Item)@Base" 0.9.9 + (c++)"pkgDepCache::IsDeleteOkProtectInstallRequests(pkgCache::PkgIterator const&, bool, unsigned long, bool)@Base" 0.9.9.1 + (c++)"pkgDepCache::IsInstallOkMultiArchSameVersionSynced(pkgCache::PkgIterator const&, bool, unsigned long, bool)@Base" 0.9.9.1 + (c++)"pkgDPkgPM::SendPkgsInfo(_IO_FILE*, unsigned int const&)@Base" 0.9.9.1 + (c++)"pkgCache::VerIterator::MultiArchType() const@Base" 0.9.9.1 +### demangle strangeness - buildd report it as MISSING and as new… + (c++)"pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire*, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::vector > const*, indexRecords*)@Base" 0.8.0 +### gcc artefacts + (c++|regex|optional=std)"^std::vector::(vector|push_back|erase|_[^ ]+)\(.+\)( const|)@Base$" 0.8.0 + (c++|optional=std)"std::ctype::widen(char) const@Base" 0.8.0 + (c++|optional=std)"char* std::basic_string, std::allocator >::_S_construct<__gnu_cxx::__normal_iterator, std::allocator > > >(__gnu_cxx::__normal_iterator, std::allocator > >, __gnu_cxx::__normal_iterator, std::allocator > >, std::allocator const&, std::forward_iterator_tag)@Base" 0.8.0 + (c++|optional=std)"char* std::basic_string, std::allocator >::_S_construct<__gnu_cxx::__normal_iterator, std::allocator > > >(__gnu_cxx::__normal_iterator, std::allocator > >, __gnu_cxx::__normal_iterator, std::allocator > >, std::allocator const&, std::forward_iterator_tag)@Base" 0.8.0 + (c++|optional=std)"char* std::basic_string, std::allocator >::_S_construct(char const*, char const*, std::allocator const&, std::forward_iterator_tag)@Base" 0.8.0 + (c++|optional=std)"char* std::basic_string, std::allocator >::_S_construct(char*, char*, std::allocator const&, std::forward_iterator_tag)@Base" 0.8.0 +### try to ignore std:: template instances + (c++|regex|optional=std)"^(void |)std::[^ ]+<.+ >::(_|~).+\(.*\)@Base$" 0.8.0 + (c++|regex|optional=std)"^std::[^ ]+<.+ >::(append|insert|reserve|operator[^ ]+)\(.*\)@Base$" 0.8.0 + (c++|regex|optional=std)"^(void |DiffInfo\* |)std::_.*@Base$" 0.8.0 + (c++|regex|optional=std)"^(bool|void) std::(operator|sort_heap|make_heap)[^ ]+<.+ >\(.+\)@Base$" 0.8.0 + (c++|regex|optional=std)"^std::reverse_iterator<.+ > std::__.+@Base$" 0.8.0 + (c++|regex|optional=std)"^std::basic_string<.+ >\(.+\)@Base$" 0.8.0 + (c++|regex|optional=std)"^__gnu_cxx::__[^ ]+<.*@Base$" 0.8.0 + (c++|regex|optional=std)"^typeinfo name for std::iterator<.*>@Base$" 0.8.0 + (c++|regex|optional=std)"^typeinfo for std::iterator<.*>@Base$" 0.8.0 -- cgit v1.2.3 From 402c0d19a0c6668d7710b2b48561eb3059a04584 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 27 Jul 2013 00:28:10 +0200 Subject: run "doxygen -u" to update doxygen config Git-Dch: Ignore --- doc/Doxyfile.in | 668 +++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 522 insertions(+), 146 deletions(-) diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index cf79aff85..a0087cd2c 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -1,14 +1,16 @@ -# Doxyfile 1.6.1 +# Doxyfile 1.8.4 # This file describes the settings to be used by the documentation system -# doxygen (www.doxygen.org) for a project +# doxygen (www.doxygen.org) for a project. # -# All text after a hash (#) is considered a comment and will be ignored +# All text after a double hash (##) is considered a comment and is placed +# in front of the TAG it is preceding . +# All text after a hash (#) is considered a comment and will be ignored. # The format is: # TAG = value [value, ...] # For lists items can also be appended using: # TAG += value [value, ...] -# Values that contain spaces should be placed between quotes (" ") +# Values that contain spaces should be placed between quotes (" "). #--------------------------------------------------------------------------- # Project related configuration options @@ -22,8 +24,9 @@ DOXYFILE_ENCODING = UTF-8 -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded -# by quotes) that should identify the project. +# The PROJECT_NAME tag is a single word (or sequence of words) that should +# identify the project. Note that if you do not use Doxywizard you need +# to put quotes around the project name if it contains spaces. PROJECT_NAME = @PACKAGE@ @@ -33,6 +36,19 @@ PROJECT_NAME = @PACKAGE@ PROJECT_NUMBER = @PACKAGE_VERSION@ +# Using the PROJECT_BRIEF tag one can provide an optional one line description +# for a project that appears at the top of each page and should give viewer +# a quick idea about the purpose of the project. Keep the description short. + +PROJECT_BRIEF = + +# With the PROJECT_LOGO tag one can specify an logo or icon that is +# included in the documentation. The maximum height of the logo should not +# exceed 55 pixels and the maximum width should not exceed 200 pixels. +# Doxygen will copy the logo to the output directory. + +PROJECT_LOGO = + # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. # If a relative path is entered, it will be relative to the location @@ -56,9 +72,9 @@ CREATE_SUBDIRS = NO # Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, # Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, # Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English -# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, -# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, -# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. +# messages), Korean, Korean-en, Latvian, Lithuanian, Norwegian, Macedonian, +# Persian, Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, +# Slovak, Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. OUTPUT_LANGUAGE = English @@ -112,7 +128,9 @@ FULL_PATH_NAMES = YES # only done if one of the specified strings matches the left-hand part of # the path. The tag can be used to show relative paths in the file list. # If left blank the directory from which doxygen is run is used as the -# path to strip. +# path to strip. Note that you specify absolute paths here, but also +# relative paths, which will be relative from the directory where doxygen is +# started. STRIP_FROM_PATH = @@ -126,7 +144,7 @@ STRIP_FROM_PATH = STRIP_FROM_INC_PATH = # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter -# (but less readable) file names. This can be useful is your file systems +# (but less readable) file names. This can be useful if your file system # doesn't support long names like on DOS, Mac, or CD-ROM. SHORT_NAMES = NO @@ -181,6 +199,13 @@ TAB_SIZE = 8 ALIASES = +# This tag can be used to specify a number of word-keyword mappings (TCL only). +# A mapping has the form "name=value". For example adding +# "class=itcl::class" will allow you to use the command class in the +# itcl::class meaning. + +TCL_SUBST = + # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C # sources only. Doxygen will then generate output that is more tailored for C. # For instance, some of the names that are used will be different. The list @@ -207,22 +232,40 @@ OPTIMIZE_FOR_FORTRAN = NO OPTIMIZE_OUTPUT_VHDL = NO -# Doxygen selects the parser to use depending on the extension of the files it parses. -# With this tag you can assign which parser to use for a given extension. -# Doxygen has a built-in mapping, but you can override or extend it using this tag. -# The format is ext=language, where ext is a file extension, and language is one of -# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, -# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat -# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), -# use: inc=Fortran f=C. Note that for custom extensions you also need to set FILE_PATTERNS otherwise the files are not read by doxygen. +# Doxygen selects the parser to use depending on the extension of the files it +# parses. With this tag you can assign which parser to use for a given +# extension. Doxygen has a built-in mapping, but you can override or extend it +# using this tag. The format is ext=language, where ext is a file extension, +# and language is one of the parsers supported by doxygen: IDL, Java, +# Javascript, CSharp, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, +# C++. For instance to make doxygen treat .inc files as Fortran files (default +# is PHP), and .f files as C (default is Fortran), use: inc=Fortran f=C. Note +# that for custom extensions you also need to set FILE_PATTERNS otherwise the +# files are not read by doxygen. EXTENSION_MAPPING = +# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all +# comments according to the Markdown format, which allows for more readable +# documentation. See http://daringfireball.net/projects/markdown/ for details. +# The output of markdown processing is further processed by doxygen, so you +# can mix doxygen, HTML, and XML commands with Markdown formatting. +# Disable only in case of backward compatibilities issues. + +MARKDOWN_SUPPORT = YES + +# When enabled doxygen tries to link words that correspond to documented +# classes, or namespaces to their corresponding documentation. Such a link can +# be prevented in individual cases by by putting a % sign in front of the word +# or globally by setting AUTOLINK_SUPPORT to NO. + +AUTOLINK_SUPPORT = YES + # If you use STL classes (i.e. std::string, std::vector, etc.) but do not want # to include (a tag file for) the STL sources as input, then you should # set this tag to YES in order to let doxygen match functions declarations and # definitions whose arguments contain STL classes (e.g. func(std::string); v.s. -# func(std::string) {}). This also make the inheritance and collaboration +# func(std::string) {}). This also makes the inheritance and collaboration # diagrams that involve STL classes more complete and accurate. BUILTIN_STL_SUPPORT = YES @@ -238,10 +281,10 @@ CPP_CLI_SUPPORT = NO SIP_SUPPORT = NO -# For Microsoft's IDL there are propget and propput attributes to indicate getter -# and setter methods for a property. Setting this option to YES (the default) -# will make doxygen to replace the get and set methods by a property in the -# documentation. This will only work if the methods are indeed getting or +# For Microsoft's IDL there are propget and propput attributes to indicate +# getter and setter methods for a property. Setting this option to YES (the +# default) will make doxygen replace the get and set methods by a property in +# the documentation. This will only work if the methods are indeed getting or # setting a simple type. If this is not the case, or you want to show the # methods anyway, you should set this option to NO. @@ -262,6 +305,22 @@ DISTRIBUTE_GROUP_DOC = NO SUBGROUPING = YES +# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and +# unions are shown inside the group in which they are included (e.g. using +# @ingroup) instead of on a separate page (for HTML and Man pages) or +# section (for LaTeX and RTF). + +INLINE_GROUPED_CLASSES = NO + +# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and +# unions with only public data fields or simple typedef fields will be shown +# inline in the documentation of the scope in which they are defined (i.e. file, +# namespace, or group documentation), provided this scope is documented. If set +# to NO (the default), structs, classes, and unions are shown on a separate +# page (for HTML and Man pages) or section (for LaTeX and RTF). + +INLINE_SIMPLE_STRUCTS = NO + # When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum # is documented as struct, union, or enum with the name of the typedef. So # typedef struct TypeS {} TypeT, will appear in the documentation as a struct @@ -272,21 +331,16 @@ SUBGROUPING = YES TYPEDEF_HIDES_STRUCT = NO -# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to -# determine which symbols to keep in memory and which to flush to disk. -# When the cache is full, less often used symbols will be written to disk. -# For small to medium size projects (<1000 input files) the default value is -# probably good enough. For larger projects a too small cache size can cause -# doxygen to be busy swapping symbols to and from disk most of the time -# causing a significant performance penality. -# If the system has enough physical memory increasing the cache will improve the -# performance by keeping more symbols in memory. Note that the value works on -# a logarithmic scale so increasing the size by one will rougly double the -# memory usage. The cache size is given by this formula: -# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, -# corresponding to a cache size of 2^16 = 65536 symbols - -SYMBOL_CACHE_SIZE = 0 +# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This +# cache is used to resolve symbols given their name and scope. Since this can +# be an expensive process and often the same symbol appear multiple times in +# the code, doxygen keeps a cache of pre-resolved symbols. If the cache is too +# small doxygen will become slower. If the cache is too large, memory is wasted. +# The cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid +# range is 0..9, the default is 0, corresponding to a cache size of 2^16 = 65536 +# symbols. + +LOOKUP_CACHE_SIZE = 0 #--------------------------------------------------------------------------- # Build related configuration options @@ -295,7 +349,7 @@ SYMBOL_CACHE_SIZE = 0 # If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in # documentation are documented, even if no documentation was available. # Private class members and static file members will be hidden unless -# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES +# the EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES EXTRACT_ALL = NO @@ -304,6 +358,11 @@ EXTRACT_ALL = NO EXTRACT_PRIVATE = NO +# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal +# scope will be included in the documentation. + +EXTRACT_PACKAGE = NO + # If the EXTRACT_STATIC tag is set to YES all static members of a file # will be included in the documentation. @@ -326,7 +385,7 @@ EXTRACT_LOCAL_METHODS = NO # extracted and appear in the documentation as a namespace called # 'anonymous_namespace{file}', where file will be replaced with the base # name of the file that contains the anonymous namespace. By default -# anonymous namespace are hidden. +# anonymous namespaces are hidden. EXTRACT_ANON_NSPACES = NO @@ -386,6 +445,12 @@ HIDE_SCOPE_NAMES = YES SHOW_INCLUDE_FILES = YES +# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen +# will list include files with double quotes in the documentation +# rather than with sharp brackets. + +FORCE_LOCAL_INCLUDES = NO + # If the INLINE_INFO tag is set to YES (the default) then a tag [inline] # is inserted in the documentation for inline members. @@ -405,7 +470,13 @@ SORT_MEMBER_DOCS = YES SORT_BRIEF_DOCS = NO -# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the (brief and detailed) documentation of class members so that constructors and destructors are listed first. If set to NO (the default) the constructors will appear in the respective orders defined by SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO. +# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen +# will sort the (brief and detailed) documentation of class members so that +# constructors and destructors are listed first. If set to NO (the default) +# the constructors will appear in the respective orders defined by +# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. +# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO +# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO. SORT_MEMBERS_CTORS_1ST = NO @@ -425,6 +496,15 @@ SORT_GROUP_NAMES = NO SORT_BY_SCOPE_NAME = NO +# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to +# do proper type resolution of all parameters of a function it will reject a +# match between the prototype and the implementation of a member function even +# if there is only one candidate or it is obvious which candidate to choose +# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen +# will still accept a match between prototype and implementation in such cases. + +STRICT_PROTO_MATCHING = NO + # The GENERATE_TODOLIST tag can be used to enable (YES) or # disable (NO) the todo list. This list is created by putting \todo # commands in the documentation. @@ -450,15 +530,16 @@ GENERATE_BUGLIST = YES GENERATE_DEPRECATEDLIST= YES # The ENABLED_SECTIONS tag can be used to enable conditional -# documentation sections, marked by \if sectionname ... \endif. +# documentation sections, marked by \if section-label ... \endif +# and \cond section-label ... \endcond blocks. ENABLED_SECTIONS = # The MAX_INITIALIZER_LINES tag determines the maximum number of lines -# the initial value of a variable or define consists of for it to appear in +# the initial value of a variable or macro consists of for it to appear in # the documentation. If the initializer consists of more lines than specified # here it will be hidden. Use a value of 0 to hide initializers completely. -# The appearance of the initializer of individual variables and defines in the +# The appearance of the initializer of individual variables and macros in the # documentation can be controlled using \showinitializer or \hideinitializer # command in the documentation regardless of this setting. @@ -470,12 +551,6 @@ MAX_INITIALIZER_LINES = 30 SHOW_USED_FILES = YES -# If the sources in your project are distributed over multiple directories -# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy -# in the documentation. The default is NO. - -SHOW_DIRECTORIES = YES - # Set the SHOW_FILES tag to NO to disable the generation of the Files page. # This will remove the Files entry from the Quick Index and from the # Folder Tree View (if specified). The default is YES. @@ -499,15 +574,26 @@ SHOW_NAMESPACES = YES FILE_VERSION_FILTER = -# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by -# doxygen. The layout file controls the global structure of the generated output files -# in an output format independent way. The create the layout file that represents -# doxygen's defaults, run doxygen with the -l option. You can optionally specify a -# file name after the option, if omitted DoxygenLayout.xml will be used as the name -# of the layout file. +# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed +# by doxygen. The layout file controls the global structure of the generated +# output files in an output format independent way. To create the layout file +# that represents doxygen's defaults, run doxygen with the -l option. +# You can optionally specify a file name after the option, if omitted +# DoxygenLayout.xml will be used as the name of the layout file. LAYOUT_FILE = +# The CITE_BIB_FILES tag can be used to specify one or more bib files +# containing the references data. This must be a list of .bib files. The +# .bib extension is automatically appended if omitted. Using this command +# requires the bibtex tool to be installed. See also +# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style +# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this +# feature you need bibtex and perl available in the search path. Do not use +# file names with spaces, bibtex cannot handle them. + +CITE_BIB_FILES = + #--------------------------------------------------------------------------- # configuration options related to warning and progress messages #--------------------------------------------------------------------------- @@ -536,7 +622,7 @@ WARN_IF_UNDOCUMENTED = YES WARN_IF_DOC_ERROR = YES -# This WARN_NO_PARAMDOC option can be abled to get warnings for +# The WARN_NO_PARAMDOC option can be enabled to get warnings for # functions that are documented, but have no documentation for their parameters # or return value. If set to NO (the default) doxygen will only warn about # wrong or incomplete parameter documentation, but not about the absence of @@ -582,8 +668,9 @@ INPUT_ENCODING = UTF-8 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp # and *.h) to filter out the source-files in the directories. If left # blank the following patterns are tested: -# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx -# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 +# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh +# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py +# *.f90 *.f *.for *.vhd *.vhdl FILE_PATTERNS = *.cc \ *.h @@ -594,14 +681,16 @@ FILE_PATTERNS = *.cc \ RECURSIVE = YES -# The EXCLUDE tag can be used to specify files and/or directories that should +# The EXCLUDE tag can be used to specify files and/or directories that should be # excluded from the INPUT source files. This way you can easily exclude a # subdirectory from a directory tree whose root is specified with the INPUT tag. +# Note that relative paths are relative to the directory from which doxygen is +# run. EXCLUDE = -# The EXCLUDE_SYMLINKS tag can be used select whether or not files or -# directories that are symbolic links (a Unix filesystem feature) are excluded +# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or +# directories that are symbolic links (a Unix file system feature) are excluded # from the input. EXCLUDE_SYMLINKS = NO @@ -654,8 +743,10 @@ IMAGE_PATH = # is the value of the INPUT_FILTER tag, and is the name of an # input file. Doxygen will then use the output that the filter program writes # to standard output. -# If FILTER_PATTERNS is specified, this tag will be -# ignored. +# If FILTER_PATTERNS is specified, this tag will be ignored. +# Note that the filter must not add or remove lines; it is applied before the +# code is scanned, but not when the output code is generated. If lines are added +# or removed, the anchors will not be placed correctly. INPUT_FILTER = @@ -665,8 +756,8 @@ INPUT_FILTER = # filter if there is a match. # The filters are a list of the form: # pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further -# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER -# is applied to all files. +# info on how filters are used. If FILTER_PATTERNS is empty or if +# non of the patterns match the file name, INPUT_FILTER is applied. FILTER_PATTERNS = @@ -676,6 +767,21 @@ FILTER_PATTERNS = FILTER_SOURCE_FILES = NO +# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file +# pattern. A pattern will override the setting for FILTER_PATTERN (if any) +# and it is also possible to disable source filtering for a specific pattern +# using *.ext= (so without naming a filter). This option only has effect when +# FILTER_SOURCE_FILES is enabled. + +FILTER_SOURCE_PATTERNS = + +# If the USE_MD_FILE_AS_MAINPAGE tag refers to the name of a markdown file that +# is part of the input, its contents will be placed on the main page +# (index.html). This can be useful if you have a project on for instance GitHub +# and want reuse the introduction page also for the doxygen output. + +USE_MDFILE_AS_MAINPAGE = + #--------------------------------------------------------------------------- # configuration options related to source browsing #--------------------------------------------------------------------------- @@ -694,7 +800,7 @@ INLINE_SOURCES = NO # Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct # doxygen to hide any special comment blocks from generated source code -# fragments. Normal C and C++ comments will always remain visible. +# fragments. Normal C, C++ and Fortran comments will always remain visible. STRIP_CODE_COMMENTS = YES @@ -778,7 +884,14 @@ HTML_FILE_EXTENSION = .html # The HTML_HEADER tag can be used to specify a personal HTML header for # each generated HTML page. If it is left blank doxygen will generate a -# standard header. +# standard header. Note that when using a custom header you are responsible +# for the proper inclusion of any scripts and style sheets that doxygen +# needs, which is dependent on the configuration options used. +# It is advised to generate a default header using "doxygen -w html +# header.html footer.html stylesheet.css YourConfigFile" and then modify +# that header. Note that the header is subject to change so you typically +# have to redo this when upgrading to a newer version of doxygen or when +# changing the value of configuration settings such as GENERATE_TREEVIEW! HTML_HEADER = @@ -790,27 +903,80 @@ HTML_FOOTER = # The HTML_STYLESHEET tag can be used to specify a user-defined cascading # style sheet that is used by each HTML page. It can be used to -# fine-tune the look of the HTML output. If the tag is left blank doxygen -# will generate a default style sheet. Note that doxygen will try to copy -# the style sheet file to the HTML output directory, so don't put your own -# stylesheet in the HTML output directory as well, or it will be erased! +# fine-tune the look of the HTML output. If left blank doxygen will +# generate a default style sheet. Note that it is recommended to use +# HTML_EXTRA_STYLESHEET instead of this one, as it is more robust and this +# tag will in the future become obsolete. HTML_STYLESHEET = -# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, -# files or namespaces will be aligned in HTML using tables. If set to -# NO a bullet list will be used. +# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional +# user-defined cascading style sheet that is included after the standard +# style sheets created by doxygen. Using this option one can overrule +# certain style aspects. This is preferred over using HTML_STYLESHEET +# since it does not replace the standard style sheet and is therefor more +# robust against future updates. Doxygen will copy the style sheet file to +# the output directory. + +HTML_EXTRA_STYLESHEET = + +# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or +# other source files which should be copied to the HTML output directory. Note +# that these files will be copied to the base HTML output directory. Use the +# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these +# files. In the HTML_STYLESHEET file, use the file name only. Also note that +# the files will be copied as-is; there are no commands or markers available. + +HTML_EXTRA_FILES = + +# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. +# Doxygen will adjust the colors in the style sheet and background images +# according to this color. Hue is specified as an angle on a colorwheel, +# see http://en.wikipedia.org/wiki/Hue for more information. +# For instance the value 0 represents red, 60 is yellow, 120 is green, +# 180 is cyan, 240 is blue, 300 purple, and 360 is red again. +# The allowed range is 0 to 359. + +HTML_COLORSTYLE_HUE = 220 + +# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of +# the colors in the HTML output. For a value of 0 the output will use +# grayscales only. A value of 255 will produce the most vivid colors. + +HTML_COLORSTYLE_SAT = 100 + +# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to +# the luminance component of the colors in the HTML output. Values below +# 100 gradually make the output lighter, whereas values above 100 make +# the output darker. The value divided by 100 is the actual gamma applied, +# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2, +# and 100 does not change the gamma. + +HTML_COLORSTYLE_GAMMA = 80 -HTML_ALIGN_MEMBERS = YES +# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML +# page will contain the date and time when the page was generated. Setting +# this to NO can help when comparing the output of multiple runs. + +HTML_TIMESTAMP = YES # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the -# page has loaded. For this to work a browser that supports -# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox -# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). +# page has loaded. HTML_DYNAMIC_SECTIONS = NO +# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of +# entries shown in the various tree structured indices initially; the user +# can expand and collapse entries dynamically later on. Doxygen will expand +# the tree to such a level that at most the specified number of entries are +# visible (unless a fully collapsed tree already exceeds this amount). +# So setting the number of entries 1 will produce a full collapsed tree by +# default. 0 is a special value representing an infinite number of entries +# and will result in a full expanded tree by default. + +HTML_INDEX_NUM_ENTRIES = 100 + # If the GENERATE_DOCSET tag is set to YES, additional index files # will be generated that can be used as input for Apple's Xcode 3 # integrated development environment, introduced with OSX 10.5 (Leopard). @@ -819,7 +985,8 @@ HTML_DYNAMIC_SECTIONS = NO # directory and running "make install" will install the docset in # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find # it at startup. -# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information. +# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# for more information. GENERATE_DOCSET = NO @@ -837,6 +1004,16 @@ DOCSET_FEEDNAME = "Doxygen generated docs" DOCSET_BUNDLE_ID = org.doxygen.Project +# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely +# identify the documentation publisher. This should be a reverse domain-name +# style string, e.g. com.mycompany.MyDocSet.documentation. + +DOCSET_PUBLISHER_ID = org.doxygen.Publisher + +# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher. + +DOCSET_PUBLISHER_NAME = Publisher + # If the GENERATE_HTMLHELP tag is set to YES, additional index files # will be generated that can be used as input for tools like the # Microsoft HTML help workshop to generate a compiled HTML help file (.chm) @@ -881,10 +1058,10 @@ BINARY_TOC = NO TOC_EXPAND = NO -# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER -# are set, an additional index file will be generated that can be used as input for -# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated -# HTML documentation. +# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and +# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated +# that can be used as input for Qt's qhelpgenerator to generate a +# Qt Compressed Help (.qch) of the generated HTML documentation. GENERATE_QHP = NO @@ -906,20 +1083,24 @@ QHP_NAMESPACE = QHP_VIRTUAL_FOLDER = doc -# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. -# For more information please see +# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to +# add. For more information please see # http://doc.trolltech.com/qthelpproject.html#custom-filters QHP_CUST_FILTER_NAME = -# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see -# Qt Help Project / Custom Filters. +# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the +# custom filter to add. For more information please see +# +# Qt Help Project / Custom Filters. QHP_CUST_FILTER_ATTRS = -# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's +# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this +# project's # filter section matches. -# Qt Help Project / Filter Attributes. +# +# Qt Help Project / Filter Attributes. QHP_SECT_FILTER_ATTRS = @@ -930,16 +1111,30 @@ QHP_SECT_FILTER_ATTRS = QHG_LOCATION = -# The DISABLE_INDEX tag can be used to turn on/off the condensed index at -# top of each HTML page. The value NO (the default) enables the index and -# the value YES disables it. +# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files +# will be generated, which together with the HTML files, form an Eclipse help +# plugin. To install this plugin and make it available under the help contents +# menu in Eclipse, the contents of the directory containing the HTML and XML +# files needs to be copied into the plugins directory of eclipse. The name of +# the directory within the plugins directory should be the same as +# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before +# the help appears. -DISABLE_INDEX = NO +GENERATE_ECLIPSEHELP = NO -# This tag can be used to set the number of enum values (range [1..20]) -# that doxygen will group on one line in the generated HTML documentation. +# A unique identifier for the eclipse help plugin. When installing the plugin +# the directory name containing the HTML and XML files should also have +# this name. -ENUM_VALUES_PER_LINE = 4 +ECLIPSE_DOC_ID = org.doxygen.Project + +# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) +# at top of each HTML page. The value NO (the default) enables the index and +# the value YES disables it. Since the tabs have the same information as the +# navigation tree you can set this option to NO if you already set +# GENERATE_TREEVIEW to YES. + +DISABLE_INDEX = NO # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index # structure should be generated to display hierarchical information. @@ -948,13 +1143,17 @@ ENUM_VALUES_PER_LINE = 4 # is generated for HTML Help). For this to work a browser that supports # JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). # Windows users are probably better off using the HTML help feature. +# Since the tree basically has the same information as the tab index you +# could consider to set DISABLE_INDEX to NO when enabling this option. GENERATE_TREEVIEW = NO -# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, -# and Class Hierarchy pages using a tree view instead of an ordered list. +# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values +# (range [0,1..20]) that doxygen will group on one line in the generated HTML +# documentation. Note that a value of 0 will completely suppress the enum +# values from appearing in the overview section. -USE_INLINE_TREES = NO +ENUM_VALUES_PER_LINE = 4 # If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be # used to set the initial width (in pixels) of the frame in which the tree @@ -962,6 +1161,11 @@ USE_INLINE_TREES = NO TREEVIEW_WIDTH = 250 +# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open +# links to external symbols imported via tag files in a separate window. + +EXT_LINKS_IN_WINDOW = NO + # Use this tag to change the font size of Latex formulas included # as images in the HTML documentation. The default is 10. Note that # when you change the font size after a successful doxygen run you need @@ -970,13 +1174,112 @@ TREEVIEW_WIDTH = 250 FORMULA_FONTSIZE = 10 -# When the SEARCHENGINE tag is enable doxygen will generate a search box for the HTML output. The underlying search engine uses javascript -# and DHTML and should work on any modern browser. Note that when using HTML help (GENERATE_HTMLHELP) or Qt help (GENERATE_QHP) -# there is already a search function so this one should typically -# be disabled. +# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# generated for formulas are transparent PNGs. Transparent PNGs are +# not supported properly for IE 6.0, but are supported on all modern browsers. +# Note that when changing this option you need to delete any form_*.png files +# in the HTML output before the changes have effect. + +FORMULA_TRANSPARENT = YES + +# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax +# (see http://www.mathjax.org) which uses client side Javascript for the +# rendering instead of using prerendered bitmaps. Use this if you do not +# have LaTeX installed or if you want to formulas look prettier in the HTML +# output. When enabled you may also need to install MathJax separately and +# configure the path to it using the MATHJAX_RELPATH option. + +USE_MATHJAX = NO + +# When MathJax is enabled you can set the default output format to be used for +# the MathJax output. Supported types are HTML-CSS, NativeMML (i.e. MathML) and +# SVG. The default value is HTML-CSS, which is slower, but has the best +# compatibility. + +MATHJAX_FORMAT = HTML-CSS + +# When MathJax is enabled you need to specify the location relative to the +# HTML output directory using the MATHJAX_RELPATH option. The destination +# directory should contain the MathJax.js script. For instance, if the mathjax +# directory is located at the same level as the HTML output directory, then +# MATHJAX_RELPATH should be ../mathjax. The default value points to +# the MathJax Content Delivery Network so you can quickly see the result without +# installing MathJax. +# However, it is strongly recommended to install a local +# copy of MathJax from http://www.mathjax.org before deployment. + +MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest + +# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension +# names that should be enabled during MathJax rendering. + +MATHJAX_EXTENSIONS = + +# The MATHJAX_CODEFILE tag can be used to specify a file with javascript +# pieces of code that will be used on startup of the MathJax code. + +MATHJAX_CODEFILE = + +# When the SEARCHENGINE tag is enabled doxygen will generate a search box +# for the HTML output. The underlying search engine uses javascript +# and DHTML and should work on any modern browser. Note that when using +# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets +# (GENERATE_DOCSET) there is already a search function so this one should +# typically be disabled. For large projects the javascript based search engine +# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. SEARCHENGINE = NO +# When the SERVER_BASED_SEARCH tag is enabled the search engine will be +# implemented using a web server instead of a web client using Javascript. +# There are two flavours of web server based search depending on the +# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for +# searching and an index file used by the script. When EXTERNAL_SEARCH is +# enabled the indexing and searching needs to be provided by external tools. +# See the manual for details. + +SERVER_BASED_SEARCH = NO + +# When EXTERNAL_SEARCH is enabled doxygen will no longer generate the PHP +# script for searching. Instead the search results are written to an XML file +# which needs to be processed by an external indexer. Doxygen will invoke an +# external search engine pointed to by the SEARCHENGINE_URL option to obtain +# the search results. Doxygen ships with an example indexer (doxyindexer) and +# search engine (doxysearch.cgi) which are based on the open source search +# engine library Xapian. See the manual for configuration details. + +EXTERNAL_SEARCH = NO + +# The SEARCHENGINE_URL should point to a search engine hosted by a web server +# which will returned the search results when EXTERNAL_SEARCH is enabled. +# Doxygen ships with an example search engine (doxysearch) which is based on +# the open source search engine library Xapian. See the manual for configuration +# details. + +SEARCHENGINE_URL = + +# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed +# search data is written to a file for indexing by an external tool. With the +# SEARCHDATA_FILE tag the name of this file can be specified. + +SEARCHDATA_FILE = searchdata.xml + +# When SERVER_BASED_SEARCH AND EXTERNAL_SEARCH are both enabled the +# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is +# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple +# projects and redirect the results back to the right project. + +EXTERNAL_SEARCH_ID = + +# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen +# projects other than the one defined by this configuration file, but that are +# all added to the same external search index. Each project needs to have a +# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id +# of to a relative location where the documentation can be found. +# The format is: EXTRA_SEARCH_MAPPINGS = id1=loc1 id2=loc2 ... + +EXTRA_SEARCH_MAPPINGS = + #--------------------------------------------------------------------------- # configuration options related to the LaTeX output #--------------------------------------------------------------------------- @@ -994,6 +1297,9 @@ LATEX_OUTPUT = latex # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be # invoked. If left blank `latex' will be used as the default command name. +# Note that when enabling USE_PDFLATEX this option is only used for +# generating bitmaps for formulas in the HTML output, but not in the +# Makefile that is written to the output directory. LATEX_CMD_NAME = latex @@ -1010,8 +1316,8 @@ MAKEINDEX_CMD_NAME = makeindex COMPACT_LATEX = NO # The PAPER_TYPE tag can be used to set the paper type that is used -# by the printer. Possible values are: a4, a4wide, letter, legal and -# executive. If left blank a4wide will be used. +# by the printer. Possible values are: a4, letter, legal and +# executive. If left blank a4 will be used. PAPER_TYPE = a4wide @@ -1027,6 +1333,20 @@ EXTRA_PACKAGES = LATEX_HEADER = +# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for +# the generated latex document. The footer should contain everything after +# the last chapter. If it is left blank doxygen will generate a +# standard footer. Notice: only use this tag if you know what you are doing! + +LATEX_FOOTER = + +# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images +# or other source files which should be copied to the LaTeX output directory. +# Note that the files will be copied as-is; there are no commands or markers +# available. + +LATEX_EXTRA_FILES = + # If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated # is prepared for conversion to pdf (using ps2pdf). The pdf file will # contain links (just like the HTML output) instead of page references @@ -1053,10 +1373,19 @@ LATEX_BATCHMODE = NO LATEX_HIDE_INDICES = NO -# If LATEX_SOURCE_CODE is set to YES then doxygen will include source code with syntax highlighting in the LaTeX output. Note that which sources are shown also depends on other settings such as SOURCE_BROWSER. +# If LATEX_SOURCE_CODE is set to YES then doxygen will include +# source code with syntax highlighting in the LaTeX output. +# Note that which sources are shown also depends on other settings +# such as SOURCE_BROWSER. LATEX_SOURCE_CODE = NO +# The LATEX_BIB_STYLE tag can be used to specify the style to use for the +# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See +# http://en.wikipedia.org/wiki/BibTeX for more info. + +LATEX_BIB_STYLE = plain + #--------------------------------------------------------------------------- # configuration options related to the RTF output #--------------------------------------------------------------------------- @@ -1088,7 +1417,7 @@ COMPACT_RTF = NO RTF_HYPERLINKS = NO -# Load stylesheet definitions from file. Syntax is similar to doxygen's +# Load style sheet definitions from file. Syntax is similar to doxygen's # config file, i.e. a series of assignments. You only have to provide # replacements, missing definitions are set to their default value. @@ -1162,6 +1491,21 @@ XML_DTD = XML_PROGRAMLISTING = YES +#--------------------------------------------------------------------------- +# configuration options related to the DOCBOOK output +#--------------------------------------------------------------------------- + +# If the GENERATE_DOCBOOK tag is set to YES Doxygen will generate DOCBOOK files +# that can be used to generate PDF. + +GENERATE_DOCBOOK = NO + +# The DOCBOOK_OUTPUT tag is used to specify where the DOCBOOK pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in +# front of it. If left blank docbook will be used as the default path. + +DOCBOOK_OUTPUT = docbook + #--------------------------------------------------------------------------- # configuration options for the AutoGen Definitions output #--------------------------------------------------------------------------- @@ -1233,7 +1577,7 @@ MACRO_EXPANSION = NO EXPAND_ONLY_PREDEF = NO # If the SEARCH_INCLUDES tag is set to YES (the default) the includes files -# in the INCLUDE_PATH (see below) will be search if a #include is found. +# pointed to by INCLUDE_PATH will be searched when a #include is found. SEARCH_INCLUDES = YES @@ -1263,15 +1607,15 @@ PREDEFINED = # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. # The macro definition that is found in the sources will be used. -# Use the PREDEFINED tag if you want to use a different macro definition. +# Use the PREDEFINED tag if you want to use a different macro definition that +# overrules the definition found in the source code. EXPAND_AS_DEFINED = # If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then -# doxygen's preprocessor will remove all function-like macros that are alone -# on a line, have an all uppercase name, and do not end with a semicolon. Such -# function macros are typically used for boiler-plate code, and will confuse -# the parser if not removed. +# doxygen's preprocessor will remove all references to function-like macros +# that are alone on a line, have an all uppercase name, and do not end with a +# semicolon, because these will confuse the parser if not removed. SKIP_FUNCTION_MACROS = YES @@ -1279,22 +1623,18 @@ SKIP_FUNCTION_MACROS = YES # Configuration::additions related to external references #--------------------------------------------------------------------------- -# The TAGFILES option can be used to specify one or more tagfiles. -# Optionally an initial location of the external documentation -# can be added for each tagfile. The format of a tag file without -# this location is as follows: +# The TAGFILES option can be used to specify one or more tagfiles. For each +# tag file the location of the external documentation should be added. The +# format of a tag file without this location is as follows: # # TAGFILES = file1 file2 ... # Adding location for the tag files is done as follows: # # TAGFILES = file1=loc1 "file2 = loc2" ... -# where "loc1" and "loc2" can be relative or absolute paths or -# URLs. If a location is present for each tag, the installdox tool -# does not have to be run to correct the links. -# Note that each tag file must have a unique name -# (where the name does NOT include the path) -# If a tag file is not located in the directory in which doxygen -# is run, you must also specify the path to the tagfile here. +# where "loc1" and "loc2" can be relative or absolute paths +# or URLs. Note that each tag file must have a unique name (where the name does +# NOT include the path). If a tag file is not located in the directory in which +# doxygen is run, you must also specify the path to the tagfile here. TAGFILES = @@ -1315,6 +1655,12 @@ ALLEXTERNALS = NO EXTERNAL_GROUPS = YES +# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed +# in the related pages index. If set to NO, only the current project's +# pages will be listed. + +EXTERNAL_PAGES = YES + # The PERL_PATH should be the absolute path and name of the perl script # interpreter (i.e. the result of `which perl'). @@ -1327,9 +1673,8 @@ PERL_PATH = /usr/bin/perl # If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will # generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base # or super classes. Setting the tag to NO turns the diagrams off. Note that -# this option is superseded by the HAVE_DOT option below. This is only a -# fallback. It is recommended to install and use dot, since it yields more -# powerful graphs. +# this option also works with HAVE_DOT disabled, but it is recommended to +# install and use dot, since it yields more powerful graphs. CLASS_DIAGRAMS = YES @@ -1355,14 +1700,20 @@ HIDE_UNDOC_RELATIONS = YES HAVE_DOT = @HAVE_DOT@ -# By default doxygen will write a font called FreeSans.ttf to the output -# directory and reference it in all dot files that doxygen generates. This -# font does not include all possible unicode characters however, so when you need -# these (or just want a differently looking font) you can specify the font name -# using DOT_FONTNAME. You need need to make sure dot is able to find the font, -# which can be done by putting it in a standard location or by setting the -# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory -# containing the font. +# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is +# allowed to run in parallel. When set to 0 (the default) doxygen will +# base this on the number of processors available in the system. You can set it +# explicitly to a value larger than 0 to get control over the balance +# between CPU load and processing speed. + +DOT_NUM_THREADS = 0 + +# By default doxygen will use the Helvetica font for all dot files that +# doxygen generates. When you want a differently looking font you can specify +# the font name using DOT_FONTNAME. You need to make sure dot is able to find +# the font, which can be done by putting it in a standard location or by setting +# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the +# directory containing the font. DOT_FONTNAME = FreeSans @@ -1371,17 +1722,16 @@ DOT_FONTNAME = FreeSans DOT_FONTSIZE = 10 -# By default doxygen will tell dot to use the output directory to look for the -# FreeSans.ttf font (which doxygen will put there itself). If you specify a -# different font using DOT_FONTNAME you can set the path where dot -# can find it using this tag. +# By default doxygen will tell dot to use the Helvetica font. +# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to +# set the path where dot can find it. DOT_FONTPATH = # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen # will generate a graph for each documented class showing the direct and # indirect inheritance relations. Setting this tag to YES will force the -# the CLASS_DIAGRAMS tag to NO. +# CLASS_DIAGRAMS tag to NO. CLASS_GRAPH = YES @@ -1403,6 +1753,15 @@ GROUP_GRAPHS = YES UML_LOOK = NO +# If the UML_LOOK tag is enabled, the fields and methods are shown inside +# the class node. If there are many fields or methods and many nodes the +# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS +# threshold limits the number of items for each type to make the size more +# manageable. Set this to 0 for no limit. Note that the threshold may be +# exceeded by 50% before the limit is enforced. + +UML_LIMIT_NUM_FIELDS = 10 + # If set to YES, the inheritance and collaboration graphs will show the # relations between templates and their instances. @@ -1439,11 +1798,11 @@ CALL_GRAPH = NO CALLER_GRAPH = NO # If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen -# will graphical hierarchy of all classes instead of a textual one. +# will generate a graphical hierarchy of all classes instead of a textual one. GRAPHICAL_HIERARCHY = YES -# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES +# If the DIRECTORY_GRAPH and HAVE_DOT tags are set to YES # then doxygen will show the dependencies a directory has on other directories # in a graphical way. The dependency relations are determined by the #include # relations between the files in the directories. @@ -1451,11 +1810,22 @@ GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images -# generated by dot. Possible values are png, jpg, or gif -# If left blank png will be used. +# generated by dot. Possible values are svg, png, jpg, or gif. +# If left blank png will be used. If you choose svg you need to set +# HTML_FILE_EXTENSION to xhtml in order to make the SVG files +# visible in IE 9+ (other browsers do not have this requirement). DOT_IMAGE_FORMAT = png +# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to +# enable generation of interactive SVG images that allow zooming and panning. +# Note that this requires a modern browser other than Internet Explorer. +# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you +# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files +# visible. Older versions of IE do not have SVG support. + +INTERACTIVE_SVG = NO + # The tag DOT_PATH can be used to specify the path where the dot tool can be # found. If left blank, it is assumed the dot tool can be found in the path. @@ -1467,6 +1837,12 @@ DOT_PATH = @DOTDIR@ DOTFILE_DIRS = +# The MSCFILE_DIRS tag can be used to specify one or more directories that +# contain msc files that are included in the documentation (see the +# \mscfile command). + +MSCFILE_DIRS = + # The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of # nodes that will be shown in the graph. If the number of nodes in a graph # becomes larger than this value, doxygen will truncate the graph, which is -- cgit v1.2.3 From 55732492ddea83e7d97b2e0c3e6799948fc5f152 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 1 Aug 2013 12:58:20 +0200 Subject: unset LANGUAGE for showing [Y/n] answer hints nl_langinfo is used to acquire the YESEXPR of the language used, but it will return the one from LC_MESSAGES, which might be different from the language chosen for display of the question (based on LANGUAGE) so this commit removes the [Y/n] help text from the questions itself and moves it to the prompt creation in which the usage of LC_MESSAGES is forced for it, so that the helptext shown actually represents the characters accepted as input for the question. There is still room for problems of course starting with an untranslated "[Y/n]" but a translated YESEXPR or the problem that the question is asked in a completely different language which might have a conflicting definition of [Y/n] input or the user simple ignores the helptext and assumes that an answer matching the question language is accepted, but the mayority of users will never have this problem to begin with, so we should be fine (or at least a bit finer than before). Closes nothing really, but should at least help a bit with bugs like deb:194614, deb:471102, lp:1205578, and countless others. --- cmdline/apt-get.cc | 35 +- configure.ac | 2 +- po/apt-all.pot | 576 +++++++------- po/ar.po | 580 +++++++------- po/ast.po | 584 +++++++------- po/bg.po | 580 +++++++------- po/bs.po | 579 +++++++------- po/ca.po | 580 +++++++------- po/cs.po | 580 +++++++------- po/cy.po | 579 +++++++------- po/da.po | 580 +++++++------- po/de.po | 584 +++++++------- po/dz.po | 586 +++++++------- po/el.po | 586 +++++++------- po/es.po | 588 +++++++------- po/eu.po | 582 +++++++------- po/fi.po | 580 +++++++------- po/fr.po | 580 +++++++------- po/gl.po | 582 +++++++------- po/hu.po | 580 +++++++------- po/it.po | 584 +++++++------- po/ja.po | 586 +++++++------- po/km.po | 578 +++++++------- po/ko.po | 580 +++++++------- po/ku.po | 579 +++++++------- po/lt.po | 580 +++++++------- po/mr.po | 578 +++++++------- po/nb.po | 580 +++++++------- po/ne.po | 580 +++++++------- po/nl.po | 582 +++++++------- po/nn.po | 582 +++++++------- po/pl.po | 580 +++++++------- po/pt.po | 584 +++++++------- po/pt_BR.po | 580 +++++++------- po/ro.po | 584 +++++++------- po/ru.po | 580 +++++++------- po/sk.po | 584 +++++++------- po/sl.po | 588 +++++++------- po/sv.po | 580 +++++++------- po/th.po | 584 +++++++------- po/tl.po | 582 +++++++------- po/tr.po | 859 +++++++++++---------- po/uk.po | 584 +++++++------- po/vi.po | 580 +++++++------- po/zh_CN.po | 582 +++++++------- po/zh_TW.po | 581 +++++++------- .../test-bug-596498-trusted-unsigned-repo | 4 +- 47 files changed, 13387 insertions(+), 12521 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 73b396795..4b7691d93 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -130,13 +130,42 @@ class CacheFile : public pkgCacheFile /* Returns true on a Yes.*/ bool YnPrompt(bool Default=true) { + /* nl_langinfo does not support LANGUAGE setting, so we unset it here + to have the help-message (hopefully) match the expected characters */ + char * language = getenv("LANGUAGE"); + if (language != NULL) + language = strdup(language); + if (language != NULL) + unsetenv("LANGUAGE"); + + if (Default == true) + // TRANSLATOR: Yes/No question help-text: defaulting to Y[es] + // e.g. "Do you want to continue? [Y/n] " + // The user has to answer with an input matching the + // YESEXPR/NOEXPR defined in your l10n. + c2out << " " << _("[Y/n]") << " " << std::flush; + else + // TRANSLATOR: Yes/No question help-text: defaulting to N[o] + // e.g. "Should this file be removed? [y/N] " + // The user has to answer with an input matching the + // YESEXPR/NOEXPR defined in your l10n. + c2out << " " << _("[y/N]") << " " << std::flush; + + if (language != NULL) + { + setenv("LANGUAGE", language, 0); + free(language); + } + if (_config->FindB("APT::Get::Assume-Yes",false) == true) { + // TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set c1out << _("Y") << endl; return true; } else if (_config->FindB("APT::Get::Assume-No",false) == true) { + // TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set c1out << _("N") << endl; return false; } @@ -1076,7 +1105,7 @@ static bool CheckAuth(pkgAcquire& Fetcher) if (_config->FindI("quiet",0) < 2 && _config->FindB("APT::Get::Assume-Yes",false) == false) { - c2out << _("Install these packages without verification [y/N]? ") << flush; + c2out << _("Install these packages without verification?") << flush; if (!YnPrompt(false)) return _error->Error(_("Some packages could not be authenticated")); @@ -1281,8 +1310,8 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, if (_config->FindI("quiet",0) < 2 && _config->FindB("APT::Get::Assume-Yes",false) == false) { - c2out << _("Do you want to continue [Y/n]? ") << flush; - + c2out << _("Do you want to continue?") << flush; + if (YnPrompt() == false) { c2out << _("Abort.") << endl; diff --git a/configure.ac b/configure.ac index 28d77bb36..9fb20b95f 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) PACKAGE="apt" -PACKAGE_VERSION="0.9.7.6ubuntu2" +PACKAGE_VERSION="0.9.9.4" PACKAGE_MAIL="APT Development Team " AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION") diff --git a/po/apt-all.pot b/po/apt-all.pot index 1bfca4088..ab5b68a52 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.8.1\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -89,77 +89,77 @@ msgstr "" msgid "Total space accounted for: " msgstr "" -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "" -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 msgid "You must give at least one search pattern" msgstr "" -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "" -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "" -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr "" -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr "" -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr "" #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr "" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "" -#: cmdline/apt-cache.cc:1730 +#: cmdline/apt-cache.cc:1760 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -241,141 +241,159 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +msgid "[Y/n]" +msgstr "" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" msgstr "" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" msgstr "" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr "" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 msgid "The following packages have been kept back:" msgstr "" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "" -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "" -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "" -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "" -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr "" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 msgid " [Not candidate version]" msgstr "" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "" -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -383,185 +401,185 @@ msgid "" "is only available from another source\n" msgstr "" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, c-format msgid "Package '%s' has no installation candidate" msgstr "" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "" -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:913 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "" -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr "" -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr "" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" -#: cmdline/apt-get.cc:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "" -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " +#: cmdline/apt-get.cc:1108 +msgid "Install these packages without verification?" msgstr "" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" msgstr "" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 msgid "Packages need to be removed but remove is disabled." msgstr "" -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Couldn't determine free space in %s" msgstr "" -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, c-format msgid "You don't have enough free space in %s." msgstr "" -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -569,46 +587,46 @@ msgid "" " ?] " msgstr "" -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "" -#: cmdline/apt-get.cc:1284 -msgid "Do you want to continue [Y/n]? " +#: cmdline/apt-get.cc:1313 +msgid "Do you want to continue?" msgstr "" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "" -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "" -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -618,35 +636,35 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -662,15 +680,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1824 +#: cmdline/apt-get.cc:1853 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -679,7 +697,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -687,27 +705,27 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1866 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1984 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:2002 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" @@ -715,85 +733,85 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, c-format msgid "" "Please use:\n" @@ -801,141 +819,141 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2604 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2644 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2649 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2839 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:3009 +#: cmdline/apt-get.cc:3040 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "" -#: cmdline/apt-get.cc:3027 +#: cmdline/apt-get.cc:3058 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:3050 +#: cmdline/apt-get.cc:3081 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:3089 +#: cmdline/apt-get.cc:3120 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:3095 +#: cmdline/apt-get.cc:3126 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "" -#: cmdline/apt-get.cc:3118 +#: cmdline/apt-get.cc:3149 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3164 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, c-format msgid "Changelog for %s (%s)" msgstr "" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -981,7 +999,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1049,8 +1067,8 @@ msgid "%s was already not hold.\n" msgstr "" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" @@ -1115,7 +1133,7 @@ msgstr "" msgid "Disk not found." msgstr "" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "" @@ -1176,7 +1194,7 @@ msgstr "" msgid "TYPE failed, server said: %s" msgstr "" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "" @@ -1184,8 +1202,8 @@ msgstr "" msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "" @@ -1197,86 +1215,86 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "" -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "" @@ -1312,7 +1330,7 @@ msgstr "" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "" @@ -1342,36 +1360,36 @@ msgstr "" msgid "Unable to connect to %s:%s:" msgstr "" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:167 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:173 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 msgid "The following signatures were invalid:\n" msgstr "" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1409,59 +1427,59 @@ msgstr "" msgid "Unknown date format" msgstr "" -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "" -#: methods/http.cc:855 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:928 +#: methods/http.cc:927 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1198 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1510,7 +1528,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "" @@ -1915,11 +1933,11 @@ msgstr "" msgid "Invalid archive member header" msgstr "" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "" @@ -2241,7 +2259,7 @@ msgstr "" msgid "Unable to stat the mount point %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "" @@ -2260,101 +2278,101 @@ msgstr "" msgid "Could not open lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, c-format msgid "Sub-process %s received signal %u." msgstr "" -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, c-format msgid "Could not open file descriptor %d" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "" -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, c-format msgid "read, still have %llu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, c-format msgid "Problem closing the file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, c-format msgid "Problem renaming the file %s to %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, c-format msgid "Problem unlinking the file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "" @@ -2551,19 +2569,19 @@ msgstr "" msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, c-format msgid "Could not configure '%s'. " msgstr "" -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2582,17 +2600,17 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2758,40 +2776,40 @@ msgstr "" msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 msgid "Hash Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2799,32 +2817,32 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, 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:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "" @@ -2940,22 +2958,22 @@ msgstr "" msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3042,12 +3060,12 @@ msgstr "" msgid "Installing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr "" @@ -3068,96 +3086,96 @@ msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, c-format msgid "Directory '%s' missing" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, c-format msgid "Could not open file '%s'" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/ar.po b/po/ar.po index f77c14a2b..c392c8240 100644 --- a/po/ar.po +++ b/po/ar.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2006-10-20 21:28+0300\n" "Last-Translator: Ossama M. Khayat \n" "Language-Team: Arabic \n" @@ -95,78 +95,78 @@ msgstr "" msgid "Total space accounted for: " msgstr "مجموع المساحة المحسوب حسابها:" -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "" -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "لم يُعثر على أية حزم" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 #, fuzzy msgid "You must give at least one search pattern" msgstr "يجب أن تعطي صيغة واحدة بالضبط" -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "تعذر العثور على الحزمة %s" -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "ملفات الحزم:" -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "الحزم المُدبّسة:" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(غير موجود)" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr " مُثبّت:" -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr " مرشّح: " -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(لاشيء)" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr "" #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr " جدول النسخ:" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s لـ%s %s مُجمّع على %s %s\n" -#: cmdline/apt-cache.cc:1730 +#: cmdline/apt-cache.cc:1760 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -249,83 +249,101 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +msgid "[Y/n]" +msgstr "[Y/n]" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "[y/N]" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" msgstr "" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "إلا أن %s مثبت" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "إلا أنه سيتم تثبيت %s" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "إلا أنه غير قابل للتثبيت" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "إلا أنها حزمة وهمية" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "إلا أنها غير مثبتة" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "إلا أنه لن يتم تثبيتها" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr " أو" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "سيتم تثبيت الحزم الجديدة التالية:" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "سيتم إزالة الحزم التالية:" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 msgid "The following packages have been kept back:" msgstr "سيتم الإبقاء على الحزم التالية:" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "ستتم ترقية الحزم التالية:" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "سيتم تثبيط الحزم التالية:" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "سيتم تغيير الحزم المبقاة التالية:" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s (بسبب %s) " -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -333,59 +351,59 @@ msgstr "" "تحذير: ستتم إزالة الحزم الأساسية التالية.\n" "لا يجب أن تقوم بهذا إلى إن كنت تعرف تماماً ما تقوم به!" -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu سيتم ترقيتها، %lu مثبتة حديثاً، " -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "%lu أعيد تثبيتها، " -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "%lu مثبطة، " -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu لإزالتها و %lu لم يتم ترقيتها.\n" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu غير مثبتة بالكامل أو مزالة.\n" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, fuzzy, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "لاحظ، تحديد %s بسبب صيغة regex '%s'\n" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, fuzzy, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "لاحظ، تحديد %s بسبب صيغة regex '%s'\n" -#: cmdline/apt-get.cc:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "الحزمة %s وهميّة وتوفّرها:\n" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr " [مُثبّتة]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 msgid " [Not candidate version]" msgstr "" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "يجب اختيار واحدة بالتحديد لتثبيتها." -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -393,185 +411,185 @@ msgid "" "is only available from another source\n" msgstr "" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "على أيّ فإن الحزم التالية تحلّ مكانها:" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, fuzzy, c-format msgid "Package '%s' has no installation candidate" msgstr "الحزمة %s ليس لها مرشح تثبيت" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, fuzzy, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "لاحظ، تحديد %s بدلاً من %s\n" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, fuzzy, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "إعادة تثبيت %s غير ممكنة، حيث أنّه لا يمكن تنزيلها.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "%s هي النسخة الأحدث.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "إلا أنه سيتم تثبيت %s" -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:913 #, fuzzy, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "النسخة المحددة %s (%s) للإصدارة %s\n" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, fuzzy, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "النسخة المحددة %s (%s) للإصدارة %s\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "تصحيح المعتمدات..." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr " فشل." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "لم يمكن تصحيح المعتمدات" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "لم يمكن تقليص مجموعة الترقية" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr " تم" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "قد ترغب بتنفيذ الأمر 'apt-get -f install' لتصحيح هذه." -#: cmdline/apt-get.cc:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "مُعتمدات غير مستوفاة. حاول استخدام -f." -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 msgid "WARNING: The following packages cannot be authenticated!" msgstr "تحذير: تعذرت المصادقة على الحزم التالية!" -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "تم غض النظر عن تحذير المصادقة.\n" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " -msgstr "تثبيت هذه الحزم دون التحقق منها [y/N]؟ " +#: cmdline/apt-get.cc:1108 +msgid "Install these packages without verification?" +msgstr "تثبيت هذه الحزم دون التحقق منها؟" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" msgstr "تعذرت المصادقة على بعض الحزم" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "هناك مشاكل وتم استخدام -y دون --force-yes" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "خطأ داخلي، تم طلب InstallPackages مع وجود حزم معطوبة!" -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 msgid "Packages need to be removed but remove is disabled." msgstr "حزم بحاجة للإزالة لكن الإزالة مُعطّلة." -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 msgid "Internal error, Ordering didn't finish" msgstr "خطأ داخلي، لم تنته عملية الترتيب" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "يا للغرابة.. لم تتطابق الأحجام، الرجاء مراسلة apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "بحاجة إلى جلب %sب/%sب من الأرشيف.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "بحاجة إلى جلب %sب من الأرشيف.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, fuzzy, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "بعد الاستخراج %sب من المساحة الإضافيّة سيتمّ استخدامها.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, fuzzy, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "بعد الاستخراج %sب من المساحة ستفرّغ.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Couldn't determine free space in %s" msgstr "تعذر حساب المساحة الحرة في %s" -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, c-format msgid "You don't have enough free space in %s." msgstr "ليس هناك مساحة كافية في %s." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "نعم، افعل ما أقوله!" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -582,28 +600,28 @@ msgstr "" "كي تستمر اكتب العبارة '%s'\n" " ؟] " -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "إجهاض." -#: cmdline/apt-get.cc:1284 -msgid "Do you want to continue [Y/n]? " -msgstr "هل تريد الاستمرار [Y/n]؟" +#: cmdline/apt-get.cc:1313 +msgid "Do you want to continue?" +msgstr "هل تريد الاستمرار؟" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "فشل إحضار %s %s\n" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "فشل تنزيل بعض الملفات" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "اكتمل التنزيل وفي وضع التنزيل فقط" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -611,19 +629,19 @@ msgstr "" "تعذر إحضار بعض الأرشيف، ربما يمكنك محاولة تنفيذ apt-get update أو إضافة --" "fix-missing؟" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing وتبديل الأوساط غير مدعومة حالياً" -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "تعذر تصحيح الحزم المفقودة." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "إجهاض التثبيت." -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -633,35 +651,35 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr "لا يقبل الأمر update أية مُعطيات" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -677,16 +695,16 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 msgid "The following information may help to resolve the situation:" msgstr "قد تساعد المعلومات التالية في حل المشكلة:" -#: cmdline/apt-get.cc:1824 +#: cmdline/apt-get.cc:1853 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -696,7 +714,7 @@ msgid_plural "" msgstr[0] "سيتم تثبيت الحزم الجديدة التالية:" msgstr[1] "سيتم تثبيت الحزم الجديدة التالية:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -704,28 +722,28 @@ msgid_plural "" msgstr[0] "سيتم تثبيت الحزم الجديدة التالية:" msgstr[1] "سيتم تثبيت الحزم الجديدة التالية:" -#: cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1866 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1984 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "قد ترغب بتشغيل 'apt-get -f install' لتصحيح هذه:" -#: cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" "مُعتمدات غير مستوفاة. جرب 'apt-get -f install' بدون أسماء حزم (أو حدّد حلاً)." -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:2002 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" @@ -733,85 +751,85 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "حزم معطوبة" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "سيتم تثبيت الحزم الإضافيّة التالية:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "الحزم المقترحة:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "الحزم المستحسنة:" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "تعذر العثور على الحزمة %s" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "إلا أنه سيتم تثبيت %s" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "حساب الترقية..." -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "فشل" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "تمّ" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "تعذر قَفْل دليل التنزيل" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 msgid "Must specify at least one package to fetch source for" msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها" -#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, c-format msgid "Unable to find a source package for %s" msgstr "تعذر العثور على مصدر الحزمة %s" -#: cmdline/apt-get.cc:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, c-format msgid "" "Please use:\n" @@ -819,141 +837,141 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "تخطي الملف '%s' المنزل مسبقاً\n" -#: cmdline/apt-get.cc:2604 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr "ليس هناك مساحة كافية في %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2644 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "يجب جلب %sب/%sب من الأرشيفات المصدرية.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2649 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "يجب جلب %sب من الأرشيفات المصدريّة.\n" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "إحضار المصدر %s\n" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "فشل إحضار بعض الأرشيفات." -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "أمر فك الحزمة '%s' فشل.\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "أمر البناء '%s' فشل.\n" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2839 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:3009 +#: cmdline/apt-get.cc:3040 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "" -#: cmdline/apt-get.cc:3027 +#: cmdline/apt-get.cc:3058 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:3050 +#: cmdline/apt-get.cc:3081 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:3089 +#: cmdline/apt-get.cc:3120 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:3095 +#: cmdline/apt-get.cc:3126 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "" -#: cmdline/apt-get.cc:3118 +#: cmdline/apt-get.cc:3149 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3164 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "الاتصال بـ%s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "الوحدات المدعومة:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -999,7 +1017,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1070,8 +1088,8 @@ msgid "%s was already not hold.\n" msgstr "%s هي النسخة الأحدث.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" @@ -1138,7 +1156,7 @@ msgstr "تعذر فكّ القرص المدمج من %s، إذ قد يكون ل msgid "Disk not found." msgstr "لم يُعثر على القرص." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "لم يُعثر على الملف" @@ -1201,7 +1219,7 @@ msgstr "فشل أمر نص تسجيل الدخول البرمجي '%s'، ردّ msgid "TYPE failed, server said: %s" msgstr "فشل TYPE، ردّ الخادم: %s" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "انتهى وقت الاتصال" @@ -1209,8 +1227,8 @@ msgstr "انتهى وقت الاتصال" msgid "Server closed the connection" msgstr "أغلق الخادم الاتصال" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "خطأ في القراءة" @@ -1222,86 +1240,86 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "خطأ في الكتابة" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "" -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "تعذر إرسال الأمر PORT" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "فشل EPRT، ردّ الخادم: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "تعذر قبول الاتصال" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "تعذر إحضار الملف، ردّ الخادم '%s'" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "فشل نقل البيانات، ردّ الخادم '%s'" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "استعلام" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "" @@ -1337,7 +1355,7 @@ msgstr "تعذر الاتصال بـ%s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "الاتصال بـ%s" @@ -1367,36 +1385,36 @@ msgstr "" msgid "Unable to connect to %s:%s:" msgstr "تعذر الاتصال بـ%s %s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:167 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:173 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 msgid "The following signatures were invalid:\n" msgstr "" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1434,59 +1452,59 @@ msgstr "خادم http له دعم مدى معطوب" msgid "Unknown date format" msgstr "نسق تاريخ مجهول" -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "فشل التحديد" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "انتهى وقت الاتصال" -#: methods/http.cc:855 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "خطأ في الكتابة إلى ملف المُخرجات" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "خطأ في الكتابة إلى الملف" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "خطأ في الكتابة إلى الملف" -#: methods/http.cc:928 +#: methods/http.cc:927 msgid "Error reading from server. Remote end closed connection" msgstr "خطأ في القراءة من الخادم. أقفل الطرف الآخر الاتصال" -#: methods/http.cc:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "خطأ في القراءة من الخادم" -#: methods/http.cc:1198 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "بيانات ترويسة سيئة" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "فشل الاتصال" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "خطأ داخلي" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "تعذرت قراءة %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1535,7 +1553,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "" @@ -1942,11 +1960,11 @@ msgstr "توقيع الأرشيف غير صالح" msgid "Invalid archive member header" msgstr "" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "الأرشيف قصير جداً" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "فشلت قراءة ترويسات الأرشيف" @@ -2271,7 +2289,7 @@ msgstr "عمليّة غير صالحة %s" msgid "Unable to stat the mount point %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "" @@ -2290,101 +2308,101 @@ msgstr "" msgid "Could not open lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, c-format msgid "Sub-process %s received signal %u." msgstr "" -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "فشل إغلاق الملف %s" -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "" -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, c-format msgid "read, still have %llu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "مشكلة في إغلاق الملف" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "مشكلة في مزامنة الملف" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "مشكلة في إغلاق الملف" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "مشكلة في مزامنة الملف" @@ -2582,19 +2600,19 @@ msgstr "" msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "فشل إغلاق الملف %s" -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2613,17 +2631,17 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2789,41 +2807,41 @@ msgstr "فشل إعادة التسمية ، %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "MD5Sum غير متطابقة" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 #, fuzzy msgid "Hash Sum mismatch" msgstr "MD5Sum غير متطابقة" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "تعذر فتح ملف قاعدة البيانات %s: %s" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2831,32 +2849,32 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, 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:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "الحجم غير متطابق" @@ -2975,22 +2993,22 @@ msgstr "كتابة لائحة المصادر الجديدة\n" msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3077,12 +3095,12 @@ msgstr "" msgid "Installing %s" msgstr "تم تثبيت %s" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr "تهيئة %s" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr "إزالة %s" @@ -3103,96 +3121,96 @@ msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, c-format msgid "Directory '%s' missing" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "فشل إغلاق الملف %s" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr "تحضير %s" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr "فتح %s" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "التحضير لتهيئة %s" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr "تم تثبيت %s" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "التحضير لإزالة %s" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr "تم إزالة %s" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "التحضير لإزالة %s بالكامل" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr "تمت إزالة %s بالكامل" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/ast.po b/po/ast.po index b0cd998e4..91535bc7a 100644 --- a/po/ast.po +++ b/po/ast.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.18\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2010-10-02 23:35+0100\n" "Last-Translator: Iñigo Varela \n" "Language-Team: Asturian (ast)\n" @@ -88,78 +88,78 @@ msgstr "Espaciu ociosu en total: " msgid "Total space accounted for: " msgstr "Informe del total d'espaciu: " -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "El ficheru de paquetes %s nun ta sincronizáu." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Nun s'alcontraron paquetes" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 msgid "You must give at least one search pattern" msgstr "Has de dar polo menos un patrón de gueta" -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Nun pue alcontrase'l paquete %s" -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "Ficheros de paquete:" -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 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" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "Paquetes na chincheta:" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(nun s'alcontró)" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr " Instaláu: " -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr " Candidatu: " -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(dengún)" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr " Chincheta de paquetes: " #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr " Tabla de versiones:" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s pa %s compiláu en %s %s\n" -#: cmdline/apt-cache.cc:1730 +#: cmdline/apt-cache.cc:1760 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -292,83 +292,101 @@ msgstr "" " -c=? Llee esti ficheru de configuración\n" " -o=? Conseña una opción de configuración arbitraria, p. ex.\n" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +msgid "[Y/n]" +msgstr "[S/n]" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "[s/N]" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" msgstr "" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Error de compilación d'espresión regular - %s" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "Los siguientes paquetes nun cumplen dependencies:" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "pero %s ta instaláu" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "pero %s ta pa instalar" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "pero nun ye instalable" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "pero ye un paquete virtual" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "pero nun ta instaláu" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "pero nun va instalase" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr " o" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "Van instalase los siguientes paquetes NUEVOS:" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "Los siguientes paquetes van DESANICIASE:" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 msgid "The following packages have been kept back:" msgstr "Los siguientes paquetes tan reteníos:" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "Los siguientes paquetes van actualizase:" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "Los siguientes paquetes van DESACTUALIZASE:" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "Van camudase los siguientes paquetes reteníos:" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s (por %s) " -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -376,59 +394,59 @@ 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:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu actualizaos, %lu nuevos instalaos, " -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalaos, " -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "%lu desactualizaos, " -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu para desaniciar y %lu nun actualizaos.\n" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nun instalaos dafechu o desaniciaos.\n" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "Nota, escoyendo '%s' pa la xera '%s'\n" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "Nota, escoyendo '%s' pa regex '%s'\n" -#: cmdline/apt-get.cc:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "El paquete %s ye un paquete virtual ufríu por:\n" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr " [Instaláu]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 msgid " [Not candidate version]" msgstr " [Nun ye versión candidata]" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "Has d'escoyer esplícitamente unu pa instalar." -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -439,185 +457,185 @@ msgstr "" "Esto puede significar que falta el paquete, ta arrumbáu, o sólo\n" "ta disponible dende otra fonte\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "Sicasí, los siguientes paquetes reemplacenlu:" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, c-format msgid "Package '%s' has no installation candidate" msgstr "El paquete '%s' nun tien candidatu pa instalación" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "Los paquetes virtuales como '%s' nun pueden desaniciase\n" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "El paquete %s nun ta instalau, nun va desaniciase\n" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, fuzzy, 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:788 +#: cmdline/apt-get.cc:817 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "Nota, escoyendo %s nel llugar de %s\n" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Saltando %s, ya ta instalau y la actualización nun ta activada.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "Saltando %s, nun ta instaláu y namái se requieren anovamientos.\n" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "La reinstalación de %s nun ye dable, nun pue descargase.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "%s yá ta na versión más nueva.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s axustáu como instaláu manualmente.\n" -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:913 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "Esbillada la versión %s (%s) pa %s\n" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, fuzzy, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "Esbillada la versión %s (%s) pa %s\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "Iguando dependencies..." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr " falló." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "Nun pudieron iguase les dependencies" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "Nun pue amenorgase'l conxuntu d'actualización" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr " Fecho" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Habríes d'executar 'apt-get -f install' para igualo." -#: cmdline/apt-get.cc:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "Dependencies incumplíes. Téntalo usando -f." -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVISU: ¡Nun pudieron autenticase los siguientes paquetes!" -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "Avisu d'autenticación saltáu.\n" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " -msgstr "¿Instalar esos paquetes ensin verificación [s/N]? " +#: cmdline/apt-get.cc:1108 +msgid "Install these packages without verification?" +msgstr "¿Instalar esos paquetes ensin verificación?" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" msgstr "Dellos paquetes nun pudieron autenticase" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "Hai problemes y utilizose -y ensin --force-yes" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Error internu, ¡InstallPackages llamose con paquetes frañaos!" -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 msgid "Packages need to be removed but remove is disabled." msgstr "Fai falta desaniciar los paquetes pero desaniciar ta torgáu." -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 msgid "Internal error, Ordering didn't finish" msgstr "Error internu, ordenar nun finó" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "Que raro.. Los tamaños nun concasen, escribe a apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Hai que descargar %sB/%sB d'archivos.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Hai que descargar %sB d'archivos.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Tres d'esta operación, van usase %sB d'espaciu de discu adicional.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Tres d'esta operación, van lliberase %sB d'espaciu de discu.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nun pue determinase l'espaciu llibre de %s" -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, c-format msgid "You don't have enough free space in %s." msgstr "Nun tienes espaciu libre bastante en %s." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Conseñose Trivial Only pero ésta nun ye una operación trivial." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "Sí, ¡facer lo que digo!" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -628,28 +646,28 @@ msgstr "" "Pa continuar escribe la frase '%s'\n" " ?] " -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "Encaboxar." -#: cmdline/apt-get.cc:1284 -msgid "Do you want to continue [Y/n]? " -msgstr "¿Quies continuar [S/n]? " +#: cmdline/apt-get.cc:1313 +msgid "Do you want to continue?" +msgstr "¿Quies continuar?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falló algamar %s %s\n" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "Dellos ficheros nun pudieron descargase" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "Descarga completa y en mou de sólo descarga" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -657,19 +675,19 @@ msgstr "" "Nun pudieron algamase dellos archivos, ¿seique executando apt-get update o " "tentando --fix-missing?" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing y cambéu de mediu nun ta sofitao actualmente" -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "Nun pudieron iguase los paquetes que falten." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "Encaboxando la instalación." -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -683,35 +701,35 @@ msgstr[1] "" "Los siguientes paquetes desaparecieron del sistema como\n" "tolos ficheros fueron sobroescritos por otros paquetes:" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Nota: Esto faise automáticamente y baxo demanda por dpkg." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Inorar release destín non disponible '%s' pal paquete '%s'" -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Tomando '%s' como paquetes d'oríxenes en llugar de '%s'\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Inorar versión non disponible de '%s' del paquete '%s'" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr "La orde update nun lleva argumentos" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 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:1817 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -729,15 +747,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 msgid "The following information may help to resolve the situation:" msgstr "La siguiente información pue aidar a resolver la situación:" -#: cmdline/apt-get.cc:1824 +#: cmdline/apt-get.cc:1853 msgid "Internal Error, AutoRemover broke stuff" msgstr "Error internu, AutoRemover rompió coses" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -748,7 +766,7 @@ msgstr[1] "" "Los siguientes paquetes instaláronse de manera automática y ya nun se " "necesiten:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -757,22 +775,22 @@ msgstr[0] "El paquete %lu instalóse de mou automáticu y yá nun se necesita.\n msgstr[1] "" "Los paquetes %lu instaláronse de manera automática y ya nun se necesiten\n" -#: cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1866 #, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Usa 'apt-get autoremove' pa desinstalalos." msgstr[1] "Usa 'apt-get autoremove' pa desinstalalos." -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "Error internu, AllUpgrade rompió coses" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1984 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Habríes d'executar 'apt-get -f install' para iguar estos:" -#: cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -780,7 +798,7 @@ msgstr "" "Dependencies ensin cubrir. Tenta 'apt-get -f install' ensin paquetes (o " "conseña una solución)." -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:2002 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" @@ -792,78 +810,78 @@ msgstr "" "inestable, que dellos paquetes necesarios nun se crearon o que\n" "s'allugaron fuera d'Incoming." -#: cmdline/apt-get.cc:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "Paquetes frañaos" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "Instalaránse los siguientes paquetes extra:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "Paquetes afalaos:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "Paquetes encamentaos" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "Nun pudo alcontrase'l paquete %s" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s axustáu como instaláu automáticamente.\n" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "Calculando l'anovamientu... " -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "Falló" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "Fecho" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 msgid "Internal error, problem resolver broke stuff" msgstr "Error internu, l'iguador de problemes frañó coses" -#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "Nun pue bloquiase'l direutoriu de descarga" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 msgid "Must specify at least one package to fetch source for" msgstr "Has de conseñar polo menos un paquete p'algamar so fonte" -#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, c-format msgid "Unable to find a source package for %s" msgstr "Nun pudo alcontrase un paquete fonte pa %s" -#: cmdline/apt-get.cc:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -872,7 +890,7 @@ msgstr "" "AVISU: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, fuzzy, c-format msgid "" "Please use:\n" @@ -884,87 +902,87 @@ msgstr "" "pa baxar los caberos anovamientos (posiblemente tovía nun sacaos) pal " "paquete.\n" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Saltando'l ficheru yá descargáu '%s'\n" -#: cmdline/apt-get.cc:2604 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr "Nun hai espaciu llibre bastante en %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2644 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Hai falta descargar %sB/%sB d'archivos fonte.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2649 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Hai falta descargar %sB d'archivos fonte.\n" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "Fonte descargada %s\n" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "Falló la descarga de dellos archivos." -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Saltando'l desempaquetáu de la fonte yá desempaquetada en %s\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Falló la orde de desempaquetáu '%s'.\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instaláu.\n" -#: cmdline/apt-get.cc:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "Falló la orde build '%s'.\n" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "Falló el procesu fíu" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 msgid "Must specify at least one package to check builddeps for" msgstr "" "Hai que conseñar polo menos un paquete pa verificar les dependencies de " "construcción" -#: cmdline/apt-get.cc:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nun pudo algamase información de dependencies de construcción pa %s" -#: cmdline/apt-get.cc:2839 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr "%s nun tien dependencies de construcción.\n" -#: cmdline/apt-get.cc:3009 +#: cmdline/apt-get.cc:3040 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -973,7 +991,7 @@ msgstr "" "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el " "paquete %s" -#: cmdline/apt-get.cc:3027 +#: cmdline/apt-get.cc:3058 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -982,14 +1000,14 @@ msgstr "" "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el " "paquete %s" -#: cmdline/apt-get.cc:3050 +#: cmdline/apt-get.cc:3081 #, 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 instaláu %s ye " "enforma nuevu" -#: cmdline/apt-get.cc:3089 +#: cmdline/apt-get.cc:3120 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -998,7 +1016,7 @@ msgstr "" "La dependencia %s en %s nun puede satisfacese porque denguna versión " "disponible del paquete %s satisfaz los requisitos de versión" -#: cmdline/apt-get.cc:3095 +#: cmdline/apt-get.cc:3126 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1007,30 +1025,30 @@ msgstr "" "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el " "paquete %s" -#: cmdline/apt-get.cc:3118 +#: cmdline/apt-get.cc:3149 #, 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:3133 +#: cmdline/apt-get.cc:3164 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Les dependencies de construcción de %s nun pudieron satisfacese." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "Fallu al procesar les dependencies de construcción" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Coneutando a %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "Módulos sofitaos:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1116,12 +1134,12 @@ msgstr "" " -c=? Lleer esti ficheru de configuración\n" " -o=? Afitar una opción de configuración arbitraria, p. ex. -o dir::cache=/" "tmp\n" -"Ver lés páxines de los manuales d' apt-get(8), sources.list(5) y apt.conf" -"(5)\n" +"Ver lés páxines de los manuales d' apt-get(8), sources.list(5) y apt." +"conf(5)\n" "pa más información y opciones.\n" " Esti APT tien Poderes de Super Vaca.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1197,8 +1215,8 @@ msgid "%s was already not hold.\n" msgstr "%s yá ta na versión más nueva.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperaba %s pero nun taba ellí" @@ -1265,7 +1283,7 @@ msgstr "Nun se pudo desmontar el CD-ROM de %s; puede que se tea usando entá." msgid "Disk not found." msgstr "Nun s'atopa'l discu." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "Nun s'atopa'l ficheru." @@ -1328,7 +1346,7 @@ msgstr "Falló la orde '%s' del guión d'entrada; el sirvidor dixo: %s" msgid "TYPE failed, server said: %s" msgstr "La triba (TYPE) falló; el sirvidor dixo: %s" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "Gandió'l tiempu de conexón" @@ -1336,8 +1354,8 @@ msgstr "Gandió'l tiempu de conexón" msgid "Server closed the connection" msgstr "El sirvidor zarró la conexón" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "Fallu de llectura" @@ -1349,86 +1367,86 @@ msgstr "Una rempuesta revirtió'l buffer." msgid "Protocol corruption" msgstr "Corrupción del protocolu" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "Fallu d'escritura" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "Nun se pudo crear un socket" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "Nun se pudo coneutar el zócalu de datos; gandió'l tiempu de conexón" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "Nun se pudo coneutar un socket pasivu." -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo nun pudo obtener un zócalu oyente" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "Nun se pudo enllazar con un socket" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "Nun se pudo escuchar nel socket" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "Nun se pudo determinar el nome del socket" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "Nun se pudo mandar la orde PORT" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Direición de familia %u desconocida (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT falló; el sirvidor dixo: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "Gandió'l tiempu de conexón col zócalu de datos" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "Nun se pudo aceptar la conexón" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "Hebo un problema al xenerar el hash del ficheru" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Nun se pudo descargar el ficheru; el sirvidor dixo '%s'" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "Gandió'l tiempu del zócalu de datos" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, 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:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "Consulta" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "Nun se pudo invocar " @@ -1464,7 +1482,7 @@ msgstr "Nun se pudo coneutar a %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "Coneutando a %s" @@ -1494,37 +1512,37 @@ msgstr "Daqué raro asocedió resolviendo '%s:%s' (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Nun pudo coneutase a %s:%s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:167 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Fallu internu: Robla bona, pero nun se pudo determinar la so buelga dixital?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Atopóse polo menos una robla mala." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:173 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Nun pudo executase 'gpgv' pa verificar la robla (¿ta instaláu gpgv?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "Fallu desconocíu al executar gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 msgid "The following signatures were invalid:\n" msgstr "Les siguientes robles nun valieron:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1564,59 +1582,59 @@ msgstr "Esti sirvidor HTTP tien rotu'l soporte d'alcance" msgid "Unknown date format" msgstr "Formatu de data desconocíu" -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "Falló la escoyeta" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "Gandió'l tiempu de conexón" -#: methods/http.cc:855 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "Fallu al escribir nel ficheru de salida" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "Fallu al escribir nel ficheru" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "Fallu al escribir nel ficheru" -#: methods/http.cc:928 +#: methods/http.cc:927 msgid "Error reading from server. Remote end closed connection" msgstr "Fallu al lleer nel sirvidor. El llau remotu zarró la conexón." -#: methods/http.cc:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "Fallu al lleer nel sirvidor" -#: methods/http.cc:1198 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "Datos de testera incorreutos" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "Fallo la conexón" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "Fallu internu" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "Nun ye a lleer %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1669,7 +1687,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "Falló criar un tubu IPC al soprocesu" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "Conexón encaboxada prematuramente" @@ -2154,11 +2172,11 @@ msgstr "Testera de miembru del archivu %s inválida" msgid "Invalid archive member header" msgstr "Testera de miembru del ficheru inválida" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "El ficheru ye perpequeñu" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "Falló al lleer les testeres del ficheru" @@ -2488,7 +2506,7 @@ msgstr "Operación incorreuta: %s" msgid "Unable to stat the mount point %s" msgstr "Nun puede algamase información del puntu de montaxe %s" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "Nun se pudo montar el CD-ROM" @@ -2507,101 +2525,101 @@ msgstr "Nun ta usándose bloquéu pal ficheru de bloquéu de sólo llectura %s" msgid "Could not open lock file %s" msgstr "Nun puede abrise'l ficheru de bloquéu %s" -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Nun ta usándose bloquéu pal ficheru de bloquéu %s montáu per nfs" -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "Nun se pudo torgar %s" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "El subprocesu %s recibió un fallu de segmentación." -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, c-format msgid "Sub-process %s received signal %u." msgstr "El subprocesu %s recibió una señal %u." -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "El subprocesu %s devolvió un códigu d'error (%u)" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "El subprocesu %s terminó de manera inesperada" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "Nun se pudo abrir el ficheru %s" -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, c-format msgid "Could not open file descriptor %d" msgstr "Nun pudo abrise un ficheru descriptor %d" -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "Nun pudo criase'l soprocesu IPC" -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "Nun pudo executase'l compresor " -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "lleíos, entá tenía de lleer %lu pero nun queda nada" -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "escritos, entá tenía d'escribir %lu pero nun pudo facerse" -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, c-format msgid "Problem closing the file %s" msgstr "Problemes zarrando'l ficheru %s" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Hai problemes al renomar el ficheru %s a %s" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, c-format msgid "Problem unlinking the file %s" msgstr "Hai problemes desvenceyando'l ficheru %s" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "Hai problemes al sincronizar el ficheru" @@ -2802,7 +2820,7 @@ msgstr "Llinia %u mal formada na llista d'oríxenes %s (triba)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Triba '%s' desconocida na llinia %u de la llista d'oríxenes %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2811,12 +2829,12 @@ msgstr "" "Nun pudó facese la configuración inmediatamente en '%s'. Por favor, mira man " "5 apt.conf embaxo APT::Immediate-Configure for details. (%d)" -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Nun pudo abrise'l ficheru '%s'" -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2839,7 +2857,7 @@ msgid "" msgstr "" "El paquete %s necesita reinstalase, pero nun s'alcuentra un archivu pa el." -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2847,11 +2865,11 @@ msgstr "" "Error, pkgProblemResolver::Resolve xeneró frañadures, esto puede ser pola " "mor de paquetes reteníos." -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "Nun pueden iguase los problemes; tienes paquetes frañaos reteníos." -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3023,40 +3041,40 @@ msgstr "falló'l cambiu de nome, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "La suma MD5 nun concasa" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 msgid "Hash Sum mismatch" msgstr "La suma hash nun concasa" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nun se pudo parchear el ficheru release %s" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "Nun hai clave pública denguna disponible pa les IDs de clave darréu:\n" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Conflictu de distribución: %s (esperábase %s pero obtúvose %s)" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3066,12 +3084,12 @@ msgstr "" "anováu y va usase un ficheru índiz. Fallu GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "Fallu GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3080,7 +3098,7 @@ msgstr "" "Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que " "necesites iguar manualmente esti paquete (por faltar una arquitectura)" -#: apt-pkg/acquire-item.cc:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3089,7 +3107,7 @@ msgstr "" "Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que " "necesites iguar manualmente esti paquete" -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3097,7 +3115,7 @@ msgstr "" "Los ficheros d'indiz de paquetes tan corrompíos. Nun hai campu Filename: pal " "paquete %s." -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "El tamañu nun concasa" @@ -3221,22 +3239,22 @@ msgstr "Escribiendo llista nueva d'oríxenes\n" msgid "Source list entries for this disc are:\n" msgstr "Les entraes de la llista d'oríxenes pa esti discu son:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "%i rexistros escritos.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i rexistros escritos con %i ficheros de menos.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i rexistros escritos con %i ficheros mal empareyaos\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3333,12 +3351,12 @@ msgstr "" msgid "Installing %s" msgstr "Instalando %s" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr "Configurando %s" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr "Desinstalando %s" @@ -3359,80 +3377,80 @@ msgid "Running post-installation trigger %s" msgstr "Executando activador de post-instalación de %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, c-format msgid "Directory '%s' missing" msgstr "Falta'l direutoriu '%s'." -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, c-format msgid "Could not open file '%s'" msgstr "Nun pudo abrise'l ficheru '%s'" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr "Preparando %s" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr "Desempaquetando %s" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "Preparándose pa configurar %s" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr "%s instaláu" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "Preparándose pa desinstalar %s" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr "%s desinstaláu" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparándose pa desinstalar dafechu %s" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr "Desinstalóse dafechu %s" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Nun puede escribise nel rexistru, falló openpty() (¿/dev/pts nun ta " "montáu?)\n" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "Executando dpkt" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "Ensin informe escritu d'apport porque MaxReports llegó dafechu" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "problemes de dependencies - déxase ensin configurar" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3440,7 +3458,7 @@ msgstr "" "Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu que " "siguió dende un fallu previu" -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3448,7 +3466,7 @@ msgstr "" "Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de " "discu llenu" -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3456,7 +3474,7 @@ msgstr "" "Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de " "memoria" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/bg.po b/po/bg.po index f4106df3b..01c334d5b 100644 --- a/po/bg.po +++ b/po/bg.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.21\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2012-06-25 17:23+0300\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -94,78 +94,78 @@ msgstr "Общо празно пространство: " msgid "Total space accounted for: " msgstr "Общо отчетено пространство: " -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "Пакетният файл %s не е синхронизиран." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Няма намерени пакети" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 msgid "You must give at least one search pattern" msgstr "Трябва да въведете поне един шаблон за търсене" -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "Тази командата е остаряла. Използвайте „apt-mark showauto“ вместо нея." -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Пакетът %s не може да бъде намерен" -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "Пакетни файлове:" -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Кешът не е синхронизиран, не може да се изпълни „x-ref“ на пакетен файл" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "Отбити пакети:" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(не са намерени)" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr " Инсталирана: " -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr " Кандидат: " -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(няма)" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr " Отбиване на пакета: " #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr " Таблица с версиите:" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s за %s компилиран на %s %s\n" -#: cmdline/apt-cache.cc:1730 +#: cmdline/apt-cache.cc:1760 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -294,83 +294,101 @@ msgstr "" " -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/" "tmp\n" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +msgid "[Y/n]" +msgstr "[Y/n]" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "[y/N]" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" msgstr "N" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Грешка при компилирането на регулярния израз - %s" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "Следните пакети имат неудовлетворени зависимости:" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "но е инсталиран %s" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "но ще бъде инсталиран %s" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "но той не може да бъде инсталиран" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "но той е виртуален пакет" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "но той не е инсталиран" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "но той няма да бъде инсталиран" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr " или" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "Следните НОВИ пакети ще бъдат инсталирани:" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "Следните пакети ще бъдат ПРЕМАХНАТИ:" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 msgid "The following packages have been kept back:" msgstr "Следните пакети няма да бъдат променени:" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "Следните пакети ще бъдат актуализирани:" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "Следните пакети ще бъдат ВЪРНАТИ КЪМ ПО-СТАРА ВЕРСИЯ:" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "Следните задържани пакети ще бъдат променени:" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s (поради %s) " -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -378,59 +396,59 @@ msgstr "" "ПРЕДУПРЕЖДЕНИЕ: Следните необходими пакети ще бъдат премахнати.\n" "Това НЕ би трябвало да става освен ако знаете точно какво правите!" -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu актуализирани, %lu нови инсталирани, " -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "%lu преинсталирани, " -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "%lu върнати към по-стара версия, " -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu за премахване и %lu без промяна.\n" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu не са напълно инсталирани или премахнати.\n" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "Избиране на %s за задача „%s“\n" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "Избиране на %s за регулярен израз „%s“\n" -#: cmdline/apt-get.cc:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Пакетът %s е виртуален пакет, осигурен от:\n" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr " [Инсталиран]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 msgid " [Not candidate version]" msgstr " [версията не е кандидат]" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "Трябва изрично да изберете един за инсталиране." -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -441,158 +459,158 @@ msgstr "" "Това може да означава, че пакета липсва, остарял е, или е достъпен\n" "само от друг източник\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "Обаче следните пакети го заместват:" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, c-format msgid "Package '%s' has no installation candidate" msgstr "Пакетът „%s“ няма кандидат за инсталиране" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "Виртуални пакети като „%s“ не могат да се премахват\n" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "" "Пакетът „%s“ не е инсталиран, така че не е премахнат. Може би имахте предвид " "„%s“?\n" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "Пакетът „%s“ не е инсталиран, така че не е премахнат\n" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "Избиране на „%s“ вместо „%s“\n" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Пропускане на %s, вече е инсталиран и не е маркиран за актуализация.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "" "Пропускане на %s, който не е инсталиран при заявени само обновявания.\n" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Преинсталацията на %s не е възможна, не може да бъде изтеглен.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "%s вече е най-новата версия.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s е отбелязан като ръчно инсталиран.\n" -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:913 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "Избрана е версия %s (%s) за %s\n" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "Избрана е версия „%s“ (%s) за „%s“ заради „%s“\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "Коригиране на зависимостите..." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr " пропадна." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "Неуспех при коригирането на зависимостите" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "Неуспех при минимизирането на набора актуализации" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr " Готово" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" "Възможно е да изпълните „apt-get -f install“, за да коригирате тези " "неизправности." -#: cmdline/apt-get.cc:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "Неудовлетворени зависимости. Опитайте с „-f“." -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ПРЕДУПРЕЖДЕНИЕ: Следните пакети не могат да бъдат удостоверени!" -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "Предупреждението за удостоверяването е пренебрегнато.\n" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " -msgstr "Инсталиране на тези пакети без проверка [y/N]?" +#: cmdline/apt-get.cc:1108 +msgid "Install these packages without verification?" +msgstr "Инсталиране на тези пакети без проверка?" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" msgstr "Някои пакети не можаха да бъдат удостоверени" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "Има проблеми и „-y“ е използвано без „--force-yes“" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Вътрешна грешка, „InstallPackages“ е предизвикано при счупени пакети!" -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 msgid "Packages need to be removed but remove is disabled." msgstr "Трябва да бъдат премахнати пакети, но премахването е изключено." -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 msgid "Internal error, Ordering didn't finish" msgstr "Вътрешна грешка, „Ordering“ не завърши" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Странно.. Размерите не съвпадат, изпратете е-поща на apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Необходимо е да се изтеглят %sB/%sB архиви.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Необходимо е да се изтеглят %sB архиви.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" @@ -601,33 +619,33 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "След тази операция ще бъде освободено %sB дисково пространство.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Couldn't determine free space in %s" msgstr "Неуспех при определянето на свободното пространство в %s" -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, c-format msgid "You don't have enough free space in %s." msgstr "Нямате достатъчно свободно пространство в %s." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Указано е „Trivial Only“, но това не е тривиална операция." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "Да, прави каквото казвам!" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -638,28 +656,28 @@ msgstr "" "За да продължите, въведете фразата „%s“\n" " ?] " -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "Прекъсване." -#: cmdline/apt-get.cc:1284 -msgid "Do you want to continue [Y/n]? " -msgstr "Искате ли да продължите [Y/n]? " +#: cmdline/apt-get.cc:1313 +msgid "Do you want to continue?" +msgstr "Искате ли да продължите?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Неуспех при изтеглянето на %s %s\n" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "Някои файлове не можаха да бъдат изтеглени" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "Изтеглянето завърши в режим само на изтегляне" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -667,19 +685,19 @@ msgstr "" "Неуспех при изтеглянето на някои архиви, може да изпълните „apt-get update“ " "или да опитате с „--fix-missing“?" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "„--fix-missing“ и превключване на носители не се поддържа все още" -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "Неуспех при коригирането на липсващите пакети." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "Прекъсване на инсталирането." -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -693,35 +711,35 @@ msgstr[1] "" "Следните пакети са отстранени от системата поради препокриване на всичките " "им файлове от други пакети:" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Това се прави автоматично от dpkg." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Игнориране на несъществуващо издание „%s“ на пакета „%s“" -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Използване на пакет източник „%s“ вместо „%s“\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Игнориране на несъществуваща версия „%s“ на пакета „%s“" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr "Командата „update“ не възприема аргументи" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Не би трябвало да се изтрива. AutoRemover няма да бъде стартиран" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -739,16 +757,16 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 msgid "The following information may help to resolve the situation:" msgstr "" "Следната информация може да помогне за намиране на изход от ситуацията:" -#: cmdline/apt-get.cc:1824 +#: cmdline/apt-get.cc:1853 msgid "Internal Error, AutoRemover broke stuff" msgstr "Вътрешна грешка, AutoRemover счупи нещо в системата" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -758,7 +776,7 @@ msgstr[0] "Следният пакет е бил инсталиран автом msgstr[1] "" "Следните пакети са били инсталирани автоматично и вече не са необходими:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -767,21 +785,21 @@ msgstr[0] "%lu пакет е бил инсталиран автоматично msgstr[1] "" "%lu пакета са били инсталирани автоматично и вече не са необходими:\n" -#: cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1866 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Използвайте „apt-get autoremove“ за да го премахнете." msgstr[1] "Използвайте „apt-get autoremove“ за да ги премахнете." -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "Вътрешна грешка, „AllUpgrade“ счупи нещо в системата" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1984 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Възможно е да изпълните „apt-get -f install“, за да коригирате:" -#: cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -789,7 +807,7 @@ msgstr "" "Неудовлетворени зависимости. Опитайте „apt-get -f install“ без пакети (или " "укажете разрешение)." -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:2002 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" @@ -801,33 +819,33 @@ msgstr "" "дистрибуция, че някои необходими пакети още не са създадени или пък\n" "са били преместени от Incoming." -#: cmdline/apt-get.cc:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "Счупени пакети" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "Следните допълнителни пакети ще бъдат инсталирани:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "Предложени пакети:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "Препоръчвани пакети:" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "Неуспех при намирането на пакет %s" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s е отбелязан като автоматично инсталиран.\n" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -835,46 +853,46 @@ msgstr "" "Тази команда е остаряла. Вместо нея използвайте „apt-mark auto“ и „apt-mark " "manual“." -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "Изчисляване на актуализацията..." -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "Неуспех" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "Готово" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 msgid "Internal error, problem resolver broke stuff" msgstr "Вътрешна грешка, „problem resolver“ счупи нещо в системата" -#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "Неуспех при заключването на директорията за изтегляне" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Не е открит източник, от който да се изтегли версия „%s“ на „%s“" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "Изтегляне на %s %s" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 msgid "Must specify at least one package to fetch source for" msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код" -#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, c-format msgid "Unable to find a source package for %s" msgstr "Неуспех при намирането на изходен код на пакет %s" -#: cmdline/apt-get.cc:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -884,7 +902,7 @@ msgstr "" "адрес:\n" "%s\n" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, c-format msgid "" "Please use:\n" @@ -896,70 +914,70 @@ msgstr "" "за да изтеглите последните промени в пакета (евентуално в процес на " "разработка).\n" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускане на вече изтегления файл „%s“\n" -#: cmdline/apt-get.cc:2604 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr "Нямате достатъчно свободно пространство в %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2644 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необходимо е да се изтеглят %sB/%sB архиви изходен код.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2649 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Необходимо е да се изтеглят %sB архиви изходен код.\n" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "Изтегляне на изходен код %s\n" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "Неуспех при изтеглянето на някои архиви." -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Пропускане на разпакетирането на вече разпакетирания изходен код в %s\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Командата за разпакетиране „%s“ пропадна.\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n" -#: cmdline/apt-get.cc:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "Командата за компилиране „%s“ пропадна.\n" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "Процесът-потомък пропадна" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 msgid "Must specify at least one package to check builddeps for" msgstr "" "Трябва да укажете поне един пакет за проверка на зависимости за компилиране" -#: cmdline/apt-get.cc:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -968,18 +986,18 @@ msgstr "" "Липсва информация за архитектурата %s. Прегледайте информацията за APT::" "Architectures в apt.conf(5)." -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Неуспех при получаването на информация за зависимостите за компилиране на %s" -#: cmdline/apt-get.cc:2839 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr "%s няма зависимости за компилиране.\n" -#: cmdline/apt-get.cc:3009 +#: cmdline/apt-get.cc:3040 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -988,7 +1006,7 @@ msgstr "" "Зависимост %s за пакета %s не може да бъде удовлетворена, %s не се позволява " "за пакети „%s“" -#: cmdline/apt-get.cc:3027 +#: cmdline/apt-get.cc:3058 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -997,14 +1015,14 @@ msgstr "" "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s " "не може да бъде намерен" -#: cmdline/apt-get.cc:3050 +#: cmdline/apt-get.cc:3081 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Неуспех при удовлетворяването на зависимост %s за пакета %s: Инсталираният " "пакет %s е твърде нов" -#: cmdline/apt-get.cc:3089 +#: cmdline/apt-get.cc:3120 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1013,7 +1031,7 @@ msgstr "" "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже версията " "кандидат на пакета %s не може да удовлетвори изискването за версия" -#: cmdline/apt-get.cc:3095 +#: cmdline/apt-get.cc:3126 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1022,30 +1040,30 @@ msgstr "" "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s " "няма подходящи версии" -#: cmdline/apt-get.cc:3118 +#: cmdline/apt-get.cc:3149 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Неуспех при удовлетворяването на зависимост %s за пакета %s: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3164 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Зависимостите за компилиране на %s не можаха да бъдат удовлетворени." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "Неуспех при обработката на зависимостите за компилиране" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, c-format msgid "Changelog for %s (%s)" msgstr "Журнал на промените в %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "Поддържани модули:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1135,7 +1153,7 @@ msgstr "" "информация и опции.\n" " Това APT има Върховни Сили.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1210,8 +1228,8 @@ msgid "%s was already not hold.\n" msgstr "Пакетът „%s“ вече е задържан.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Изчака се завършването на %s, но той не беше пуснат" @@ -1297,7 +1315,7 @@ msgstr "Неуспех при демонтирането на CD-ROM в %s, мо msgid "Disk not found." msgstr "Дискът не е намерен." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "Файлът не е намерен" @@ -1360,7 +1378,7 @@ msgstr "Командата „%s“ на скрипта за влизане се msgid "TYPE failed, server said: %s" msgstr "TYPE се провали, сървърът съобщи: %s" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "Допустимото време за свързването изтече" @@ -1368,8 +1386,8 @@ msgstr "Допустимото време за свързването изтеч msgid "Server closed the connection" msgstr "Сървърът разпадна връзката" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "Грешка при четене" @@ -1381,88 +1399,88 @@ msgstr "Отговорът препълни буфера." msgid "Protocol corruption" msgstr "Развален протокол" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "Грешка при запис" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "Неуспех при създаването на гнездо" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "" "Неуспех при свързването на гнездо за данни, допустимото време за свързване " "изтече" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "Неуспех при свързването на пасивно гнездо." -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo не успя да се добере до слушащо гнездо" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "Неуспех при свързването на гнездо" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "Неуспех при слушането на гнездото" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "Неуспех при определянето на името на гнездото" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "Неуспех при изпращането на командата PORT" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Неизвестно семейство адреси %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT се провали, сървърът съобщи: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "Времето за установяване на връзка с гнездо за данни изтече" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "Невъзможно е да се приеме свързването" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "Проблем при хеширане на файла" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Неуспех при изтеглянето на файла, сървърът съобщи „%s“" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "Времето за връзка с гнездо за данни изтече" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Неуспех при прехвърлянето на данни, сървърът съобщи: „%s“" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "Запитване" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "Неуспех при извикването на " @@ -1498,7 +1516,7 @@ msgstr "Неуспех при свързване с %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "Свързване с %s" @@ -1528,40 +1546,40 @@ msgstr "Нещо лошо се случи при намирането на IP а msgid "Unable to connect to %s:%s:" msgstr "Неуспех при свързване с %s:%s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:167 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Вътрешна грешка: Валиден подпис, но не може да се провери отпечатъка на " "ключа?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Намерен е поне един невалиден подпис." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:173 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Неуспех при изпълнение на „gpgv“ за проверка на подписа (инсталиран ли е " "gpgv?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "Неизвестна грешка при изпълнението на gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 msgid "The following signatures were invalid:\n" msgstr "Следните подписи са невалидни:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1601,59 +1619,59 @@ msgstr "HTTP сървърът няма поддръжка за прехвърл msgid "Unknown date format" msgstr "Неизвестен формат на дата" -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "Неуспех на избора" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "Допустимото време за свързване изтече" -#: methods/http.cc:855 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "Грешка при записа на изходен файл" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "Грешка при записа на файл" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "Грешка при записа на файла" -#: methods/http.cc:928 +#: methods/http.cc:927 msgid "Error reading from server. Remote end closed connection" msgstr "Грешка при четене от сървъра. Отдалеченият сървър прекъсна връзката" -#: methods/http.cc:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "Грешка при четене от сървъра" -#: methods/http.cc:1198 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "Невалидни данни на заглавната част" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "Неуспех при свързването" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "Вътрешна грешка" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "Неуспех при четенето на %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1706,7 +1724,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "Неуспех при създаването на IPC pipe към подпроцеса" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "Връзката прекъсна преждевременно" @@ -2191,11 +2209,11 @@ msgstr "Невалидна заглавна част %s на елемента н msgid "Invalid archive member header" msgstr "Невалидна заглавна част на елемента на архива" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "Архивът е твърде кратък" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "Неуспех при четенето на заглавните части на архива" @@ -2526,7 +2544,7 @@ msgstr "Невалидна операция %s" msgid "Unable to stat the mount point %s" msgstr "Неуспех при намирането на атрибутите на точка за монтиране %s" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "Неуспех при намирането на атрибутите на cdrom" @@ -2546,104 +2564,104 @@ msgstr "" msgid "Could not open lock file %s" msgstr "Неуспех при отварянето на файл за заключване %s" -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Не се използва заключване за файл за заключване %s, който е монтиран по NFS" -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "Неуспех при достъпа до заключване %s" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "Не може да се създаде списък от файлове, защото „%s“ не е директория" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "Пропускане на „%s“ в директорията „%s“, понеже не е обикновен файл" -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "Пропускане на файла „%s“ в директорията „%s“, понеже няма разширение" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" "Пропускане на файла „%s“ в директорията „%s“, понеже разширението му е грешно" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Нарушение на защитата на паметта (segmentation fault) в подпроцеса %s." -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, c-format msgid "Sub-process %s received signal %u." msgstr "Под-процесът %s получи сигнал %u." -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Подпроцесът %s върна код за грешка (%u)" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Подпроцесът %s завърши неочаквано" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "Неуспех при отварянето на файла %s" -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, c-format msgid "Could not open file descriptor %d" msgstr "Неуспех при отварянето на файлов манипулатор %d" -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "Неуспех при създаването на подпроцес IPC" -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "Неуспех при изпълнението на компресиращата програма " -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, c-format msgid "read, still have %llu to read but none left" msgstr "" "грешка при четене, все още има %llu за четене, но няма нито един останал" -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "грешка при запис, все още име %llu за запис, но не успя" -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, c-format msgid "Problem closing the file %s" msgstr "Проблем при затваряне на файла %s" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Проблем при преименуване на файла %s на %s" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, c-format msgid "Problem unlinking the file %s" msgstr "Проблем при изтриване на файла %s" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "Проблем при синхронизиране на файла" @@ -2847,7 +2865,7 @@ msgstr "Лошо форматиран ред %u в списъка с източ msgid "Type '%s' is not known on line %u in source list %s" msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен." -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2856,12 +2874,12 @@ msgstr "" "Неуспех при незабавната настройка на „%s“. За повече информация вижте " "информацията за APT::Immediate-Configure в „man 5 apt.conf“. (%d)" -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, c-format msgid "Could not configure '%s'. " msgstr "Неуспех при конфигуриране на „%s“. " -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2886,7 +2904,7 @@ msgstr "" "Пакетът %s трябва да бъде преинсталиран, но не може да се намери архив за " "него." -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2894,12 +2912,12 @@ msgstr "" "Грешка, pkgProblemResolver::Resolve генерира повреди, това може да е " "причинено от задържани пакети." -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Неуспех при коригирането на проблемите, имате задържани счупени пакети." -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3077,12 +3095,12 @@ msgstr "преименуването се провали, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "Несъответствие на контролна сума MD5" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 msgid "Hash Sum mismatch" msgstr "Несъответствие на контролната сума" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3091,16 +3109,16 @@ msgstr "" "Не може да се открие елемент „%s“ във файла Release (объркан ред в sources." "list или повреден файл)" -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Не е открита контролна сума за „%s“ във файла Release" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3109,12 +3127,12 @@ msgstr "" "Файлът със служебна информация за „%s“ е остарял (валиден до %s). Няма да се " "прилагат обновявания от това хранилище." -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Конфликт в дистрибуцията: %s (очаквана: %s, намерена: %s)" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3124,12 +3142,12 @@ msgstr "" "използват старите индексни файлове. Грешка от GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "Грешка от GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3138,7 +3156,7 @@ msgstr "" "Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва " "ръчно да оправите този пакет (поради пропусната архитектура)." -#: apt-pkg/acquire-item.cc:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3147,14 +3165,14 @@ msgstr "" "Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва " "ръчно да оправите този пакет." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Индексните файлове на пакета са повредени. Няма поле Filename: за пакет %s." -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "Несъответствие на размера" @@ -3278,22 +3296,22 @@ msgstr "Запазване на новия списък с източници\n" msgid "Source list entries for this disc are:\n" msgstr "Записите в списъка с източници за този диск са:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "Записани са %i записа.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Записани са %i записа с %i липсващи файла.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Записани са %i записа с %i несъответстващи файла\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Записани са %i записа с %i липсващи и %i несъответстващи файла\n" @@ -3390,12 +3408,12 @@ msgstr "Изпълняване на външна програма за удов msgid "Installing %s" msgstr "Инсталиране на %s" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr "Конфигуриране на %s" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr "Премахване на %s" @@ -3416,82 +3434,82 @@ msgid "Running post-installation trigger %s" msgstr "Изпълнение на тригер след инсталиране %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, c-format msgid "Directory '%s' missing" msgstr "Директорията „%s“ липсва" -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, c-format msgid "Could not open file '%s'" msgstr "Неуспех при отваряне на файла „%s“" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr "Подготвяне на %s" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr "Разпакетиране на %s" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "Подготвяне на %s за конфигуриране" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr "%s е инсталиран" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "Подготвяне за премахване на %s" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr "%s е премахнат" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "Подготовка за пълно премахване на %s" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr "%s е напълно премахнат" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Неуспех при запис в журнала, openpty() се провали (дали /dev/pts е " "монтирана?)\n" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "Изпълняване на dpkg" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "Операцията е прекъсната" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "" "Поради достигане на максималния брой доклади (MaxReports) не е записан нов " "доклад за зависимостите." #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "отлагане на настройката поради неудовлетворени зависимости" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3499,7 +3517,7 @@ msgstr "" "Доклад за зависимостите не е записан защото съобщението за грешка е породено " "от друга грешка." -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3507,7 +3525,7 @@ msgstr "" "Доклад за зависимостите не е записан защото грешката е причинена от " "недостатъчно дисково пространство" -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3515,7 +3533,7 @@ msgstr "" "Доклад за зависимостите не е записан защото грешката е причинена от " "недостатъчна оперативна памет" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/bs.po b/po/bs.po index 4f0beca48..e8c5fca0e 100644 --- a/po/bs.po +++ b/po/bs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2004-05-06 15:25+0100\n" "Last-Translator: Safir Šećerović \n" "Language-Team: Bosnian \n" @@ -91,77 +91,77 @@ msgstr "" msgid "Total space accounted for: " msgstr "" -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "" -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Paketi nisu pronađeni" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 msgid "You must give at least one search pattern" msgstr "" -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Ne mogu pronaći paket %s" -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "Datoteke paketa:" -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr " Instalirano:" -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr "" -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr "" #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr "" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "" -#: cmdline/apt-cache.cc:1730 +#: cmdline/apt-cache.cc:1760 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -255,143 +255,161 @@ msgstr "" " -c=? Pročitaj ovu konfiguracijsku datoteku\n" " -o=? Podesi odgovarajuću konfiguracijsku opciju, npr. -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +msgid "[Y/n]" +msgstr "" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" msgstr "" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" msgstr "" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "ali je %s instaliran" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "ali se %s treba instalirati" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "ali se ne može instalirati" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "ali je virtuelni paket" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "ali nije instaliran" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "ali se neće instalirati" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr " ili" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "Slijedeći NOVI paketi će biti instalirani:" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "Slijedeći paketi će biti UKLONJENI:" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 #, fuzzy msgid "The following packages have been kept back:" msgstr "Slijedeći paketi su zadržani:" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "Slijedeći paketi će biti nadograđeni:" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "" -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "" -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "" -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "" -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr "[Instalirano]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 #, fuzzy msgid " [Not candidate version]" msgstr "Verzije kandidata" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "" -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -399,186 +417,186 @@ msgid "" "is only available from another source\n" msgstr "" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "Međutim, slijedeći paketi ga zamjenjuju:" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, c-format msgid "Package '%s' has no installation candidate" msgstr "" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ali se %s treba instalirati" -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:913 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "Ispravljam zavisnosti..." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr "" -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "Ne mogu ispraviti zavisnosti" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr " Urađeno" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" -#: cmdline/apt-get.cc:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "Nezadovoljene zavisnosti. Pokušajte koristeći -f." -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 #, fuzzy msgid "WARNING: The following packages cannot be authenticated!" msgstr "Slijedeći paketi će biti nadograđeni:" -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " +#: cmdline/apt-get.cc:1108 +msgid "Install these packages without verification?" msgstr "" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" msgstr "" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 msgid "Packages need to be removed but remove is disabled." msgstr "" -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Couldn't determine free space in %s" msgstr "" -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, c-format msgid "You don't have enough free space in %s." msgstr "" -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "Da, uradi kako kažem!" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -586,47 +604,46 @@ msgid "" " ?] " msgstr "" -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "Odustani." -#: cmdline/apt-get.cc:1284 -#, fuzzy -msgid "Do you want to continue [Y/n]? " -msgstr "Da li želite nastaviti? [Y/n]" +#: cmdline/apt-get.cc:1313 +msgid "Do you want to continue?" +msgstr "Da li želite nastaviti?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "" -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "Odustajem od instalacije." -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -636,35 +653,35 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -680,15 +697,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1824 +#: cmdline/apt-get.cc:1853 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -698,7 +715,7 @@ msgid_plural "" msgstr[0] "Slijedeći NOVI paketi će biti instalirani:" msgstr[1] "Slijedeći NOVI paketi će biti instalirani:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -706,27 +723,27 @@ msgid_plural "" msgstr[0] "Slijedeći NOVI paketi će biti instalirani:" msgstr[1] "Slijedeći NOVI paketi će biti instalirani:" -#: cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1866 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1984 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:2002 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" @@ -734,85 +751,85 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "Oštećeni paketi" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "Slijedeći dodatni paketi će biti instalirani:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "Predloženi paketi:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "Preporučeni paketi:" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "ali se %s treba instalirati" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "Računam nadogradnju..." -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "Neuspješno" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "Urađeno" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, c-format msgid "" "Please use:\n" @@ -820,141 +837,141 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2604 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2644 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2649 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2839 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:3009 +#: cmdline/apt-get.cc:3040 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "" -#: cmdline/apt-get.cc:3027 +#: cmdline/apt-get.cc:3058 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:3050 +#: cmdline/apt-get.cc:3081 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:3089 +#: cmdline/apt-get.cc:3120 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:3095 +#: cmdline/apt-get.cc:3126 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "" -#: cmdline/apt-get.cc:3118 +#: cmdline/apt-get.cc:3149 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3164 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, c-format msgid "Changelog for %s (%s)" msgstr "" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "Podržani moduli:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1000,7 +1017,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1068,8 +1085,8 @@ msgid "%s was already not hold.\n" msgstr "" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" @@ -1136,7 +1153,7 @@ msgstr "Ne mogu demontirati CD-ROM na %s, moguće je da se još uvijek koristi." msgid "Disk not found." msgstr "Datoteka nije pronađena" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "Datoteka nije pronađena" @@ -1197,7 +1214,7 @@ msgstr "" msgid "TYPE failed, server said: %s" msgstr "" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "" @@ -1205,8 +1222,8 @@ msgstr "" msgid "Server closed the connection" msgstr "Server je zatvorio vezu" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "Greška pri čitanju" @@ -1219,86 +1236,86 @@ msgstr "" msgid "Protocol corruption" msgstr "Oštećenje protokola" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "Greška pri pisanju" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "" -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "" @@ -1334,7 +1351,7 @@ msgstr "" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "Povezujem se sa %s" @@ -1364,37 +1381,37 @@ msgstr "" msgid "Unable to connect to %s:%s:" msgstr "Ne mogu se povezati sa %s %s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:167 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:173 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Slijedeći dodatni paketi će biti instalirani:" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1432,59 +1449,59 @@ msgstr "" msgid "Unknown date format" msgstr "Nepoznat oblik datuma" -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "" -#: methods/http.cc:855 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:928 +#: methods/http.cc:927 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1198 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "Povezivanje neuspješno" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "Unutrašnja greška" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "Ne mogu čitati %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1533,7 +1550,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "" @@ -1939,11 +1956,11 @@ msgstr "" msgid "Invalid archive member header" msgstr "" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "Arhiva je prekratka" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "" @@ -2268,7 +2285,7 @@ msgstr "" msgid "Unable to stat the mount point %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "" @@ -2287,101 +2304,101 @@ msgstr "" msgid "Could not open lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, c-format msgid "Sub-process %s received signal %u." msgstr "" -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "Ne mogu otvoriti %s" -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "" -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, c-format msgid "read, still have %llu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Ne mogu ukloniti %s" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, c-format msgid "Problem renaming the file %s to %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, c-format msgid "Problem unlinking the file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "" @@ -2580,19 +2597,19 @@ msgstr "" msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Ne mogu otvoriti %s" -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2611,17 +2628,17 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2787,40 +2804,40 @@ msgstr "" msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 msgid "Hash Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Ne mogu otvoriti DB datoteku %s" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2828,32 +2845,32 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, 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:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "" @@ -2972,22 +2989,22 @@ msgstr "" msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3074,12 +3091,12 @@ msgstr "" msgid "Installing %s" msgstr " Instalirano:" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, fuzzy, c-format msgid "Configuring %s" msgstr "Povezujem se sa %s" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, fuzzy, c-format msgid "Removing %s" msgstr "Otvaram %s" @@ -3100,96 +3117,96 @@ msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, c-format msgid "Directory '%s' missing" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Ne mogu otvoriti %s" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, fuzzy, c-format msgid "Preparing %s" msgstr "Otvaram %s" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Otvaram %s" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, fuzzy, c-format msgid "Installed %s" msgstr " Instalirano:" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, fuzzy, c-format msgid "Removed %s" msgstr "Preporučuje" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Ne mogu ukloniti %s" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/ca.po b/po/ca.po index 1df614e6a..af812a5c6 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.6\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2012-10-19 13:30+0200\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" @@ -91,79 +91,79 @@ msgstr "Nombre total de l'espai desaprofitat: " msgid "Total space accounted for: " msgstr "Nombre total de l'espai atribuït a: " -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "El fitxer %s del paquet està desincronitzat." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "No s'han trobat paquets" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 msgid "You must give at least one search pattern" msgstr "Heu de donar com a mínim un patró de cerca" -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" "Aquesta ordre és desaconsellada. Empreu «apt-mark showauto» en el seu lloc." -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "No s'ha trobat el paquet %s" -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "Fitxers de paquets:" -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Memòria cau no sincronitzada, no es pot fer x-ref a un fitxer del paquet" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "Paquets etiquetats:" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(no trobat)" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr " Instaŀlat: " -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr " Candidat: " -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(cap)" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr " Etiqueta del paquet: " #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr " Taula de versió:" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s per a %s compilat el %s %s\n" -#: cmdline/apt-cache.cc:1730 +#: cmdline/apt-cache.cc:1760 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -294,83 +294,101 @@ msgstr "" " -c=? Llegeix aquest fitxer de configuració\n" " -o=? Estableix una opció de conf arbitrària, p. ex. -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +msgid "[Y/n]" +msgstr "[S/n]" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "[s/N]" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" msgstr "N" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "S'ha produït un error de compilació de l'expressió regular - %s" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "Els següents paquets tenen dependències sense satisfer:" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "però està instaŀlat %s" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "però s'instaŀlarà %s" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "però no és instaŀlable" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "però és un paquet virtual" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "però no està instaŀlat" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "però no serà instaŀlat" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr " o" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "S'instaŀlaran els paquets NOUS següents:" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "Es SUPRIMIRAN els paquets següents:" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 msgid "The following packages have been kept back:" msgstr "S'han mantingut els paquets següents:" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "S'actualitzaran els paquets següents:" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "Es DESACTUALITZARAN els paquets següents:" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "Es canviaran els paquets retinguts següents:" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s (per %s) " -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -378,59 +396,59 @@ msgstr "" "AVÍS: Es suprimiran els paquets essencials següents.\n" "Això NO s'ha de fer a menys que sapigueu exactament el que esteu fent!" -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu actualitzats, %lu nous a instaŀlar, " -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstaŀlats, " -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "%lu desactualitzats, " -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu a suprimir i %lu no actualitzats.\n" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu no instaŀlats o suprimits completament.\n" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "Nota: s'està seleccionant «%s» per a la tasca «%s»\n" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "Nota: s'està seleccionant «%s» per a l'expressió regular «%s»\n" -#: cmdline/apt-get.cc:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "El paquet %s és un paquet virtual proveït per:\n" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr " [Instaŀlat]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 msgid " [Not candidate version]" msgstr "[Versió no candidata]" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "Necessiteu seleccionar-ne un explícitament per a instaŀlar-lo." -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -441,160 +459,160 @@ msgstr "" "en fa referència. Això normalment vol dir que el paquet falta,\n" "s'ha tornat obsolet o només és disponible des d'una altra font.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "Tot i que els següents paquets el reemplacen:" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, c-format msgid "Package '%s' has no installation candidate" msgstr "El paquet «%s» no té candidat d'instaŀlació" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "Els paquets virtuals com «%s» no es poden suprimir\n" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "" "El paquet «%s» no està instaŀlat, així doncs no es suprimirà. Volíeu dir " "«%s»?\n" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "El paquet «%s» no està instaŀlat, així doncs no es suprimirà\n" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "Nota: s'està seleccionant «%s» en lloc de «%s»\n" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "S'està ometent %s, ja està instaŀlat i l'actualització no està establerta.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "" "S'està ometent '%s', no està instaŀlat i només es demana l'actualització.\n" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "No es possible la reinstaŀlació del paquet %s, no es pot baixar.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ja es troba en la versió més recent.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "S'ha marcat %s com instaŀlat manualment.\n" -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:913 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "Versió seleccionada «%s» (%s) per a «%s»\n" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "Versió seleccionada «%s» (%s) per a «%s» degut a «%s»\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "S'estan corregint les dependències…" -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr " ha fallat." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "No es poden corregir les dependències" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "No es pot minimitzar el joc de versions revisades" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr " Fet" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Potser voldreu executar «apt-get -f install» per a corregir-ho." -#: cmdline/apt-get.cc:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "Dependències sense satisfer. Proveu-ho emprant -f." -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVÍS: No es poden autenticar els següents paquets!" -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "S'ha descartat l'avís d'autenticació.\n" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " -msgstr "Voleu instaŀlar aquests paquets sense verificar-los [s/N]? " +#: cmdline/apt-get.cc:1108 +msgid "Install these packages without verification?" +msgstr "Voleu instaŀlar aquests paquets sense verificar-los?" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" msgstr "No s'ha pogut autenticar alguns paquets" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "Hi ha problemes i s'ha emprat -y sense --force-yes" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "S'ha produït un error intern, s'ha cridat a InstallPackages amb paquets " "trencats!" -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 msgid "Packages need to be removed but remove is disabled." msgstr "" "Els paquets necessiten ser suprimits però s'ha inhabilitat la supressió." -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 msgid "Internal error, Ordering didn't finish" msgstr "S'ha produït un error intern, l'ordenació no ha acabat" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Què estrany… les mides no coincideixen, informeu a apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "S'ha d'obtenir %sB/%sB d'arxius.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "S'ha d'obtenir %sB d'arxius.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" @@ -602,33 +620,33 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Després d'aquesta operació s'alliberaran %sB d'espai en disc.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Couldn't determine free space in %s" msgstr "No s'ha pogut determinar l'espai lliure en %s" -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, c-format msgid "You don't have enough free space in %s." msgstr "No teniu prou espai lliure en %s." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "S'ha especificat «Trivial Only» però aquesta operació no és trivial." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "Sí, fes el que et dic!" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -639,28 +657,28 @@ msgstr "" "Per continuar escriviu la frase «%s»\n" " ?] " -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "Avortat." -#: cmdline/apt-get.cc:1284 -msgid "Do you want to continue [Y/n]? " -msgstr "Voleu continuar [S/n]? " +#: cmdline/apt-get.cc:1313 +msgid "Do you want to continue?" +msgstr "Voleu continuar?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "No s'ha pogut obtenir %s %s\n" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "Alguns fitxers no s'han pogut baixar" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "Baixada completa i en mode de només baixada" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -668,19 +686,19 @@ msgstr "" "No es poden baixar alguns arxius, proveu a executar apt-get update o " "intenteu-ho amb --fix-missing." -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing i els medi intercanviables actualment no estan suportats" -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "No es poden corregir els paquets que falten." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "S'està avortant la instaŀlació." -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -694,37 +712,37 @@ msgstr[1] "" "Els següents paquets han desaparegut del vostre sistema ja\n" "que tots els fitxers s'han sobreescrit per altres paquets:" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Nota: Això ho fa el dpkg automàticament i a propòsit." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Ignora la versió objectiu «%s» no disponible del paquet «%s»" -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "S'està agafant «%s» com a paquet font en lloc de '%s'\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Descarta la versió «%s» no disponible del paquet «%s»" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr "L'ordre update no pren arguments" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Es suposa que no hauriem de suprimir coses, no es pot iniciar el supressor " "automàtic" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -742,15 +760,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 msgid "The following information may help to resolve the situation:" msgstr "La informació següent pot ajudar-vos a resoldre la situació:" -#: cmdline/apt-get.cc:1824 +#: cmdline/apt-get.cc:1853 msgid "Internal Error, AutoRemover broke stuff" msgstr "S'ha produït un error intern, el supressor automàtic ha trencat coses" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -761,7 +779,7 @@ msgstr[0] "" msgstr[1] "" "Els paquets següents s'han instaŀlat automàticament i ja no són necessaris:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -771,21 +789,21 @@ msgstr[0] "" msgstr[1] "" "Els paquets %lu es van s'instaŀlar automàticament i ja no són necessaris:\n" -#: cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1866 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Empreu «apt-get autoremove» per a suprimir-lo." msgstr[1] "Empreu «apt-get autoremove» per a suprimir-los." -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "Error intern, AllUpgrade ha trencat coses" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1984 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Potser voldreu executar «apt-get -f install» per corregir-ho:" -#: cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -793,7 +811,7 @@ msgstr "" "Dependències insatisfetes. Proveu amb «apt-get -f install» sense paquets (o " "especifiqueu una solució)." -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:2002 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" @@ -805,33 +823,33 @@ msgstr "" "«unstable» i alguns paquets requerits encara no han estat creats o bé\n" "encara no els hi han introduït des d'«Incoming»." -#: cmdline/apt-get.cc:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "Paquets trencats" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "S'instaŀlaran els següents paquets extres:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "Paquets suggerits:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "Paquets recomanats:" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "No s'ha pogut trobar el paquet %s" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "S'ha marcat %s com instaŀlat automàticament.\n" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -839,47 +857,47 @@ msgstr "" "Aquesta ordre és desaconsellada. Empreu «apt-mark auto» i «apt-mark manual» " "en el seu lloc." -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "S'està calculant l'actualització… " -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "Ha fallat" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "Fet" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 msgid "Internal error, problem resolver broke stuff" msgstr "" "S'ha produït un error intern, el solucionador de problemes ha trencat coses" -#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "No és possible blocar el directori de descàrrega" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "No es troba una font per baixar la versió «%s» de «%s»" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "S'està baixant %s %s" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 msgid "Must specify at least one package to fetch source for" msgstr "Haureu d'especificar un paquet de codi font per a baixar" -#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, c-format msgid "Unable to find a source package for %s" msgstr "No es pot trobar un paquet de fonts per a %s" -#: cmdline/apt-get.cc:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -889,7 +907,7 @@ msgstr "" "versions «%s» a:\n" "%s\n" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, c-format msgid "" "Please use:\n" @@ -901,71 +919,71 @@ msgstr "" "per obtenir les últimes actualitzacions (possiblement no publicades) del " "paquet.\n" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "S'està ometent el fitxer ja baixat «%s»\n" -#: cmdline/apt-get.cc:2604 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr "No teniu prou espai lliure en %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2644 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Es necessita baixar %sB/%sB d'arxius font.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2649 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es necessita baixar %sB d'arxius font.\n" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "Obtén el font %s\n" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "No s'ha pogut baixar alguns arxius." -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "S'està ometent el desempaquetament de les fonts que ja ho estan en %s\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "L'ordre de desempaquetar «%s» ha fallat.\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comproveu si el paquet «dpkgdev» està instaŀlat.\n" -#: cmdline/apt-get.cc:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "L'ordre de construir «%s» ha fallat.\n" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "Ha fallat el procés fill" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 msgid "Must specify at least one package to check builddeps for" msgstr "" "S'ha d'especificar un paquet per a verificar les dependències de construcció " "per a" -#: cmdline/apt-get.cc:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -974,18 +992,18 @@ msgstr "" "No hi ha informació d'arquitectura disponible per a %s. Vegeu apt.conf(5) " "APT::Architectures per a configurar-ho" -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "No es pot obtenir informació sobre les dependències de construcció per a %s" -#: cmdline/apt-get.cc:2839 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr "%s no té dependències de construcció.\n" -#: cmdline/apt-get.cc:3009 +#: cmdline/apt-get.cc:3040 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -994,7 +1012,7 @@ msgstr "" "La dependència %s en %s no es pot satisfer perquè %s no és permès als " "paquets «%s»" -#: cmdline/apt-get.cc:3027 +#: cmdline/apt-get.cc:3058 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1003,14 +1021,14 @@ msgstr "" "La dependència %s en %s no es pot satisfer perquè no es pot trobar el paquet " "%s" -#: cmdline/apt-get.cc:3050 +#: cmdline/apt-get.cc:3081 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "No s'ha pogut satisfer la dependència %s per a %s: El paquet instaŀlat %s és " "massa nou" -#: cmdline/apt-get.cc:3089 +#: cmdline/apt-get.cc:3120 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1019,7 +1037,7 @@ msgstr "" "La dependència %s per a %s no es pot satisfer perquè la versió candidata del " "paquet %s no pot satisfer els requeriments de versions" -#: cmdline/apt-get.cc:3095 +#: cmdline/apt-get.cc:3126 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1028,30 +1046,30 @@ msgstr "" "La dependència %s en %s no es pot satisfer perquè el paquet %s no té versió " "candidata" -#: cmdline/apt-get.cc:3118 +#: cmdline/apt-get.cc:3149 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "No s'ha pogut satisfer la dependència %s per a %s: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3164 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "No s'han pogut satisfer les dependències de construcció per a %s" -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "No es poden processar les dependències de construcció" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, c-format msgid "Changelog for %s (%s)" msgstr "Registre de canvis per a %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "Mòduls suportats:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1143,7 +1161,7 @@ msgstr "" "per a obtenir més informació i opcions.\n" " Aquest APT té superpoders bovins.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1218,8 +1236,8 @@ msgid "%s was already not hold.\n" msgstr "%s ja estava no retingut.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperava %s però no hi era" @@ -1286,7 +1304,7 @@ msgstr "No es pot muntar el CD-ROM en %s, potser estigui encara en ús." msgid "Disk not found." msgstr "No s'ha trobat el disc" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "Fitxer no trobat" @@ -1349,7 +1367,7 @@ msgstr "L'ordre «%s» de l'script d'accés ha fallat, el servidor ha dit: %s" msgid "TYPE failed, server said: %s" msgstr "TYPE ha fallat, el servidor ha dit: %s" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "Temps de connexió finalitzat" @@ -1357,8 +1375,8 @@ msgstr "Temps de connexió finalitzat" msgid "Server closed the connection" msgstr "El servidor ha tancat la connexió" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "Error de lectura" @@ -1370,87 +1388,87 @@ msgstr "Una resposta ha desbordat la memòria intermèdia." msgid "Protocol corruption" msgstr "Protocol corromput" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "Error d'escriptura" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "No s'ha pogut crear un sòcol" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "No s'ha pogut connectar amb el sòcol de dades, connexió finalitzada" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "No s'ha pogut connectar amb el sòcol passiu." -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "gettaddrinfo no es pot obtenir un sòcol que escolte" # abastar? huh? jm -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "No s'ha pogut vincular a un connector" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "No s'ha pogut escoltar sobre el sòcol" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "No s'ha pogut determinar el nom del sòcol" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "No es pot enviar l'ordre PORT" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "La família d'adreces %u és desconeguda (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT ha fallat, el servidor ha dit: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "S'ha esgotat el temps de connexió al sòcol de dades" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "No es pot acceptar la connexió" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "Problema escollint el fitxer" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "No és possible obtenir el fitxer, el servidor ha dit '%s'" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "S'ha esgotat el temps d'espera per al sòcol de dades" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Ha fallat la transferència de dades, el servidor ha dit '%s'" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "Consulta" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "No es pot invocar" @@ -1486,7 +1504,7 @@ msgstr "No s'ha pogut connectar amb %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "S'està connectant amb %s" @@ -1516,40 +1534,40 @@ msgstr "Ha passat alguna cosa estranya en resoldre «%s:%s» (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "No es pot connectar amb %s:%s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:167 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Error intern: La signatura és correcta, però no s'ha pogut determinar " "l'emprempta digital de la clau!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "S'ha trobat almenys una signatura invàlida." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:173 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "No s'ha pogut executar el «gpgv» per a verificar la signatura (està " "instaŀlat el gpgv?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "S'ha produït un error desconegut en executar el gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 msgid "The following signatures were invalid:\n" msgstr "Les signatures següents són invàlides:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1589,60 +1607,60 @@ msgstr "Aquest servidor HTTP té el suport d'abast trencat" msgid "Unknown date format" msgstr "Format de la data desconegut" -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "Ha fallat la selecció" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "Connexió finalitzada" -#: methods/http.cc:855 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "S'ha produït un error en escriure al fitxer de sortida" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "S'ha produït un error en escriure al fitxer" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "S'ha produït un error en escriure al fitxer" -#: methods/http.cc:928 +#: methods/http.cc:927 msgid "Error reading from server. Remote end closed connection" msgstr "" "S'ha produït un error en llegir, el servidor remot ha tancat la connexió" -#: methods/http.cc:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "S'ha produït un error en llegir des del servidor" -#: methods/http.cc:1198 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "Capçalera de dades no vàlida" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "Ha fallat la connexió" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "Error intern" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "No es pot llegir %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1695,7 +1713,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "No s'ha pogut crear el conducte IPC al subprocés" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "La connexió s'ha tancat prematurament" @@ -2177,11 +2195,11 @@ msgstr "La capçalera %s del membre de l'arxiu no és vàlida" msgid "Invalid archive member header" msgstr "La capçalera del membre de l'arxiu no és vàlida" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "L'arxiu és massa petit" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "Ha fallat la lectura de les capçaleres de l'arxiu" @@ -2511,7 +2529,7 @@ msgstr "Operació no vàlida %s" msgid "Unable to stat the mount point %s" msgstr "No es pot obtenir informació del punt de muntatge %s" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "No s'ha pogut fer «stat» del cdrom" @@ -2531,34 +2549,34 @@ msgstr "" msgid "Could not open lock file %s" msgstr "No es pot resoldre el fitxer de blocat %s" -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "No s'empren blocats per al fitxer de blocat %s de muntar nfs" -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "No s'ha pogut blocar %s" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "No es pot crear la llista de fitxers perquè «%s» no és un directori" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "S'està descartant «%s» al directori «%s» perquè no és un fitxer normal" -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" "S'està descartant «%s» al directori «%s» perquè no té extensió del nom de " "fitxer" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" @@ -2566,70 +2584,70 @@ msgstr "" "S'està descartant «%s» al directori «%s» perquè té una extensió del nom de " "fitxer invàlida" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "El sub-procés %s ha rebut una violació de segment." -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, c-format msgid "Sub-process %s received signal %u." msgstr "El sub-procés %s ha rebut un senyal %u." -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "El sub-procés %s ha retornat un codi d'error (%u)" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "El sub-procés %s ha sortit inesperadament" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "No s'ha pogut obrir el fitxer %s" -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, c-format msgid "Could not open file descriptor %d" msgstr "No s'ha pogut obrir el descriptor del fitxer %d" -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "No s'ha pogut crear el subprocés IPC" -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "No s'ha pogut executar el compressor " -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, c-format msgid "read, still have %llu to read but none left" msgstr "llegits, falten %llu per llegir, però no queda res" -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "escrits, falten %llu per escriure però no s'ha pogut" -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, c-format msgid "Problem closing the file %s" msgstr "Ha hagut un problema en tancar el fitxer %s" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Ha hagut un problema en reanomenar el fitxer %s a %s" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, c-format msgid "Problem unlinking the file %s" msgstr "Ha hagut un problema en desenllaçar el fitxer %s" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "Ha hagut un problema en sincronitzar el fitxer" @@ -2829,7 +2847,7 @@ msgstr "La línia %u és malformada en la llista de fonts %s (tipus)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2838,12 +2856,12 @@ msgstr "" "No s'ha pogut realitzar la configuració immediata de «%s». Vegeu man 5 apt." "conf, sota APT::Immediate-Configure per a més detalls. (%d)" -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, c-format msgid "Could not configure '%s'. " msgstr "No s'ha pogut configurar «%s»." -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2867,7 +2885,7 @@ msgid "" msgstr "" "El paquet %s necessita ser reinstaŀlat, però no se li pot trobar un arxiu." -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2875,13 +2893,13 @@ msgstr "" "Error, pkgProblemResolver::Resolve ha generat pauses, això pot haver estat " "causat per paquets retinguts." -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "" "No es poden corregir els problemes, teniu paquets retinguts que estan " "trencats." -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3060,12 +3078,12 @@ msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "La suma MD5 no concorda" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 msgid "Hash Sum mismatch" msgstr "La suma resum no concorda" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3074,16 +3092,16 @@ msgstr "" "No s'ha trobat l'entrada «%s» esperada, al fitxer Release (entrada errònia " "al sources.list o fitxer malformat)" -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "No s'ha trobat la suma de comprovació per a «%s» al fitxer Release" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "No hi ha cap clau pública disponible per als següents ID de clau:\n" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3092,12 +3110,12 @@ msgstr "" "El fitxer Release per a %s ha caducat (invàlid des de %s). Les " "actualitzacions per a aquest dipòsit no s'aplicaran." -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribució en conflicte: %s (s'esperava %s però s'ha obtingut %s)" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3108,12 +3126,12 @@ msgstr "" "%s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "S'ha produït un error amb el GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3123,7 +3141,7 @@ msgstr "" "significar que haureu d'arreglar aquest paquet manualment (segons " "arquitectura)." -#: apt-pkg/acquire-item.cc:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3132,7 +3150,7 @@ msgstr "" "No s'ha trobat un fitxer pel paquet %s. Això podria significar que haureu " "d'arreglar aquest paquet manualment." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3140,7 +3158,7 @@ msgstr "" "L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp " "per al paquet %s." -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "La mida no concorda" @@ -3264,22 +3282,22 @@ msgstr "S'està escrivint una nova llista de fonts\n" msgid "Source list entries for this disc are:\n" msgstr "Les entrades de la llista de fonts per a aquest disc són:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "S'han escrit %i registres.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "S'han escrit %i registres, on falten %i fitxers.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "S'han escrit %i registres, on hi ha %i fitxers no coincidents\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3378,12 +3396,12 @@ msgstr "Executa un resoledor extern" msgid "Installing %s" msgstr "S'està instaŀlant %s" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr "S'està configurant el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr "S'està suprimint el paquet %s" @@ -3404,80 +3422,80 @@ msgid "Running post-installation trigger %s" msgstr "S'està executant l'activador de postinstaŀlació %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, c-format msgid "Directory '%s' missing" msgstr "Manca el directori «%s»" -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, c-format msgid "Could not open file '%s'" msgstr "No s'ha pogut obrir el fitxer «%s»" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr "S'està preparant el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr "S'està desempaquetant %s" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "S'està preparant per a configurar el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr "S'ha instaŀlat el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "S'està preparant per a la supressió del paquet %s" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr "S'ha suprimit el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "S'està preparant per a suprimir completament el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr "S'ha suprimit completament el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "No es pot escriure el registre, ha fallat openpty() (no s'ha muntat /dev/" "pts?)\n" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "S'està executant dpkg" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "S'ha interromput l'operació abans que pogués finalitzar" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "No s'ha escrit cap informe perquè ja s'ha superat MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "S'han produït problemes de depències, es deixa sense configurar" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3485,7 +3503,7 @@ msgstr "" "No s'ha escrit cap informe perquè el missatge d'error indica que és un error " "consequent de una fallida anterior." -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3493,7 +3511,7 @@ msgstr "" "No s'ha escrit cap informe perquè el missatge d'error indica una fallida per " "disc ple" -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3501,7 +3519,7 @@ msgstr "" "No s'ha escrit cap informe perquè el missatge d'error indica una fallida per " "falta de memòria" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/cs.po b/po/cs.po index 7c81bc778..697bf0eae 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2012-07-08 13:46+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -90,77 +90,77 @@ msgstr "Celkem jalového místa: " msgid "Total space accounted for: " msgstr "Celkem přiřazeného místa: " -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "Soubor balíku %s je špatně synchronizovaný." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Nebyly nalezeny žádné balíky" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 msgid "You must give at least one search pattern" msgstr "Musíte zadat alespoň jeden vyhledávací vzor" -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "Tento příkaz je zastaralý, použijte místo něj „apt-mark showauto“." -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Nelze najít balík %s" -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "Soubory balíku:" -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Cache není synchronizovaná, nemohu se odkázat na soubor balíku" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "Vypíchnuté balíky:" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(nenalezeno)" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr " Instalovaná verze: " -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr " Kandidát: " -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(žádná)" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr " Vypíchnutý balík: " #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr " Tabulka verzí:" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s pro %s zkompilován na %s %s\n" -#: cmdline/apt-cache.cc:1730 +#: cmdline/apt-cache.cc:1760 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -286,83 +286,101 @@ msgstr "" " -c=? Načte tento konfigurační soubor\n" " -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +msgid "[Y/n]" +msgstr "[Y/n]" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "[y/N]" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" msgstr "N" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba při kompilaci regulárního výrazu - %s" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "Následující balíky mají nesplněné závislosti:" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "ale %s je nainstalován" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "ale %s se bude instalovat" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "ale nedá se nainstalovat" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "ale je to virtuální balík" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "ale není nainstalovaný" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "ale nebude se instalovat" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr " nebo" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "Následující NOVÉ balíky budou nainstalovány:" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "Následující balíky budou ODSTRANĚNY:" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 msgid "The following packages have been kept back:" msgstr "Následující balíky jsou podrženy v aktuální verzi:" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "Následující balíky budou aktualizovány:" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "Následující balíky budou DEGRADOVÁNY:" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "Následující podržené balíky budou změněny:" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s (kvůli %s) " -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -370,59 +388,59 @@ msgstr "" "VAROVÁNÍ: Následující nezbytné balíky budou odstraněny.\n" "Pokud přesně nevíte, co děláte, NEDĚLEJTE to!" -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualizováno, %lu nově instalováno, " -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "%lu přeinstalováno, " -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "%lu degradováno, " -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu k odstranění a %lu neaktualizováno.\n" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu instalováno nebo odstraněno pouze částečně.\n" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "Pozn: vybírám „%s“ pro úlohu „%s“\n" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, 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:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Balík %s je virtuální balík poskytovaný:\n" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr "[Instalovaný]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 msgid " [Not candidate version]" msgstr " [Není kandidátská verze]" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "Měli byste explicitně vybrat jeden k instalaci." -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -433,189 +451,189 @@ msgstr "" "To může znamenat že balík chybí, byl zastarán, nebo je dostupný\n" "pouze z jiného zdroje\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "Nicméně následující balíky jej nahrazují:" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, c-format msgid "Package '%s' has no installation candidate" msgstr "Balík „%s“ nemá kandidáta pro instalaci" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "Virtuální balíky jako „%s“ nemohou být odstraněny\n" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "" "Balík „%s“ není nainstalován, nelze tedy odstranit. Mysleli jste „%s“?\n" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "Balík „%s“ není nainstalován, nelze tedy odstranit\n" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "Pozn: Vybírám „%s“ místo „%s“\n" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Přeskakuji %s, protože je již nainstalován.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "" "Přeskakuji %s, protože není nainstalován a vyžadovány jsou pouze " "aktualizace.\n" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Přeinstalace %s není možná, protože nelze stáhnout.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "%s je již nejnovější verze.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s nastaven jako instalovaný ručně.\n" -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:913 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "Vybraná verze „%s“ (%s) pro „%s“\n" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "Vybraná verze „%s“ (%s) pro „%s“ kvůli „%s“\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "Opravuji závislosti…" -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr " selhalo." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "Nelze opravit závislosti" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "Nelze minimalizovat sadu pro aktualizaci" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr " Hotovo" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Pro opravení můžete spustit „apt-get -f install“." -#: cmdline/apt-get.cc:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "Nesplněné závislosti. Zkuste použít -f." -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 msgid "WARNING: The following packages cannot be authenticated!" msgstr "VAROVÁNÍ: Následující balíky nemohou být autentizovány!" -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "Autentizační varování potlačeno.\n" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " -msgstr "Instalovat tyto balíky bez ověření [y/N]? " +#: cmdline/apt-get.cc:1108 +msgid "Install these packages without verification?" +msgstr "Instalovat tyto balíky bez ověření?" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" msgstr "Některé balíky nemohly být autentizovány" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "Vyskytly se problémy a -y bylo použito bez --force-yes" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Vnitřní chyba, InstallPackages byl zavolán s porušenými balíky!" -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 msgid "Packages need to be removed but remove is disabled." msgstr "Balík je potřeba odstranit ale funkce Odstranit je vypnuta." -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 msgid "Internal error, Ordering didn't finish" msgstr "Vnitřní chyba, třídění nedoběhlo do konce" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Jak podivné… velikosti nesouhlasí, ohlaste to na apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Potřebuji stáhnout %sB/%sB archivů.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Potřebuji stáhnout %sB archivů.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Po této operaci bude na disku použito dalších %sB.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, c-format 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:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nelze určit volné místo v %s" -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, c-format msgid "You don't have enough free space in %s." msgstr "V %s nemáte dostatek volného místa." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Udáno „pouze triviální“, ovšem toto není triviální operace." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "Ano, udělej to tak, jak říkám!" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -626,28 +644,28 @@ msgstr "" "Pro pokračování opište frázi „%s“\n" " ?] " -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "Přerušeno." -#: cmdline/apt-get.cc:1284 -msgid "Do you want to continue [Y/n]? " -msgstr "Chcete pokračovat [Y/n]? " +#: cmdline/apt-get.cc:1313 +msgid "Do you want to continue?" +msgstr "Chcete pokračovat?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Selhalo stažení %s %s\n" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "Některé soubory nemohly být staženy" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "Stahování dokončeno v režimu pouze stáhnout" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -655,19 +673,19 @@ msgstr "" "Nelze stáhnout některé archivy. Možná spusťte apt-get update nebo zkuste --" "fix-missing?" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing a výměna média nejsou momentálně podporovány" -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "Nelze opravit chybějící balíky." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "Přerušuji instalaci." -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -684,35 +702,35 @@ msgstr[2] "" "Následující balíky z tohoto systému zmizely, protože\n" "všechny jejich soubory byly přepsány jinými balíky:" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Poznámka: Toto má svůj důvod a děje se automaticky v dpkg." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Ignoruje se nedostupné vydání „%s“ balíku „%s“" -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Vybírám „%s“ jako zdrojový balík místo „%s“\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Ignoruje se nedostupná verze „%s“ balíku „%s“" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr "Příkaz update neakceptuje žádné argumenty" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 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:1817 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -730,15 +748,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 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:1824 +#: cmdline/apt-get.cc:1853 msgid "Internal Error, AutoRemover broke stuff" msgstr "Vnitřní chyba, AutoRemover pokazil věci" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -750,7 +768,7 @@ msgstr[1] "" msgstr[2] "" "Následující balíky byly nainstalovány automaticky a již nejsou potřeba:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -759,22 +777,22 @@ msgstr[0] "%lu balík byl nainstalován automaticky a již není potřeba.\n" msgstr[1] "%lu balíky byly nainstalovány automaticky a již nejsou potřeba.\n" msgstr[2] "%lu balíků bylo nainstalováno automaticky a již nejsou potřeba.\n" -#: cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1866 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Pro jeho odstranění použijte „apt-get autoremove“." msgstr[1] "Pro jejich odstranění použijte „apt-get autoremove“." msgstr[2] "Pro jejich odstranění použijte „apt-get autoremove“." -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "Vnitřní chyba, AllUpgrade pokazil věci" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1984 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:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -782,7 +800,7 @@ msgstr "" "Nesplněné závislosti. Zkuste spustit „apt-get -f install“ bez balíků (nebo " "navrhněte řešení)." -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:2002 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" @@ -793,33 +811,33 @@ 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:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "Poškozené balíky" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "Následující extra balíky budou instalovány:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "Navrhované balíky:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "Doporučované balíky:" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "Nelze najít balík %s" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s nastaven jako instalovaný automaticky.\n" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -827,46 +845,46 @@ msgstr "" "Tento příkaz je zastaralý, použijte místo něj „apt-mark auto“ a „apt-mark " "manual“." -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "Propočítávám aktualizaci… " -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "Selhalo" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "Hotovo" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 msgid "Internal error, problem resolver broke stuff" msgstr "Vnitřní chyba, řešitel problémů pokazil věci" -#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "Nelze zamknout adresář pro stahování" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Nelze najít zdroj pro stažení verze „%s“ balíku „%s“" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "Stahuje se %s %s" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 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:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, c-format msgid "Unable to find a source package for %s" msgstr "Nelze najít zdrojový balík pro %s" -#: cmdline/apt-get.cc:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -875,7 +893,7 @@ msgstr "" "INFO: Balík „%s“ je spravován v systému pro správu verzí „%s“ na:\n" "%s\n" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, c-format msgid "" "Please use:\n" @@ -886,70 +904,70 @@ msgstr "" "použijte:\n" "bzr branch %s\n" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Přeskakuji dříve stažený soubor „%s“\n" -#: cmdline/apt-get.cc:2604 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr "Na %s nemáte dostatek volného místa" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2644 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potřebuji stáhnout %sB/%sB zdrojových archivů.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2649 #, 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:2624 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "Stažení zdroje %s\n" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "Stažení některých archivů selhalo." -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, 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:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Příkaz pro rozbalení „%s“ selhal.\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, 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:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "Příkaz pro sestavení „%s“ selhal.\n" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "Synovský proces selhal" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 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:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -958,17 +976,17 @@ msgstr "" "O architektuře %s nejsou známy žádné informace. Pro nastavení si přečtěte " "část APT::Architectures v manuálové stránce apt.conf(5)" -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nelze získat závislosti pro sestavení %s" -#: cmdline/apt-get.cc:2839 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žádné závislosti pro sestavení.\n" -#: cmdline/apt-get.cc:3009 +#: cmdline/apt-get.cc:3040 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -977,20 +995,20 @@ msgstr "" "závislost %s pro %s nemůže být splněna, protože %s není na balících „%s“ " "dovolena" -#: cmdline/apt-get.cc:3027 +#: cmdline/apt-get.cc:3058 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "závislost %s pro %s nemůže být splněna, protože balík %s nebyl nalezen" -#: cmdline/apt-get.cc:3050 +#: cmdline/apt-get.cc:3081 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Selhalo splnění závislosti %s pro %s: Instalovaný balík %s je příliš nový" -#: cmdline/apt-get.cc:3089 +#: cmdline/apt-get.cc:3120 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -999,7 +1017,7 @@ msgstr "" "závislost %s pro %s nemůže být splněna, protože kandidátská verze balíku %s " "nesplňuje požadavek na verzi" -#: cmdline/apt-get.cc:3095 +#: cmdline/apt-get.cc:3126 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1008,30 +1026,30 @@ msgstr "" "závislost %s pro %s nemůže být splněna, protože balík %s nemá kandidátskou " "verzi" -#: cmdline/apt-get.cc:3118 +#: cmdline/apt-get.cc:3149 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Selhalo splnění závislosti %s pro %s: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3164 #, 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:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "Chyba při zpracování závislostí pro sestavení" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, c-format msgid "Changelog for %s (%s)" msgstr "Seznam změn %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "Podporované moduly:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1118,7 +1136,7 @@ msgstr "" "a apt.conf(5).\n" " Tato APT má schopnosti svaté krávy.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1193,8 +1211,8 @@ msgid "%s was already not hold.\n" msgstr "%s již nebyl držen v aktuální verzi.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Čekal jsem na %s, ale nebyl tam" @@ -1279,7 +1297,7 @@ msgstr "Nelze odpojit CD-ROM v %s - možná se stále používá." msgid "Disk not found." msgstr "Disk nebyl nalezen." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "Soubor nebyl nalezen" @@ -1342,7 +1360,7 @@ msgstr "Příkaz „%s“ přihlašovacího skriptu selhal, server řekl: %s" msgid "TYPE failed, server said: %s" msgstr "TYPE selhal, server řekl: %s" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "Čas spojení vypršel" @@ -1350,8 +1368,8 @@ msgstr "Čas spojení vypršel" msgid "Server closed the connection" msgstr "Server uzavřel spojení" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "Chyba čtení" @@ -1363,86 +1381,86 @@ msgstr "Odpověď přeplnila buffer." msgid "Protocol corruption" msgstr "Porušení protokolu" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "Chyba zápisu" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "Nelze vytvořit socket" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "Nelze připojit datový socket, čas spojení vypršel" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "Nelze připojit pasivní socket." -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo nezískal naslouchající socket" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "Nelze navázat socket" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "Nelze naslouchat na socketu" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "Nelze určit jméno socketu" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "Nelze odeslat příkaz PORT" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Neznámá rodina adres %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT selhal, server řekl: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "Spojení datového socketu vypršelo" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "Nelze přijmout spojení" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "Problém s kontrolním součtem souboru" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Nelze stáhnout soubor, server řekl „%s“" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "Datový socket vypršel" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Přenos dat selhal, server řekl „%s“" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "Dotaz" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "Nelze vyvolat " @@ -1478,7 +1496,7 @@ msgstr "Nelze se připojit k %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "Připojuji se k %s" @@ -1508,36 +1526,36 @@ msgstr "Něco hodně ošklivého se přihodilo při překladu „%s:%s“ (%i - msgid "Unable to connect to %s:%s:" msgstr "Nelze se připojit k %s:%s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:167 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:170 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Byl zaznamenán nejméně jeden neplatný podpis. " -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:173 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Nelze spustit „gpgv“ pro ověření podpisu (je gpgv nainstalováno?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "Neznámá chyba při spouštění gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 msgid "The following signatures were invalid:\n" msgstr "Následující podpisy jsou neplatné:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1577,59 +1595,59 @@ msgstr "Tento HTTP server má porouchanou podporu rozsahů" msgid "Unknown date format" msgstr "Neznámý formát data" -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "Výběr selhal" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "Čas spojení vypršel" -#: methods/http.cc:855 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "Chyba zápisu do výstupního souboru" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:928 +#: methods/http.cc:927 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení" -#: methods/http.cc:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "Chyba čtení ze serveru" -#: methods/http.cc:1198 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "Špatné datové záhlaví" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "Spojení selhalo" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "Vnitřní chyba" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "Nelze číst %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1682,7 +1700,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "Selhalo vytvoření meziprocesové roury k podprocesu" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "Spojení bylo předčasně ukončeno" @@ -2156,11 +2174,11 @@ msgstr "Neplatné záhlaví prvku archivu %s" msgid "Invalid archive member header" msgstr "Neplatné záhlaví prvku archivu" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "Archiv je příliš krátký" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "Chyba při čtení hlaviček archivu" @@ -2489,7 +2507,7 @@ msgstr "Neplatná operace %s" msgid "Unable to stat the mount point %s" msgstr "Nelze vyhodnotit přípojný bod %s" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "Nezdařilo se vyhodnotit cdrom" @@ -2508,101 +2526,101 @@ msgstr "Nepoužívám zamykání pro zámkový soubor %s, který je pouze pro č msgid "Could not open lock file %s" msgstr "Nešlo otevřít zámkový soubor %s" -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Nepoužívám zamykání pro zámkový soubor %s připojený přes nfs" -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "Nelze získat zámek %s" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "Seznam souborů nelze vytvořit, jelikož „%s“ není adresář" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "Ignoruji „%s“ v adresáři „%s“, jelikož to není obyčejný soubor" -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "Ignoruji soubor „%s“ v adresáři „%s“, jelikož nemá příponu" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "Ignoruji soubor „%s“ v adresáři „%s“, jelikož má neplatnou příponu" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Podproces %s obdržel chybu segmentace." -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, c-format msgid "Sub-process %s received signal %u." msgstr "Podproces %s obdržel signál %u." -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Podproces %s vrátil chybový kód (%u)" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Podproces %s neočekávaně skončil" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "Nelze otevřít soubor %s" -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, c-format msgid "Could not open file descriptor %d" msgstr "Nelze otevřít popisovač souboru %d" -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "Nelze vytvořit podproces IPC" -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "Nezdařilo se spustit kompresor " -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, c-format msgid "read, still have %llu to read but none left" msgstr "čtení, stále mám k přečtení %llu, ale už nic nezbývá" -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "zápis, stále mám %llu k zápisu, ale nejde to" -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, c-format msgid "Problem closing the file %s" msgstr "Problém při zavírání souboru %s" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problém při přejmenování souboru %s na %s" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, c-format msgid "Problem unlinking the file %s" msgstr "Problém při odstraňování souboru %s" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "Problém při synchronizování souboru" @@ -2799,7 +2817,7 @@ msgstr "Zkomolený řádek %u v seznamu zdrojů %s (typ)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ „%s“ na řádce %u v seznamu zdrojů %s není známý" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2808,12 +2826,12 @@ msgstr "" "Nelze spustit okamžitou konfiguraci balíku „%s“. Podrobnosti naleznete v man " "5 apt.conf v části APT::Immediate-Configure. (%d)" -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, c-format msgid "Could not configure '%s'. " msgstr "Nelze nastavit „%s“." -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2835,7 +2853,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Balík %s je potřeba přeinstalovat, ale nemohu pro něj nalézt archiv." -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2843,11 +2861,11 @@ msgstr "" "Chyba, pkgProblemResolver::Resolve vytváří poruchy, to může být způsobeno " "podrženými balíky." -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "Nelze opravit problémy, některé balíky držíte v porouchaném stavu." -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3018,12 +3036,12 @@ msgstr "přejmenování selhalo, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "Neshoda MD5 součtů" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 msgid "Hash Sum mismatch" msgstr "Neshoda kontrolních součtů" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3032,16 +3050,16 @@ msgstr "" "V souboru Release nelze najít očekávanou položku „%s“ (chybný sources.list " "nebo porušený soubor)" -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "V souboru Release nelze najít kontrolní součet „%s“" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "K následujícím ID klíčů není dostupný veřejný klíč:\n" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3050,12 +3068,12 @@ msgstr "" "Soubor Release pro %s již expiroval (neplatný od %s). Aktualizace z tohoto " "repositáře se nepoužijí." -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konfliktní distribuce: %s (očekáváno %s, obdrženo %s)" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3065,12 +3083,12 @@ msgstr "" "se použijí předchozí indexové soubory. Chyba GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "Chyba GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3079,7 +3097,7 @@ msgstr "" "Nebylo možné nalézt soubor s balíkem %s. To by mohlo znamenat, že tento " "balík je třeba opravit ručně (kvůli chybějící architektuře)" -#: apt-pkg/acquire-item.cc:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3088,14 +3106,14 @@ msgstr "" "Nebylo možné nalézt soubor s balíkem %s. Asi budete muset tento balík " "opravit ručně." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Indexové soubory balíku jsou narušeny. Chybí pole Filename: u balíku %s." -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "Velikosti nesouhlasí" @@ -3219,22 +3237,22 @@ msgstr "Zapisuji nový seznam balíků\n" msgid "Source list entries for this disc are:\n" msgstr "Seznamy zdrojů na tomto disku jsou:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "Zapsáno %i záznamů.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Zapsáno %i záznamů s chybějícími soubory (%i).\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Zapsáno %i záznamů s nesouhlasícími soubory (%i).\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Zapsáno %i záznamů s chybějícími (%i) a nesouhlasícími (%i) soubory.\n" @@ -3323,12 +3341,12 @@ msgstr "Spuštění externího řešitele" msgid "Installing %s" msgstr "Instaluji %s" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr "Nastavuji %s" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr "Odstraňuji %s" @@ -3349,79 +3367,79 @@ msgid "Running post-installation trigger %s" msgstr "Spouštím poinstalační spouštěč %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, c-format msgid "Directory '%s' missing" msgstr "Adresář „%s“ chybí" -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, c-format msgid "Could not open file '%s'" msgstr "Nelze otevřít soubor „%s“" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr "Připravuji %s" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr "Rozbaluji %s" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "Připravuji nastavení %s" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr "Nainstalován %s" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "Připravuji odstranění %s" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr "Odstraněn %s" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "Připravuji úplné odstranění %s" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr "Kompletně odstraněn %s" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "Nelze zapsat log, volání openpty() selhalo (/dev/pts není připojen?)\n" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "Spouštím dpkg" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "Operace byla přerušena dříve, než mohla skončit" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "" "Žádné apport hlášení nebylo vytvořeno, protože již byl dosažen MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "problémy se závislostmi - ponechávám nezkonfigurované" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3429,7 +3447,7 @@ msgstr "" "Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že " "se jedná o chybu způsobenou předchozí chybou." -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3437,7 +3455,7 @@ msgstr "" "Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že " "je chyba způsobena zcela zaplněným diskem." -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3445,7 +3463,7 @@ msgstr "" "Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že " "je chyba způsobena zcela zaplněnou pamětí." -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/cy.po b/po/cy.po index ad7023047..6897c5f8b 100644 --- a/po/cy.po +++ b/po/cy.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries \n" "Language-Team: Welsh \n" @@ -104,82 +104,82 @@ msgstr "Cyfanswm gofod Slac: " msgid "Total space accounted for: " msgstr "Cyfanswm Gofod Cyfrifwyd: " -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Canfuwyd dim pecyn" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 #, fuzzy msgid "You must give at least one search pattern" msgstr "Rhaid i chi ddarparu un patrwm yn union" -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Ni ellir lleoli'r pecyn %s" -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 #, fuzzy msgid "Package files:" msgstr "Ffeiliau Pecynnau:" -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Nid yw'r storfa yn gydamserol, ni ellir croesgyfeirio ffeil pecym" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1577 #, fuzzy msgid "Pinned packages:" msgstr "Pecynnau wedi eu Pinio:" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(heb ganfod)" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr " Wedi Sefydlu: " -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr " Ymgeisydd: " -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(dim)" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 #, fuzzy msgid " Package pin: " msgstr " Pin Pecyn: " #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 #, fuzzy msgid " Version table:" msgstr " Tabl Fersiynnau:" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n" -#: cmdline/apt-cache.cc:1730 +#: cmdline/apt-cache.cc:1760 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -314,86 +314,104 @@ msgstr "" " -c=? Darllen y ffeil cyfluniad\n" " -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +msgid "[Y/n]" +msgstr "" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" msgstr "I" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" msgstr "" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Gwall crynhoi patrwm - %s" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "ond mae %s wedi ei sefydlu" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "ond ni ellir ei sefydlu" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "ond mae'n becyn rhithwir" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "ond nid yw wedi ei sefydlu" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "ond nid yw'n mynd i gael ei sefydlu" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr " neu" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "Caiff y pecynnau canlynol eu TYNNU:" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 #, fuzzy msgid "The following packages have been kept back:" msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 #, fuzzy msgid "The following packages will be upgraded:" msgstr "Caiff y pecynnau canlynol eu uwchraddio" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 #, fuzzy msgid "The following packages will be DOWNGRADED:" msgstr "Caiff y pecynnau canlynol eu ISRADDIO" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s (oherwydd %s) " -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@ -403,61 +421,61 @@ msgstr "" "NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n" "ei wneud!" -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, " -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "%lu wedi ailsefydlu, " -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "%lu wedi eu israddio, " -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, fuzzy, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, fuzzy, 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:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Mae'r pecyn %s yn becyn rhithwir a ddarparir gan:\n" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr " [Sefydliwyd]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 #, fuzzy msgid " [Not candidate version]" msgstr "Fersiynau Posib" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "Dylech ddewis un yn benodol i'w sefydlu." # FIXME: punctuation -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, fuzzy, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -469,189 +487,189 @@ msgstr "" "gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n" "ffeil sources.list.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, fuzzy, c-format msgid "Package '%s' has no installation candidate" msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, fuzzy, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "Sylwer, yn dewis %s yn hytrach na %s\n" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, fuzzy, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Nid yw ailsefydlu %s yn bosib, gan ni ellir ei lawrlwytho.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:913 #, fuzzy, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, fuzzy, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "Yn cywiro dibyniaethau..." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr " wedi methu." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "Ni ellir cywiro dibyniaethau" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "Ni ellir bychanu y set uwchraddio" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr " Wedi Gorffen" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 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." -#: cmdline/apt-get.cc:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f." -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 #, fuzzy msgid "WARNING: The following packages cannot be authenticated!" msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " +#: cmdline/apt-get.cc:1108 +msgid "Install these packages without verification?" msgstr "" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 #, fuzzy msgid "Some packages could not be authenticated" msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "Mae problemau a defnyddwyd -y heb --force-yes" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 #, fuzzy msgid "Packages need to be removed but remove is disabled." msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi." -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 #, fuzzy msgid "Internal error, Ordering didn't finish" msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Mae angen cyrchu %sB o archifau.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, fuzzy, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, fuzzy, c-format 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:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Does dim digon o le rhydd yn %s gennych" -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, c-format msgid "You don't have enough free space in %s." msgstr "Does dim digon o le rhydd gennych yn %s." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Penodwyd Syml Yn Unig ond nid yw hyn yn weithred syml." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "Ie, gwna fel rydw i'n dweud!" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -662,29 +680,28 @@ msgstr "" "Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n" " ?]" -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "Erthylu." -#: cmdline/apt-get.cc:1284 -#, fuzzy -msgid "Do you want to continue [Y/n]? " -msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] " +#: cmdline/apt-get.cc:1313 +msgid "Do you want to continue?" +msgstr "Ydych chi eisiau mynd ymlaen?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Methwyd cyrchu %s %s\n" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "Methodd rhai ffeiliau lawrlwytho" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -692,20 +709,20 @@ msgstr "" "Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu " "geidio defnyddio --fix-missing?" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "Ni chynhelir cyfnewid cyfrwng efo --fix-missing ar hyn o bryd" -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "Ni ellir cywiro pecynnau ar goll." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 #, fuzzy msgid "Aborting install." msgstr "Yn Erthylu'r Sefydliad." -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -715,35 +732,35 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -759,16 +776,16 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 msgid "The following information may help to resolve the situation:" msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:" -#: cmdline/apt-get.cc:1824 +#: cmdline/apt-get.cc:1853 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -778,7 +795,7 @@ msgid_plural "" msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -786,23 +803,23 @@ msgid_plural "" msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -#: cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1866 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 #, fuzzy msgid "Internal error, AllUpgrade broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1984 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:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -811,7 +828,7 @@ msgstr "" "pecyn (neu penodwch ddatrys)" # FIXME: needs commas -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:2002 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" @@ -823,87 +840,87 @@ msgstr "" "ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n" "heb gael eu symud allan o Incoming." -#: cmdline/apt-get.cc:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "Pecynnau wedi torri" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "Pecynnau a awgrymmir:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "Pecynnau a argymhellir:" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 #, fuzzy msgid "Calculating upgrade... " msgstr "Yn Cyfrifo'r Uwchraddiad... " -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "Methwyd" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "Wedi Gorffen" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 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:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, c-format msgid "Unable to find a source package for %s" msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s" -#: cmdline/apt-get.cc:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, c-format msgid "" "Please use:\n" @@ -911,86 +928,86 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, 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:2604 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr "Does dim digon o le rhydd yn %s gennych" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2644 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2649 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2655 #, fuzzy, c-format msgid "Fetch source %s\n" msgstr "Cyrchu Ffynhonell %s\n" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "Methwyd cyrchu rhai archifau." -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, 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:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Methodd y gorchymyn dadbacio '%s'.\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "Methodd y gorchymyn adeiladu '%s'.\n" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "Methodd proses plentyn" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 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:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, 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:2839 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr "Nid oes dibyniaethau adeiladu gan %s.\n" -#: cmdline/apt-get.cc:3009 +#: cmdline/apt-get.cc:3040 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -999,7 +1016,7 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:3027 +#: cmdline/apt-get.cc:3058 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1008,14 +1025,14 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:3050 +#: cmdline/apt-get.cc:3081 #, 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:3089 +#: cmdline/apt-get.cc:3120 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1024,7 +1041,7 @@ 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:3095 +#: cmdline/apt-get.cc:3126 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1033,32 +1050,32 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:3118 +#: cmdline/apt-get.cc:3149 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Methwyd bodloni dibyniaeth %s am %s: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3164 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "Methwyd prosesu dibyniaethau adeiladu" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Yn cysylltu i %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 #, fuzzy msgid "Supported modules:" msgstr "Modylau a Gynhelir:" # FIXME: split -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1145,7 +1162,7 @@ msgstr "" "\n" " Mae gan yr APT hwn bŵerau buwch hudol.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1216,8 +1233,8 @@ msgid "%s was already not hold.\n" msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, fuzzy, c-format msgid "Waited for %s but it wasn't there" msgstr "Arhoswyd am %s ond nid oedd e yna" @@ -1288,7 +1305,7 @@ msgstr "" msgid "Disk not found." msgstr "Ffeil heb ei ganfod" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "Ffeil heb ei ganfod" @@ -1352,7 +1369,7 @@ msgstr "Methodd y gorchymyn sgript mewngofnodi '%s'; meddai'r gweinydd: %s" msgid "TYPE failed, server said: %s" msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "Goramser cysylltu" @@ -1360,8 +1377,8 @@ msgstr "Goramser cysylltu" msgid "Server closed the connection" msgstr "Caeodd y gweinydd y cysylltiad" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "Gwall darllen" @@ -1373,89 +1390,89 @@ msgstr "Gorlifodd ateb y byffer." msgid "Protocol corruption" msgstr "Llygr protocol" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "Gwall ysgrifennu" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "Methwyd creu soced" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 #, fuzzy msgid "Could not connect passive socket." msgstr "Methwyd cysylltu soced goddefol" # FIXME -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "Methodd getaddrinfo gael soced gwrando" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "Methwyd rhwymo soced" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "Methwyd gwrando ar y soced" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "Methwyd canfod enw'r soced" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "Methwyd danfod gorchymyn PORT" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Teulu cyfeiriad anhysbys %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "Goramserodd cysylltiad y soced data" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "Methwyd derbyn cysylltiad" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "Problem wrth stwnshio ffeil" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "Goramserodd soced data" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Methodd trosgludiad data; meddai'r gweinydd '%s'" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "Ymholiad" # FIXME -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "Methwyd gweithredu " @@ -1491,7 +1508,7 @@ msgstr "Methwyd cysylltu i %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "Yn cysylltu i %s" @@ -1521,37 +1538,37 @@ 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:166 +#: methods/gpgv.cc:167 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:173 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1593,61 +1610,61 @@ msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri" msgid "Unknown date format" msgstr "Fformat dyddiad anhysbys" -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "Methwyd dewis" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "Goramserodd y cysylltiad" -#: methods/http.cc:855 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "Gwall wrth ysgrifennu i ffeil allbwn" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "Gwall wrth ysgrifennu at ffeil" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "Gwall wrth ysgrifennu at y ffeil" -#: methods/http.cc:928 +#: methods/http.cc:927 #, 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:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "Gwall wrth ddarllen o'r gweinydd" -#: methods/http.cc:1198 +#: methods/http.cc:1197 #, fuzzy msgid "Bad header data" msgstr "Data pennawd gwael" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "Methodd y cysylltiad" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "Gwall mewnol" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "Ni ellir darllen %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1696,7 +1713,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "Methwyd creu pibell cyfathrebu at isbroses" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "Caewyd y cysylltiad yn gynnar" @@ -2185,11 +2202,11 @@ msgstr "Pennawd aelod archif annilys" msgid "Invalid archive member header" msgstr "Pennawd aelod archif annilys" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "Mae'r archif yn rhy fyr" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "Methwyd darllen pennawdau'r archif" @@ -2525,7 +2542,7 @@ msgstr "Gweithred annilys %s" msgid "Unable to stat the mount point %s" msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "Methwyd gwneud stat() o'r CD-ROM" @@ -2544,103 +2561,103 @@ msgstr "Ddim yn cloi'r ffeil clo darllen-yn-unig %s" msgid "Could not open lock file %s" msgstr "Methwyd agor y ffeil clo %s" -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Ddim yn cloi'r ffeil clo ar NFS %s" -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "Methwyd cael y clo %s" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Derbyniodd is-broses %s wall segmentu." -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Derbyniodd is-broses %s wall segmentu." -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Dychwelodd is-broses %s gôd gwall (%u)" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Gorffenodd is-broses %s yn annisgwyl" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "Methwyd agor ffeil %s" -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "Methwyd agor pibell ar gyfer %s" -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "Methwyd creu isbroses IPC" -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "Methwyd gweithredu cywasgydd " # FIXME -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "o hyd %lu i ddarllen ond dim ar ôl" # FIXME -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "o hyd %lu i ysgrifennu ond methwyd" -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Gwall wrth gau'r ffeil" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Gwall wrth gyfamseru'r ffeil" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Gwall wrth dadgysylltu'r ffeil" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "Gwall wrth gyfamseru'r ffeil" @@ -2849,20 +2866,20 @@ msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Methwyd agor ffeil %s" # FIXME: %s may have an arbirrary length -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2886,7 +2903,7 @@ msgstr "" "Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar " "ei gyfer." -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2894,12 +2911,12 @@ msgstr "" "Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi " "ei achosi gan pecynnau wedi eu dal." -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig." -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3079,13 +3096,13 @@ msgstr "methwyd ailenwi, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 #, fuzzy msgid "Hash Sum mismatch" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3093,28 +3110,28 @@ msgid "" msgstr "" # FIXME: number? -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3122,13 +3139,13 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "" # FIXME: case -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3137,7 +3154,7 @@ msgstr "" "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi " "drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)" -#: apt-pkg/acquire-item.cc:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3146,14 +3163,14 @@ msgstr "" "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi " "drwsio'r pecyn hyn a law." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s." -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "Camgyfatebiaeth maint" @@ -3275,22 +3292,22 @@ msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3377,12 +3394,12 @@ msgstr "" msgid "Installing %s" msgstr " Wedi Sefydlu: " -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, fuzzy, c-format msgid "Configuring %s" msgstr "Yn cysylltu i %s" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, fuzzy, c-format msgid "Removing %s" msgstr "Yn agor %s" @@ -3403,96 +3420,96 @@ msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Methwyd agor ffeil %s" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, fuzzy, c-format msgid "Preparing %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, fuzzy, c-format msgid "Preparing to configure %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, fuzzy, c-format msgid "Installed %s" msgstr " Wedi Sefydlu: " -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, fuzzy, c-format msgid "Removed %s" msgstr "Argymell" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, fuzzy, c-format msgid "Preparing to completely remove %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Methwyd dileu %s" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/da.po b/po/da.po index 7a71876aa..3c65d2f4c 100644 --- a/po/da.po +++ b/po/da.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2012-07-03 23:51+0200\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" @@ -93,80 +93,80 @@ msgstr "Total »Slack«-plads: " msgid "Total space accounted for: " msgstr "Total plads, der kan gøres rede for: " -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "Pakkefilen %s er ude af trit." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Fandt ingen pakker" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 msgid "You must give at least one search pattern" msgstr "Du skal angive mindst ét søgemønster" -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" "Denne kommando er forældet. Brug venligst »apt-mark showauto« i stedet for." -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Kunne ikke lokalisere pakken %s" # Overskriften til apt-cache policy, # forkorter "Package" væk. CH -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "Pakkefiler:" -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Mellemlageret er ude af trit, kan ikke krydsreferere en pakkefil" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "»Pinned« pakker:" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(ikke fundet)" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr " Installeret: " -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr " Kandidat: " -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(ingen)" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr " Pakke-pin: " #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr " Versionstabel:" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s for %s kompileret på %s %s\n" -#: cmdline/apt-cache.cc:1730 +#: cmdline/apt-cache.cc:1760 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -294,83 +294,101 @@ msgstr "" " -c=? Læs denne opsætningsfil\n" " -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +msgid "[Y/n]" +msgstr "[J/n]" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "[j/N]" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" msgstr "N" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Fejl ved tolkning af regulært udtryk - %s" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "Følgende pakker har uopfyldte afhængigheder:" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "men %s er installeret" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "men %s forventes installeret" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "men den kan ikke installeres" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "men det er en virtuel pakke" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "men den er ikke installeret" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "men den bliver ikke installeret" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr " eller" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "Følgende NYE pakker vil blive installeret:" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "Følgende pakker vil blive AFINSTALLERET:" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 msgid "The following packages have been kept back:" msgstr "Følgende pakker er blevet holdt tilbage:" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "Følgende pakker vil blive opgraderet:" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "Følgende pakker vil blive NEDGRADERET:" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "Følgende tilbageholdte pakker vil blive ændret:" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s (grundet %s) " -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -378,59 +396,59 @@ msgstr "" "ADVARSEL: Følgende essentielle pakker vil blive afinstalleret\n" "Dette bør IKKE ske medmindre du er helt klar over, hvad du laver!" -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu opgraderes, %lu nyinstalleres, " -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "%lu geninstalleres, " -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderes, " -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu afinstalleres og %lu opgraderes ikke.\n" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "Bemærk, vælger »%s« til opgave »%s«\n" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "Bemærk, vælger »%s« for regulært udtryk »%s«\n" -#: cmdline/apt-get.cc:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakken %s er en virtuel pakke, der kan leveres af:\n" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr " [Installeret]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 msgid " [Not candidate version]" msgstr " [Ingen kandidatversion]" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "Du bør eksplicit vælge en at installere." -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -441,190 +459,190 @@ msgstr "" "anden pakke. Det kan betyde at denne pakke blevet overflødiggjort eller \n" "kun kan hentes fra andre kilder\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "Dog kan følgende pakker erstatte den:" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, c-format msgid "Package '%s' has no installation candidate" msgstr "Pakken »%s« har ingen installationskandidat" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "Virtuelle pakker som »%s« kan ikke fjernes\n" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "" "Pakken »%s« er ikke installeret, så den afinstalleres ikke. Mente du »%s«?\n" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "Pakken »%s« er ikke installeret, så den afinstalleres ikke\n" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "Bemærk, vælger »%s« fremfor »%s«\n" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Overspringer %s, da den allerede er installeret og opgradering er " "deaktiveret.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "" "Overspringer %s, den er ikke installeret og der er kun forespurgt efter " "opgraderinger.\n" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Geninstallering af %s er ikke mulig, da den ikke kan hentes.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "%s er i forvejen den nyeste version.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s sat til manuelt installeret.\n" -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:913 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "Valgte version »%s« (%s) for »%s«\n" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "Valgte version »%s« (%s) for »%s« på grund af »%s«\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "Retter afhængigheder ..." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr " mislykkedes." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "Kunne ikke rette afhængigheder" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "Kunne ikke minimere opgraderingssættet" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr " Færdig" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Du kan muligvis rette dette ved at køre 'apt-get -f install'." -#: cmdline/apt-get.cc:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "Uopfyldte afhængigheder. Prøv med -f." -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ADVARSEL: Følgende pakkers autenticitet kunne ikke verificeres!" -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "Autentifikationsadvarsel tilsidesat.\n" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " -msgstr "Installér disse pakker uden verifikation (y/N)? " +#: cmdline/apt-get.cc:1108 +msgid "Install these packages without verification?" +msgstr "Installér disse pakker uden verifikation?" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" msgstr "Nogle pakker kunne ikke autentificeres" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "Der er problemer og -y blev brugt uden --force-yes" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Intern fejl. InstallPackages blev kaldt med ødelagte pakker!" -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 msgid "Packages need to be removed but remove is disabled." msgstr "Pakker skal afinstalleres, men Remove er deaktiveret." -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 msgid "Internal error, Ordering didn't finish" msgstr "Intern fejl. Sortering blev ikke fuldført" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "Mystisk.. Størrelserne passede ikke, skriv til apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "%sB/%sB skal hentes fra arkiverne.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "%sB skal hentes fra arkiverne.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Efter denne handling, vil %sB yderligere diskplads være brugt.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Efter denne handling, vil %sB diskplads blive frigjort.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunne ikke bestemme ledig plads i %s" -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, 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:1257 cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "'Trivial Only' angivet, men dette er ikke en triviel handling." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "Ja, gør som jeg siger!" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -635,28 +653,28 @@ msgstr "" "For at fortsætte, skal du skrive '%s'\n" " ?] " -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "Afbryder." -#: cmdline/apt-get.cc:1284 -msgid "Do you want to continue [Y/n]? " -msgstr "Vil du fortsætte [J/n]? " +#: cmdline/apt-get.cc:1313 +msgid "Do you want to continue?" +msgstr "Vil du fortsætte?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Kunne ikke hente %s %s\n" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "Nedhentningen af filer mislykkedes" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "Nedhentning afsluttet i 'hent-kun'-tilstand" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -664,19 +682,19 @@ msgstr "" "Kunne ikke hente nogle af arkiverne. Prøv evt. at køre 'apt-get update' " "eller prøv med --fix-missing." -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing og medieskift understøttes endnu ikke" -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "Kunne ikke rette manglende pakker." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "Afbryder installationen." -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -690,37 +708,37 @@ msgstr[1] "" "De følgende pakker forsvandt fra dit system, da\n" "alle filer er blevet overskrevet af andre pakker:" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Bemærk: Dette sker automatisk og med vilje af dpkg." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Ignorer utilgængelig måludgivelse '%s' af pakke '%s'" -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Vælger '%s' som kildepakke fremfor '%s'\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Ignorer utilgængelig version '%s' af pakke '%s'" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr "'update'-kommandoen benytter ingen parametre" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 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:1817 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -738,15 +756,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 msgid "The following information may help to resolve the situation:" msgstr "Følgende oplysninger kan hjælpe dig med at klare situationen:" -#: cmdline/apt-get.cc:1824 +#: cmdline/apt-get.cc:1853 msgid "Internal Error, AutoRemover broke stuff" msgstr "Intern fejl. AutoRemover ødelagde noget" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -757,7 +775,7 @@ msgstr[0] "" msgstr[1] "" "Følgende pakker blev installeret automatisk, og behøves ikke længere:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -766,21 +784,21 @@ msgstr[0] "Pakken %lu blev installeret automatisk, og behøves ikke længere.\n" msgstr[1] "" "Pakkerne %lu blev installeret automatisk, og behøves ikke længere.\n" -#: cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1866 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Brug »apt-get autoremove« til at fjerne den." msgstr[1] "Brug »apt-get autoremove« til at fjerne dem." -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern fejl, AllUpgrade ødelagde noget" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1984 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Du kan muligvis rette det ved at køre »apt-get -f install«:" -#: cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -788,7 +806,7 @@ msgstr "" "Uopfyldte afhængigheder. Prøv 'apt-get -f install' uden pakker (eller angiv " "en løsning)." -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:2002 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" @@ -799,33 +817,33 @@ msgstr "" "en umulig situation eller bruger den ustabile distribution, hvor enkelte\n" "pakker endnu ikke er lavet eller gjort tilgængelige." -#: cmdline/apt-get.cc:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "Ødelagte pakker" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "Følgende yderligere pakker vil blive installeret:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "Foreslåede pakker:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "Anbefalede pakker:" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "Kunne ikke finde pakken %s" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s sat til automatisk installation.\n" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -833,46 +851,46 @@ msgstr "" "Denne kommando er forældet. Brug venligst »apt-mark auto« og »apt-mark " "manual« i stedet for." -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "Beregner opgraderingen... " -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "Mislykkedes" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "Færdig" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 msgid "Internal error, problem resolver broke stuff" msgstr "Intern fejl. Problemløseren ødelagde noget" -#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "Kunne ikke låse nedhentningsmappen" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Kan ikke finde en kilde til at hente version »%s« for »%s«" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "Henter %s %s" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 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:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, c-format msgid "Unable to find a source package for %s" msgstr "Kunne ikke finde kildetekstpakken for %s" -#: cmdline/apt-get.cc:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -881,7 +899,7 @@ msgstr "" "BEMÆRK: Pakning af '%s' vedligeholdes i versionskontrolsystemet '%s' på:\n" "%s\n" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, c-format msgid "" "Please use:\n" @@ -892,68 +910,68 @@ msgstr "" "bzr branch %s\n" "for at hente de seneste (muligvis ikke udgivet) opdateringer til pakken.\n" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Overspringer allerede hentet fil '%s'\n" -#: cmdline/apt-get.cc:2604 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikke nok ledig plads i %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2644 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB/%sB skal hentes fra kildetekst-arkiverne.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2649 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB skal hentes fra kildetekst-arkiverne.\n" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "Henter kildetekst %s\n" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "Nogle arkiver kunne ikke hentes." -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, 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:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Udpakningskommandoen '%s' fejlede.\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, 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:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "Opbygningskommandoen '%s' fejlede.\n" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "Barneprocessen fejlede" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 msgid "Must specify at least one package to check builddeps for" msgstr "Skal angive mindst én pakke at tjekke opbygningsafhængigheder for" -#: cmdline/apt-get.cc:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -962,17 +980,17 @@ msgstr "" "Ingen arkitekturinformation tilgængelig for %s. Se apt.conf(5) APT::" "Architectures for opsætning" -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kunne ikke hente oplysninger om opbygningsafhængigheder for %s" -#: cmdline/apt-get.cc:2839 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen opbygningsafhængigheder.\n" -#: cmdline/apt-get.cc:3009 +#: cmdline/apt-get.cc:3040 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -980,7 +998,7 @@ msgid "" msgstr "" "Afhængigheden %s for %s kan ikke opfyldes, da %s ikke er tilladt på '%s'" -#: cmdline/apt-get.cc:3027 +#: cmdline/apt-get.cc:3058 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -988,14 +1006,14 @@ msgid "" msgstr "" "Afhængigheden %s for %s kan ikke opfyldes, da pakken %s ikke blev fundet" -#: cmdline/apt-get.cc:3050 +#: cmdline/apt-get.cc:3081 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Kunne ikke opfylde %s-afhængigheden for %s: Den installerede pakke %s er for " "ny" -#: cmdline/apt-get.cc:3089 +#: cmdline/apt-get.cc:3120 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1004,7 +1022,7 @@ msgstr "" "Afhængigheden %s for %s kan ikke opfyldes, da ingen af de tilgængelige " "kandidater for pakken %s kan tilfredsstille versionskravene" -#: cmdline/apt-get.cc:3095 +#: cmdline/apt-get.cc:3126 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1013,30 +1031,30 @@ msgstr "" "%s-afhængigheden for %s kan ikke opfyldes, da pakken %s ikke har en " "kandidatversion" -#: cmdline/apt-get.cc:3118 +#: cmdline/apt-get.cc:3149 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Kunne ikke opfylde %s-afhængigheden for %s: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3164 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Opbygningsafhængigheden for %s kunne ikke opfyldes." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "Kunne ikke behandler opbygningsafhængighederne" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, c-format msgid "Changelog for %s (%s)" msgstr "Ændringslog for %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "Understøttede moduler:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1124,7 +1142,7 @@ msgstr "" "for flere oplysninger og tilvalg.\n" " Denne APT har »Super Cow Powers«.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1199,8 +1217,8 @@ msgid "%s was already not hold.\n" msgstr "%s var allerede ikke i bero.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Ventede på %s, men den var der ikke" @@ -1287,7 +1305,7 @@ msgstr "Kunne ikke afmontere cdrommen i %s, den er muligvis stadig i brug." msgid "Disk not found." msgstr "Disk blev ikke fundet." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "Fil blev ikke fundet" @@ -1350,7 +1368,7 @@ msgstr "Logpå-skriptets kommando '%s' mislykkedes. Serveren sagde: %s" msgid "TYPE failed, server said: %s" msgstr "TYPE mislykkedes. Serveren sagde: %s" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "Tidsudløb på forbindelsen" @@ -1358,8 +1376,8 @@ msgstr "Tidsudløb på forbindelsen" msgid "Server closed the connection" msgstr "Serveren lukkede forbindelsen" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "Læsefejl" @@ -1371,86 +1389,86 @@ msgstr "Mellemlageret blev overfyldt af et svar." msgid "Protocol corruption" msgstr "Protokolfejl" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "Skrivefejl" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "Kunne ikke oprette sokkel" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "Kunne ikke forbinde datasokkel, tidsudløb på forbindelsen" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "Kunne ikke forbinde passiv sokkel." -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo kunne ikke få en lyttesokkel" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "Kunne ikke tilknytte en sokkel" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "Kunne ikke lytte på soklen" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "Kunne ikke finde soklens navn" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "Kunne ikke sende PORT-kommando" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Ukendt adressefamilie %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT mislykkedes. Serveren sagde: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "Tidsudløb på datasokkel-forbindelse" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "Kunne ikke acceptere forbindelse" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "Problem ved \"hashing\" af fil" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Kunne ikke hente fil. Serveren sagde '%s'" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "Tidsudløb ved datasokkel" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Dataoverførsel mislykkedes, serveren sagde '%s'" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "Forespørgsel" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "Kunne ikke udføre " @@ -1486,7 +1504,7 @@ msgstr "Kunne ikke forbinde til %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "Forbinder til %s" @@ -1516,38 +1534,38 @@ msgstr "Der skete noget underligt under opløsning af '%s:%s' (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Kunne ikke forbinde til %s:%s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:167 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Intern fejl: Gyldig signatur, men kunne ikke afgøre nøgle-fingeraftryk?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Stødte på mindst én ugyldig signatur." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:173 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Kunne ikke køre 'gpgv' for at verificere signaturen (er gpgv installeret?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "Ukendt fejl ved kørsel af gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 msgid "The following signatures were invalid:\n" msgstr "Følgende signaturer var ugyldige:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1588,59 +1606,59 @@ msgstr "" msgid "Unknown date format" msgstr "Ukendt datoformat" -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "Valg mislykkedes" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "Tidsudløb på forbindelsen" -#: methods/http.cc:855 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "Fejl ved skrivning af uddatafil" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "Fejl ved skrivning til fil" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "Fejl ved skrivning til filen" -#: methods/http.cc:928 +#: methods/http.cc:927 msgid "Error reading from server. Remote end closed connection" msgstr "Fejl ved læsning fra serveren. Den fjerne ende lukkede forbindelsen" -#: methods/http.cc:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "Fejl ved læsning fra server" -#: methods/http.cc:1198 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "Ugyldige hoved-data" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "Forbindelsen mislykkedes" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "Intern fejl" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "Kunne ikke læse %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1693,7 +1711,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "Kunne ikke oprette IPC-videreførsel til underproces" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "Forbindelsen lukkedes for hurtigt" @@ -2175,11 +2193,11 @@ msgstr "Ugyldigt arkivelementhoved %s" msgid "Invalid archive member header" msgstr "Ugyldigt arkivelementhoved" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "Arkivet er for kort" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "Kunne ikke læse arkivhovederne" @@ -2509,7 +2527,7 @@ msgstr "Ugyldig handling %s" msgid "Unable to stat the mount point %s" msgstr "Kunne ikke finde monteringspunktet %s" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "Kunne ikke finde cdrommen" @@ -2528,101 +2546,101 @@ msgstr "Benytter ikke låsning for skrivebeskyttet låsefil %s" msgid "Could not open lock file %s" msgstr "Kunne ikke åbne låsefilen %s" -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Benytter ikke låsning for nfs-monteret låsefil %s" -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "Kunne ikke opnå låsen %s" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "Liste over filer kan ikke oprettes da »%s« ikke er en mappe" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "Ignorerer »%s« i mappe »%s« da det ikke er en regulær fil" -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "Ignorerer fil »%s« i mappe »%s« da den ikke har en filendelse" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "Ignorerer fil »%s« i mappe »%s« da den har en ugyldig filendelse" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Underprocessen %s modtog en segmenteringsfejl." -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, c-format msgid "Sub-process %s received signal %u." msgstr "Underprocessen %s modtog en signal %u." -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Underprocessen %s returnerede en fejlkode (%u)" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Underprocessen %s afsluttedes uventet" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "Kunne ikke åbne filen %s" -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, c-format msgid "Could not open file descriptor %d" msgstr "Kunne ikke åbne filbeskrivelse %d" -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "Kunne ikke oprette underproces IPC" -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "Kunne ikke udføre komprimeringsprogram " -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, c-format msgid "read, still have %llu to read but none left" msgstr "læs, mangler stadig at læse %llu men der er ikke flere" -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "skriv, mangler stadig at skrive %llu men kunne ikke" -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, c-format msgid "Problem closing the file %s" msgstr "Problem under lukning af filen %s" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problem under omdøbning af filen %s til %s" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, c-format msgid "Problem unlinking the file %s" msgstr "Fejl ved frigivelse af filen %s" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "Problem under synkronisering af fil" @@ -2819,7 +2837,7 @@ msgstr "Ugyldig linje %u i kildelisten %s (type)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen '%s' er ukendt på linje %u i kildelisten %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2828,12 +2846,12 @@ msgstr "" "Kunne ikke udføre øjeblikkelig konfiguration på »%s«. Se venligst man 5 apt." "conf under APT:Immediate-Cinfigure for detaljer. (%d)" -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, c-format msgid "Could not configure '%s'. " msgstr "Kunne ikke åbne filen »%s«. " -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2857,7 +2875,7 @@ msgid "" msgstr "" "Pakken %s skal geninstalleres, men jeg kan ikke finde noget arkiv med den." -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2865,12 +2883,12 @@ msgstr "" "Fejl, pkgProblemResolver::Resolve satte stopklodser op, det kan skyldes " "tilbageholdte pakker." -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Kunne ikke korrigere problemerne, da du har tilbageholdt ødelagte pakker." -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3042,12 +3060,12 @@ msgstr "omdøbning mislykkedes, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "MD5Sum stemmer ikke" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 msgid "Hash Sum mismatch" msgstr "Hashsum stemmer ikke" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3056,17 +3074,17 @@ msgstr "" "Kunne ikke finde uventet punkt »%s« i udgivelsesfil (forkert sources.list-" "punkt eller forkert udformet fil)" -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Kunne ikke finde hashsum for »%s« i udgivelsesfilen" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Der er ingen tilgængelige offentlige nøgler for følgende nøgle-ID'er:\n" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3075,12 +3093,12 @@ msgstr "" "Udgivelsesfil for %s er udløbet (ugyldig siden %s). Opdateringer for dette " "arkiv vil ikke blive anvendt." -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konfliktdistribution: %s (forventede %s men fik %s)" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3090,12 +3108,12 @@ msgstr "" "og den forrige indeksfil vil blive brugt. GPG-fejl: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-fejl: %s: %s" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3104,7 +3122,7 @@ msgstr "" "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er " "nødt til manuelt at reparere denne pakke. (grundet manglende arch)" -#: apt-pkg/acquire-item.cc:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3113,13 +3131,13 @@ msgstr "" "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er " "nødt til manuelt at reparere denne pakke." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Pakkeindeksfilerne er i stykker. Intet 'Filename:'-felt for pakken %s." -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "Størrelsen stemmer ikke" @@ -3243,22 +3261,22 @@ msgstr "Skriver ny kildeliste\n" msgid "Source list entries for this disc are:\n" msgstr "Denne disk har følgende kildeliste-indgange:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "Skrev %i poster.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Skrev %i poster med %i manglende filer.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Skrev %i poster med %i ikke-trufne filer\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Skrev %i poster med %i manglende filer og %i ikke-trufne filer\n" @@ -3349,12 +3367,12 @@ msgstr "Kør ekstern problemløser" msgid "Installing %s" msgstr "Installerer %s" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr "Sætter %s op" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr "Fjerner %s" @@ -3375,79 +3393,79 @@ msgid "Running post-installation trigger %s" msgstr "Kører førinstallationsudløser %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, c-format msgid "Directory '%s' missing" msgstr "Mappe '%s' mangler" -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, c-format msgid "Could not open file '%s'" msgstr "Kunne ikke åbne filen '%s'" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr "Klargør %s" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr "Pakker %s ud" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "Gør klar til at sætte %s op" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr "Installerede %s" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "Gør klar til afinstallation af %s" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr "Fjernede %s" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "Gør klar til at fjerne %s helt" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr "Fjernede %s helt" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "Kan ikke skrive log, openpty() mislykkedes (/dev/pts ej monteret?)\n" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "Kører dpkg" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "Handling blev afbrudt før den kunne afsluttes" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "" "Ingen apportrapport skrevet da MaxReports (maks rapporter) allerede er nået" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "afhængighedsproblemer - efterlader ukonfigureret" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3455,14 +3473,14 @@ msgstr "" "Ingen apportrapport skrevet da fejlbeskeden indikerer, at det er en " "opfølgningsfejl fra en tidligere fejl." -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" "Ingen apportrapport skrevet da fejlbeskeden indikerer en fuld disk-fejl" -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3470,7 +3488,7 @@ msgstr "" "Ingen apportrapport skrevet da fejlbeskeden indikerer en ikke nok " "hukommelsesfejl" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "Ingen apportrapport skrevet da fejlbeskeden indikerer en dpkg I/O-fejl" diff --git a/po/de.po b/po/de.po index 2635b26de..ba9d3ae33 100644 --- a/po/de.po +++ b/po/de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.2\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2012-06-27 10:55+0200\n" "Last-Translator: Holger Wansing \n" "Language-Team: Debian German \n" @@ -93,81 +93,81 @@ msgstr "Gesamtmenge an Slack: " msgid "Total space accounted for: " msgstr "Gesamtmenge an Speicher: " -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "Paketdatei %s ist nicht synchronisiert." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Keine Pakete gefunden" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 msgid "You must give at least one search pattern" msgstr "Sie müssen mindestens ein Suchmuster angeben" -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" "Dieser Befehl ist überholt. Bitte verwenden Sie stattdessen »apt-mark " "showauto«." -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Paket %s kann nicht gefunden werden." -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "Paketdateien:" -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Zwischenspeicher ist nicht synchron, Querverweisen einer Paketdatei nicht " "möglich" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "Mit Pinning verwaltete Pakete:" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(nicht gefunden)" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr " Installiert: " -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr " Installationskandidat: " -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(keine)" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr " Paket-Pinning: " #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr " Versionstabelle:" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s für %s, kompiliert am %s %s\n" -#: cmdline/apt-cache.cc:1730 +#: cmdline/apt-cache.cc:1760 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -301,84 +301,102 @@ msgstr "" " -c=? Diese Konfigurationsdatei lesen\n" " -o=? Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +msgid "[Y/n]" +msgstr "[J/n]" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "[j/N]" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" msgstr "N" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "Die folgenden Pakete haben unerfüllte Abhängigkeiten:" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "aber %s ist installiert" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "aber %s soll installiert werden" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "ist aber nicht installierbar" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "ist aber ein virtuelles Paket" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "ist aber nicht installiert" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "soll aber nicht installiert werden" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr " oder" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "Die folgenden NEUEN Pakete werden installiert:" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "Die folgenden Pakete werden ENTFERNT:" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 msgid "The following packages have been kept back:" msgstr "Die folgenden Pakete sind zurückgehalten worden:" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "Die folgenden Pakete werden aktualisiert (Upgrade):" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "" "Die folgenden Pakete werden durch eine ÄLTERE VERSION ERSETZT (Downgrade):" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "Die folgenden zurückgehaltenen Pakete werden verändert:" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s (wegen %s) " -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -386,59 +404,59 @@ msgstr "" "WARNUNG: Die folgenden essentiellen Pakete werden entfernt.\n" "Dies sollte NICHT geschehen, außer Sie wissen genau, was Sie tun!" -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualisiert, %lu neu installiert, " -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "%lu erneut installiert, " -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "%lu durch eine ältere Version ersetzt, " -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu zu entfernen und %lu nicht aktualisiert.\n" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nicht vollständig installiert oder entfernt.\n" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "Hinweis: »%s« wird für Task »%s« gewählt.\n" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "Hinweis: »%s« wird für regulären Ausdruck »%s« gewählt.\n" -#: cmdline/apt-get.cc:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Paket %s ist ein virtuelles Paket, das bereitgestellt wird von:\n" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr " [Installiert]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 msgid " [Not candidate version]" msgstr " [Nicht die Installationskandidat-Version]" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "Sie sollten eines explizit zum Installieren auswählen." -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -449,140 +467,140 @@ msgstr "" "referenziert. Das kann heißen, dass das Paket fehlt, dass es abgelöst\n" "wurde oder nur aus einer anderen Quelle verfügbar ist.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "Doch die folgenden Pakete ersetzen es:" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, c-format msgid "Package '%s' has no installation candidate" msgstr "Für Paket »%s« existiert kein Installationskandidat." -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "Virtuelle Pakete wie »%s« können nicht entfernt werden.\n" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "" "Paket »%s« ist nicht installiert, wird also auch nicht entfernt. Meinten Sie " "»%s«?\n" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "Paket »%s« ist nicht installiert, wird also auch nicht entfernt.\n" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "Hinweis: »%s« wird an Stelle von »%s« gewählt.\n" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "%s wird übersprungen; es ist schon installiert und ein Upgrade ist nicht " "angefordert.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "" "%s wird übersprungen; es ist nicht installiert und lediglich Upgrades sind " "angefordert.\n" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "Erneute Installation von %s ist nicht möglich,\n" "es kann nicht heruntergeladen werden.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ist schon die neueste Version.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s wurde als manuell installiert festgelegt.\n" -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:913 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "Version »%s« (%s) für »%s« gewählt.\n" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "Version »%s« (%s) für »%s« gewählt aufgrund von »%s«.\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "Abhängigkeiten werden korrigiert ..." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr " fehlgeschlagen." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "Abhängigkeiten konnten nicht korrigiert werden." -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "Menge der zu aktualisierenden Pakete konnte nicht minimiert werden." -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr " Fertig" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 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:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "Unerfüllte Abhängigkeiten. Versuchen Sie, -f zu benutzen." -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 msgid "WARNING: The following packages cannot be authenticated!" msgstr "WARNUNG: Die folgenden Pakete können nicht authentifiziert werden!" -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "Authentifizierungswarnung überstimmt.\n" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " -msgstr "Diese Pakete ohne Überprüfung installieren [j/N]? " +#: cmdline/apt-get.cc:1108 +msgid "Install these packages without verification?" +msgstr "Diese Pakete ohne Überprüfung installieren?" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" msgstr "Einige Pakete konnten nicht authentifiziert werden." -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "Es gab Probleme und -y wurde ohne --force-yes verwendet." -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Interner Fehler, InstallPackages mit defekten Paketen aufgerufen!" -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 msgid "Packages need to be removed but remove is disabled." msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet." -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 msgid "Internal error, Ordering didn't finish" msgstr "Interner Fehler, Anordnung beendete nicht" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Wie merkwürdig ... die Größen haben nicht übereingestimmt; schreiben Sie " @@ -590,54 +608,54 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Es müssen noch %sB von %sB an Archiven heruntergeladen werden.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Es müssen %sB an Archiven heruntergeladen werden.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Nach dieser Operation werden %sB Plattenplatz zusätzlich benutzt.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Nach dieser Operation werden %sB Plattenplatz freigegeben.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Couldn't determine free space in %s" msgstr "Freier Platz in %s konnte nicht bestimmt werden." -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, c-format msgid "You don't have enough free space in %s." msgstr "Sie haben nicht genug Platz in %s." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "»Nur triviale« angegeben, aber dies ist keine triviale Operation." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "Ja, tue was ich sage!" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -648,28 +666,28 @@ msgstr "" "Zum Fortfahren geben Sie bitte »%s« ein.\n" " ?] " -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "Abbruch." -#: cmdline/apt-get.cc:1284 -msgid "Do you want to continue [Y/n]? " -msgstr "Möchten Sie fortfahren [J/n]? " +#: cmdline/apt-get.cc:1313 +msgid "Do you want to continue?" +msgstr "Möchten Sie fortfahren?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Fehlschlag beim Holen von %s %s\n" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "Einige Dateien konnten nicht heruntergeladen werden." -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "Herunterladen abgeschlossen; Nur-Herunterladen-Modus aktiv" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -677,19 +695,19 @@ msgstr "" "Einige Archive konnten nicht heruntergeladen werden; vielleicht »apt-get " "update« ausführen oder mit »--fix-missing« probieren?" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing und Wechselmedien werden derzeit nicht unterstützt." -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "Fehlende Pakete konnten nicht korrigiert werden." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "Installation abgebrochen." -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -703,36 +721,36 @@ msgstr[1] "" "Die folgenden Pakete verschwanden von Ihrem System, da alle\n" "Dateien von anderen Paketen überschrieben wurden:" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Hinweis: Dies wird automatisch und absichtlich von dpkg durchgeführt." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Nicht verfügbare Veröffentlichung »%s« von Paket »%s« wird ignoriert." -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Als Quellpaket wird »%s« statt »%s« gewählt.\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Nicht verfügbare Version »%s« von Paket »%s« wird ignoriert." -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr "Der Befehl »update« akzeptiert keine Argumente." -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Es soll nichts gelöscht werden, AutoRemover kann nicht gestartet werden." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -751,16 +769,16 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 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:1824 +#: cmdline/apt-get.cc:1853 msgid "Internal Error, AutoRemover broke stuff" msgstr "Interner Fehler, AutoRemover hat etwas beschädigt." -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -773,7 +791,7 @@ msgstr[1] "" "Die folgenden Pakete wurden automatisch installiert und werden nicht mehr " "benötigt:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -783,21 +801,21 @@ msgstr[0] "" msgstr[1] "" "%lu Pakete wurden automatisch installiert und werden nicht mehr benötigt.\n" -#: cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1866 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Verwenden Sie »apt-get autoremove«, um es zu entfernen." msgstr[1] "Verwenden Sie »apt-get autoremove«, um sie zu entfernen." -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "Interner Fehler, AllUpgrade hat etwas beschädigt." -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1984 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:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -805,7 +823,7 @@ msgstr "" "Unerfüllte Abhängigkeiten. Versuchen Sie »apt-get -f install« ohne Angabe " "eines Pakets (oder geben Sie eine Lösung an)." -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:2002 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" @@ -817,33 +835,33 @@ msgstr "" "Unstable-Distribution verwenden, dass einige erforderliche Pakete noch\n" "nicht erstellt wurden oder Incoming noch nicht verlassen haben." -#: cmdline/apt-get.cc:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "Beschädigte Pakete" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "Die folgenden zusätzlichen Pakete werden installiert:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "Vorgeschlagene Pakete:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "Empfohlene Pakete:" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "Paket %s konnte nicht gefunden werden" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s wurde als automatisch installiert festgelegt.\n" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -851,50 +869,50 @@ msgstr "" "Dieser Befehl ist überholt. Bitte verwenden Sie stattdessen »apt-mark auto« " "und »apt-mark manual«." -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "Paketaktualisierung (Upgrade) wird berechnet... " -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "Fehlgeschlagen" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "Fertig" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 msgid "Internal error, problem resolver broke stuff" msgstr "Interner Fehler, der Problemlöser hat etwas beschädigt." -#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "Das Downloadverzeichnis konnte nicht gesperrt werden." -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" "Es konnte keine Quelle gefunden werden, um Version »%s« von »%s« " "herunterzuladen." -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "Herunterladen von %s %s" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 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:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, c-format msgid "Unable to find a source package for %s" msgstr "Quellpaket für %s kann nicht gefunden werden." -#: cmdline/apt-get.cc:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -904,7 +922,7 @@ msgstr "" "auf:\n" "%s\n" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, c-format msgid "" "Please use:\n" @@ -916,70 +934,70 @@ msgstr "" "um die neuesten (möglicherweise noch unveröffentlichten) Aktualisierungen\n" "für das Paket abzurufen.\n" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Bereits heruntergeladene Datei »%s« wird übersprungen.\n" -#: cmdline/apt-get.cc:2604 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr "Sie haben nicht genügend freien Speicherplatz in %s." #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2644 #, 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" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2649 #, 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:2624 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "Quelle %s wird heruntergeladen.\n" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "Einige Archive konnten nicht heruntergeladen werden." -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Das Entpacken der bereits entpackten Quelle in %s wird übersprungen.\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Entpackbefehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, 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:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build-Befehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "Kindprozess fehlgeschlagen" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 msgid "Must specify at least one package to check builddeps for" msgstr "" "Es muss mindestens ein Paket angegeben werden, dessen Bauabhängigkeiten " "überprüft werden sollen." -#: cmdline/apt-get.cc:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -988,18 +1006,18 @@ msgstr "" "Keine Architekturinformation für %s verfügbar. Weiteres zur Einrichtung " "finden Sie unter apt.conf(5) APT::Architectures." -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Informationen zu Bauabhängigkeiten für %s konnten nicht gefunden werden." -#: cmdline/apt-get.cc:2839 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr "%s hat keine Bauabhängigkeiten.\n" -#: cmdline/apt-get.cc:3009 +#: cmdline/apt-get.cc:3040 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -1008,7 +1026,7 @@ msgstr "" "»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da %s bei »%s«-Paketen " "nicht erlaubt ist." -#: cmdline/apt-get.cc:3027 +#: cmdline/apt-get.cc:3058 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1017,14 +1035,14 @@ msgstr "" "»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da Paket %s nicht " "gefunden werden kann." -#: cmdline/apt-get.cc:3050 +#: cmdline/apt-get.cc:3081 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "»%s«-Abhängigkeit für %s kann nicht erfüllt werden: Installiertes Paket %s " "ist zu neu." -#: cmdline/apt-get.cc:3089 +#: cmdline/apt-get.cc:3120 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1034,7 +1052,7 @@ msgstr "" "Installationskandidaten für das Paket %s die Versionsanforderungen nicht " "erfüllen kann." -#: cmdline/apt-get.cc:3095 +#: cmdline/apt-get.cc:3126 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1043,30 +1061,30 @@ msgstr "" "»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da für Paket %s kein " "Installationskandidat existiert." -#: cmdline/apt-get.cc:3118 +#: cmdline/apt-get.cc:3149 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "»%s«-Abhängigkeit für %s konnte nicht erfüllt werden: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3164 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Bauabhängigkeiten für %s konnten nicht erfüllt werden." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "Verarbeitung der Bauabhängigkeiten fehlgeschlagen" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, c-format msgid "Changelog for %s (%s)" msgstr "Änderungsprotokoll (Changelog) für %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "Unterstützte Module:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1161,7 +1179,7 @@ msgstr "" "bezüglich weitergehender Informationen und Optionen.\n" " Dieses APT hat Super-Kuh-Kräfte.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1238,8 +1256,8 @@ msgid "%s was already not hold.\n" msgstr "Die Halten-Markierung für %s wurde bereits entfernt.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Es wurde auf %s gewartet, war jedoch nicht vorhanden" @@ -1328,7 +1346,7 @@ msgstr "" msgid "Disk not found." msgstr "Medium nicht gefunden" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "Datei nicht gefunden" @@ -1392,7 +1410,7 @@ msgstr "Befehl »%s« des Login-Skriptes fehlgeschlagen, Server meldet: %s" msgid "TYPE failed, server said: %s" msgstr "Befehl TYPE fehlgeschlagen: %s" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "Zeitüberschreitung der Verbindung" @@ -1400,8 +1418,8 @@ msgstr "Zeitüberschreitung der Verbindung" msgid "Server closed the connection" msgstr "Verbindung durch Server geschlossen" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "Lesefehler" @@ -1413,88 +1431,88 @@ msgstr "Durch eine Antwort wurde der Puffer zum Überlaufen gebracht." msgid "Protocol corruption" msgstr "Protokoll beschädigt" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "Schreibfehler" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "Socket konnte nicht erzeugt werden." -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "Daten-Socket konnte wegen Zeitüberschreitung nicht verbunden werden." -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "Passiver Socket konnte nicht verbunden werden." -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "" "Von der Funktion getaddrinfo wurde kein auf Verbindungen wartender Socket " "gefunden." -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "Verbindung des Sockets nicht möglich" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "Warten auf Verbindungen auf dem Socket nicht möglich" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "Name des Sockets konnte nicht bestimmt werden." -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "PORT-Befehl konnte nicht gesendet werden." -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Unbekannte Adressfamilie %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "Befehl EPRT fehlgeschlagen: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "Zeitüberschreitung bei Datenverbindungsaufbau" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "Verbindung konnte nicht angenommen werden." -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "Problem bei Bestimmung des Hashwertes einer Datei" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Datei konnte nicht heruntergeladen werden; Server meldet: »%s«" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "Zeitüberschreitung bei Datenverbindung" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Datenübertragung fehlgeschlagen; Server meldet: »%s«" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "Abfrage" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "Aufruf nicht möglich: " @@ -1532,7 +1550,7 @@ msgstr "Verbindung mit %s:%s nicht möglich (%s)" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "Verbindung mit %s" @@ -1562,40 +1580,40 @@ msgstr "Beim Auflösen von »%s:%s« ist etwas Schlimmes passiert (%i - %s)." msgid "Unable to connect to %s:%s:" msgstr "Verbindung mit %s:%s nicht möglich:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:167 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Interner Fehler: Gültige Signatur, Fingerabdruck des Schlüssels konnte " "jedoch nicht ermittelt werden?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Mindestens eine ungültige Signatur wurde entdeckt." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:173 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "»gpgv« konnte zur Überprüfung der Signatur nicht ausgeführt werden (ist gpgv " "installiert?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "Unbekannter Fehler beim Ausführen von gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 msgid "The following signatures were invalid:\n" msgstr "Die folgenden Signaturen waren ungültig:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1639,61 +1657,61 @@ msgstr "" msgid "Unknown date format" msgstr "Unbekanntes Datumsformat" -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "Auswahl fehlgeschlagen" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "Zeitüberschreitung bei Verbindung" -#: methods/http.cc:855 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "Fehler beim Schreiben der Ausgabedatei" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "Fehler beim Schreiben in Datei" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "Fehler beim Schreiben der Datei" -#: methods/http.cc:928 +#: methods/http.cc:927 msgid "Error reading from server. Remote end closed connection" msgstr "" "Fehler beim Lesen vom Server: Verbindung wurde durch den Server auf der " "anderen Seite geschlossen." -#: methods/http.cc:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "Fehler beim Lesen vom Server" -#: methods/http.cc:1198 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "Fehlerhafte Kopfzeilendaten" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "Verbindung fehlgeschlagen" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "Interner Fehler" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "%s kann nicht gelesen werden." -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1747,7 +1765,7 @@ msgid "Failed to create IPC pipe to subprocess" msgstr "" "Interprozesskommunikation mit Unterprozess konnte nicht aufgebaut werden." -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "Verbindung vorzeitig beendet" @@ -1782,8 +1800,8 @@ msgstr "fehlende Abhängigkeiten führen. Das ist in Ordnung, nur die Fehler" msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" -"oberhalb dieser Meldung sind wichtig. Bitte beseitigen Sie sie und [I]" -"nstallieren Sie erneut." +"oberhalb dieser Meldung sind wichtig. Bitte beseitigen Sie sie und " +"[I]nstallieren Sie erneut." #: dselect/update:30 msgid "Merging available information" @@ -2237,11 +2255,11 @@ msgstr "Ungültige Archivbestandteil-Kopfzeile %s" msgid "Invalid archive member header" msgstr "Ungültige Archivdatei-Kopfzeilen" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "Archiv ist zu kurz." -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "Archiv-Kopfzeilen konnten nicht gelesen werden." @@ -2573,7 +2591,7 @@ msgstr "Ungültige Operation %s" msgid "Unable to stat the mount point %s" msgstr "Einbindungspunkt %s mit »stat« abfragen nicht möglich." -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "CD-ROM mit »stat« abfragen fehlgeschlagen" @@ -2592,35 +2610,35 @@ msgstr "Es wird keine Sperre für schreibgeschützte Sperrdatei %s verwendet." msgid "Could not open lock file %s" msgstr "Sperrdatei %s konnte nicht geöffnet werden." -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Es wird keine Sperre für per NFS eingebundene Sperrdatei %s verwendet." -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "Konnte Sperre %s nicht bekommen" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "Dateiliste kann nicht erstellt werden, da »%s« kein Verzeichnis ist." -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" "»%s« in Verzeichnis »%s« wird ignoriert, da es keine reguläre Datei ist." -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" "Datei »%s« in Verzeichnis »%s« wird ignoriert, da sie keine Dateinamen-" "Erweiterung hat." -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" @@ -2628,74 +2646,74 @@ msgstr "" "Datei »%s« in Verzeichnis »%s« wird ignoriert, da sie eine ungültige " "Dateinamen-Erweiterung hat." -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Unterprozess %s hat einen Speicherzugriffsfehler empfangen." -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, c-format msgid "Sub-process %s received signal %u." msgstr "Unterprozess %s hat das Signal %u empfangen." -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Unterprozess %s hat Fehlercode zurückgegeben (%u)" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Unterprozess %s unerwartet beendet" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "Datei %s konnte nicht geöffnet werden." -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, c-format msgid "Could not open file descriptor %d" msgstr "Datei-Deskriptor %d konnte nicht geöffnet werden." -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "" "Interprozesskommunikation mit Unterprozess konnte nicht aufgebaut werden." -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "Fehler beim Ausführen von Komprimierer " -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, c-format msgid "read, still have %llu to read but none left" msgstr "" "Lesevorgang: es verbleiben noch %llu zu lesen, jedoch ist nichts mehr übrig." -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "" "Schreibvorgang: es verbleiben noch %llu zu schreiben, Schreiben ist jedoch " "nicht möglich." -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, c-format msgid "Problem closing the file %s" msgstr "Problem beim Schließen der Datei %s" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problem beim Umbenennen der Datei %s nach %s" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, c-format msgid "Problem unlinking the file %s" msgstr "Problem beim Entfernen (unlink) der Datei %s" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "Problem beim Synchronisieren der Datei" @@ -2894,7 +2912,7 @@ msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ »%s« in Zeile %u der Quellliste %s ist unbekannt." -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2903,12 +2921,12 @@ msgstr "" "»%s« konnte nicht unmittelbar konfiguriert werden. Lesen Sie »man 5 apt." "conf« unter APT::Immediate-Configure bezüglich weiterer Details. (%d)" -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, c-format msgid "Could not configure '%s'. " msgstr "»%s« konnte nicht konfiguriert werden. " -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2933,7 +2951,7 @@ msgstr "" "Das Paket %s muss neu installiert werden, es kann jedoch kein Archiv dafür " "gefunden werden." -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2941,13 +2959,13 @@ msgstr "" "Fehler: Unterbrechungen durch pkgProblemResolver::Resolve hervorgerufen; " "dies könnte durch zurückgehaltene Pakete verursacht worden sein." -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Probleme können nicht korrigiert werden, Sie haben zurückgehaltene defekte " "Pakete." -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3133,12 +3151,12 @@ msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "MD5-Summe stimmt nicht überein" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 msgid "Hash Sum mismatch" msgstr "Hash-Summe stimmt nicht überein" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3147,17 +3165,17 @@ msgstr "" "Erwarteter Eintrag »%s« konnte in Release-Datei nicht gefunden werden " "(falscher Eintrag in sources.list oder missgebildete Datei)." -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Hash-Summe für »%s« kann in Release-Datei nicht gefunden werden." -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Es gibt keine öffentlichen Schlüssel für die folgenden Schlüssel-IDs:\n" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3166,12 +3184,12 @@ msgstr "" "Release-Datei für %s ist abgelaufen (ungültig seit %s). Aktualisierungen für " "dieses Depot werden nicht angewendet." -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konflikt bei Distribution: %s (%s erwartet, aber %s bekommen)" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3182,12 +3200,12 @@ msgstr "" "GPG-Fehler: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-Fehler: %s: %s" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3197,7 +3215,7 @@ msgstr "" "Sie dieses Paket von Hand korrigieren müssen (aufgrund fehlender " "Architektur)." -#: apt-pkg/acquire-item.cc:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3206,14 +3224,14 @@ msgstr "" "Es konnte keine Datei für Paket %s gefunden werden. Das könnte heißen, dass " "Sie dieses Paket von Hand korrigieren müssen." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Die Paketindexdateien sind beschädigt: Kein Filename:-Feld für Paket %s." -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "Größe stimmt nicht überein" @@ -3337,22 +3355,22 @@ msgstr "Schreiben der neuen Quellliste\n" msgid "Source list entries for this disc are:\n" msgstr "Quelllisteneinträge für dieses Medium sind:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "Es wurden %i Datensätze geschrieben.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Es wurden %i Datensätze mit %i fehlenden Dateien geschrieben.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Es wurden %i Datensätze mit %i nicht passenden Dateien geschrieben.\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3452,12 +3470,12 @@ msgstr "Externen Problemlöser ausführen" msgid "Installing %s" msgstr "%s wird installiert." -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr "%s wird konfiguriert." -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr "%s wird entfernt." @@ -3478,82 +3496,82 @@ msgid "Running post-installation trigger %s" msgstr "Aufruf des Nach-Installations-Triggers %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, c-format msgid "Directory '%s' missing" msgstr "Verzeichnis »%s« fehlt" -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, c-format msgid "Could not open file '%s'" msgstr "Datei »%s« konnte nicht geöffnet werden." -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr "%s wird vorbereitet." -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr "%s wird entpackt." -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "Konfiguration von %s wird vorbereitet." -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr "%s installiert" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "Entfernen von %s wird vorbereitet." -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr "%s entfernt" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "Vollständiges Entfernen von %s wird vorbereitet." -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr "%s vollständig entfernt" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Schreiben des Protokolls nicht möglich, openpty() fehlgeschlagen (/dev/pts " "nicht eingebunden?)\n" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "Ausführen von dpkg" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "Operation wurde unterbrochen, bevor sie beendet werden konnte." -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "" "Es wurde kein Apport-Bericht verfasst, da das Limit MaxReports bereits " "erreicht ist." #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "Abhängigkeitsprobleme - verbleibt unkonfiguriert" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3561,7 +3579,7 @@ msgstr "" "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung darauf " "hindeutet, dass dies lediglich ein Folgefehler eines vorherigen Problems ist." -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3569,7 +3587,7 @@ msgstr "" "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler " "wegen voller Festplatte hindeutet." -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3577,7 +3595,7 @@ msgstr "" "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler " "wegen erschöpftem Arbeitsspeicher hindeutet." -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/dz.po b/po/dz.po index fbe317285..b53139823 100644 --- a/po/dz.po +++ b/po/dz.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po.pot\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2006-09-19 09:49+0530\n" "Last-Translator: Kinley Tshering \n" "Language-Team: Dzongkha \n" @@ -95,79 +95,79 @@ msgstr "བར་སྟོང་ལྷུག་ལྷུག་གི་བསྡ msgid "Total space accounted for: " msgstr "གི་དོན་ལུ་རྩིས་ཐོ་བཏོན་ཡོད་པའི་བར་སྟོང:" -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "ཐུམ་སྒྲིལ་ཡིག་སྣོད་ %sའདི་མཉམ་འབྱུང་གི་ཕྱི་ཁར་ཨིན་པས།" -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "ཐུམ་སྒྲིལ་ཚུ་མ་ཐོབ།" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 #, fuzzy msgid "You must give at least one search pattern" msgstr "ཁྱོད་ཀྱིས་ཏག་ཏག་སྦེ་དཔེ་གཞི་གཅིག་བྱིན་དགོ" -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "%sཐུམ་སྒྲིལ་འདི་ག་ཡོད་ཟཚོལ་མ་ཐོབ།" -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "ཐུམ་སྒྲིལ་གྱི་ཡིག་སྣོད:" -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "འདྲ་མཛོད་འདི་མཉམ་བྱུང་གི་ཕྱི་ཁར་ཨིན་པས་ ཐུམ་སྒྲིལ་ཡིག་སྣོད་ཅིག་ལུ་ ཨེགསི་-རེཕ་འབད་མི་ཚུགས་པས།" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "ཁབ་གཟེར་བཏབ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(མ་ཐོབ།)" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr "གཞི་བཙུགས་འབད་ཡོདཔ།" -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr "མི་ངོ:" -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(ཅི་མེད།)" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr "ཐུམ་སྒྲིལ་གྱི་ཁབ་གཟེར:" #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr "ཐོན་རིམ་ཐིག་ཁྲམ།:" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s་གི་དོན་ལུ་%s %sགུར་ཕྱོགས་སྒྲིག་འབད་ཡོད་པའི་%s %s\n" -#: cmdline/apt-cache.cc:1730 +#: cmdline/apt-cache.cc:1760 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -300,83 +300,101 @@ msgstr "" " -c=? འདི་གིས་འ་ནི་རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིན།\n" " -o=? མཐུན་སྒྲིག་གི་རིམ་སྒྲིག་འདི་གཞི་སྒྲིག་འབདཝ་ཨིན་ དཔེར་ན་-o dir::cache=/tmp་བཟུམ།\n" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +msgid "[Y/n]" +msgstr "" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" msgstr "ཝའི།" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" msgstr "" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོལ་བ་- %s" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཚུ་ལུ་རྟེན་འབྲེལ་མ་ཚང་པས:" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "འདི་འབདཝ་ད་%s་འདི་གཞི་བཙུགས་འབད་ཡོད།" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "འདི་འབདཝ་ད་%s་འདི་གཟི་བཙུགས་འབད་མི་བཏུབ་པས།" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "འདི་འབདཝ་ད་ འདི་བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་ཅིག་ཨིན་པས།" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མ་འབད་བས།" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མི་འབད་ནི་ཨིན་པས།" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr "ཡང་ན།" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་རྩ བསྐྲད་གཏང་འོང་:" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 msgid "The following packages have been kept back:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ལོག་སྟེ་རང་བཞག་ནུག:" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ཡར་བསྐྱེད་འབད་འོང་:" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "འོག་གི་ཐུམ་སྒྲལ་འདི་ཚུ་མར་ཕབ་འབད་འོང་:" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "འོག་གི་འཆང་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་བསྒྱུར་བཅོས་འབད་འོང་:" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s( %s་གིས་སྦེ)" -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -384,60 +402,60 @@ msgstr "" "ཉེན་བརྡ:འོག་གི་ཉོ་མཁོ་བའི་ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་གཏང་འོང་།\n" "ཁྱོད་ཀྱིས་ཁྱོད་རང་ག་ཅི་འབདཝ་ཨིན་ན་ངེས་སྦེ་མ་ཤེས་ཚུན་འདི་འབད་ནི་མི་འོང་།!" -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu་ཡར་བསྐྱེད་འབད་ཡོད་ %lu་འདི་གསརཔ་སྦེ་གཞི་བཙུགས་འབད་ཡོད།" -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "%lu་འདི་ལོག་གཞི་བཙུགས་འབད་ཡོད།" -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "%lu་འདི་མར་ཕབ་འབད་ཡོད།" -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "རྩ་བསྐྲད་འབད་ནི་ལུ་%lu་དང་%lu་ཡར་བསྐྱེད་མ་འབད་བས།\n" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu་འདི་ཆ་ཚང་སྦེ་གཞི་བཙུགས་མ་འབད་ཡང་ན་རྩ་བསྐྲད་མ་གཏང་པས།\n" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, fuzzy, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "དྲན་འཛིན་ རི་ཇེགསི་'%s'གི་དོན་ལུ་%s་སེལ་འཐུ་འབད་དོ།\n" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, fuzzy, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "དྲན་འཛིན་ རི་ཇེགསི་'%s'གི་དོན་ལུ་%s་སེལ་འཐུ་འབད་དོ།\n" -#: cmdline/apt-get.cc:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "གྱིས་བྱིན་ཏེ་ཡོད་པའི་ཐུམ་སྒྲིལ་%s་འདི་བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་ཅིག་ཨིན།\n" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr " [གཞི་བཙུགས་འབད་ཡོད།]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 #, fuzzy msgid " [Not candidate version]" msgstr "མི་ངོ་འཐོན་རིམཚུ།" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "ཁྱོད་ཀྱི་གཞི་བཙུགས་འབད་ནི་ལུ་གཏན་འཁལ་སྦེ་གཅིག་སེལ་འཐུ་འབད་དགོ" -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -448,138 +466,139 @@ msgstr "" "འདི་གིས་ཐུམ་སྒྲིལ་ཅིག་བརླག་སྟོར་ཞུགས་ཡོདཔ་ཨིནམ་སྟོནམ་ཨིནམ་དང་ ཕན་མེད་སྦེ་གནས་ཡོདཔ་ ཡང་ན་\n" "འདི་གཞན་འབྱུང་ཅིག་ནང་ལས་ལས་རྐྱངམ་ཅིག་འཐོབ་ཚུགསཔ་ཨིན་པས།\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "ག་དེ་སྦེ་ཨིན་རུང་འོག་གི་ཐུམ་སྒྲིལ་ཚུ་གིས་ འདི་ཚབ་བཙུགསཔ་ཨིན:" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, fuzzy, c-format msgid "Package '%s' has no installation candidate" msgstr "ཐུམ་སྒྲིལ་%s་ལུ་གཞི་བཙུགས་ཀྱི་མི་ངོ་མིན་འདུག" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "ཐུམ་སྒྲིལ་%s་འདི་གཞི་བཙུགས་མ་འབད་བས་ འདི་འབད་ནི་དི་གིས་རྩ་བསྐྲད་མ་གཏང་པས།་\n" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "ཐུམ་སྒྲིལ་%s་འདི་གཞི་བཙུགས་མ་འབད་བས་ འདི་འབད་ནི་དི་གིས་རྩ་བསྐྲད་མ་གཏང་པས།་\n" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, fuzzy, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "%s་གི་ཚབ་ལུ་%s་སེལ་འཐུ་འབད་ནི་སེམས་ཁར་བཞག\n" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "%s་གོམ་འགྱོ་འབད་དོ་ འདི་ཧེ་མ་ལས་རང་གཞི་བཙུགས་འབད་འོདཔ་དང་དུས་ཡར་བསྐྱེད་འབད་ནི་འདི་གཞི་སྒྲིག་མ་" "འབད་བས།\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, fuzzy, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "" "%s་གོམ་འགྱོ་འབད་དོ་ འདི་ཧེ་མ་ལས་རང་གཞི་བཙུགས་འབད་འོདཔ་དང་དུས་ཡར་བསྐྱེད་འབད་ནི་འདི་གཞི་སྒྲིག་མ་" "འབད་བས།\n" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "%s ་ལོག་གཞི་བཙུགས་འབད་ནི་འདི་མི་སྲིད་པ་ཅིག་ཨིན་པས་ འདི་ཕབ་ལེན་འབད་མི་བཏུབ་པས།\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རིམ་གསར་ཤོས་ཅིག་ཨིན།\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།" -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:913 #, fuzzy, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "(%s)གི་དོན་ལུ་སེལ་འཐུ་འབད་ཡོད་པའི་འཐོན་རིམ་'%s'(%s)\n" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, fuzzy, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "(%s)གི་དོན་ལུ་སེལ་འཐུ་འབད་ཡོད་པའི་འཐོན་རིམ་'%s'(%s)\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "རྟེན་འབྲེལ་ནོར་བཅོས་འབད་དོ།" -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr "འཐུས་ཤོར་བྱུང་ཡོད།" -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "རྟེན་འབྲེལ་འདི་ནོར་བཅོས་འབད་མི་ཚུགས་པས།" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "ཡར་བསྐྱེད་འབད་ཡོད་པའི་ཆ་ཚན་འདི་ཆུང་ཀུ་བཟོ་མི་ཚུགས་པས།" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr "འབད་ཚར་ཡི།" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "འ་ནི་འདི་ཚུ་ནོར་བཅོས་འབད་ནི་ལུ་ཁྱོད་ཀྱི་'apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་།" -#: cmdline/apt-get.cc:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "མ་ཚང་པའི་རྟེན་འབྲེལ་ཚུ། -f ལག་ལེན་འཐབ་སྟེ་འབད་རྩོལ་བསྐྱེད།" -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ཉེན་བརྡ:འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་བདེན་བཤད་འབད་མི་བཏུབ་པས།" -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "བདེན་བཤད་ཉེན་བརྡ་འདི་ཟུར་འབད་ཡོད།\n" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " -msgstr "བདེན་སྦྱོར་མ་འབད་བར་འ་ནི་ཐུམ་སྒྲིལ་འདི་ཚུ་གཞི་བཙུགས་འབད་ནི་ཨིན་ན་[y/N]? " +#: cmdline/apt-get.cc:1108 +#, fuzzy +msgid "Install these packages without verification?" +msgstr "བདེན་སྦྱོར་མ་འབད་བར་འ་ནི་ཐུམ་སྒྲིལ་འདི་ཚུ་གཞི་བཙུགས་འབད་ནི་ཨིན་ན་" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" msgstr "ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་བདེན་བཤད་འབད་མ་ཚུགས།" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "དཀའ་ངལ་ཚུ་ཡོདཔ་ལས་-y ་འདི་ --force-yes་མེདཐོག་ལས་ལག་ལེན་འཐབ་སྟེ་ཡོད།" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "ནང་འཁོད་ཀྱི་འཛོལ་བ་ གཞི་བཙུགས་ཐུམ་སྒྲིལ་ཚུ་ ཆད་པ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་དང་གཅིག་ཁར་བོད་བརྡ་འབད་འདི་" "ཡོད!" -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 msgid "Packages need to be removed but remove is disabled." msgstr "ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་བཏང་དགོཔ་འདུག་འདི་འབདགཝ་ད་རྩ་བསྐྲད་གཏང་ནི་འདི་ལྕོགས་མིན་ཐལ་ཏེ་འདུག" -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 msgid "Internal error, Ordering didn't finish" msgstr "ནང་འཁོད་འཛོལ་བ་ གོ་རིམ་བཟོ་ནི་ཚུ་མཇུག་མ་བསྡུ་བས།" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "ག་ཅི་གི་ཡ་མཚན་ཆེ་མི་ཆེ་ ཚད་འདི་གིས་ email apt@packages.debian.org་ལུ་མཐུན་སྒྲིག་མི་འབད་" @@ -587,54 +606,54 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "%sBལེན་ནི་ལུ་དགོཔ་པས། ཡིག་མཛོད་ཚི་གི་%sB་\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "ཡིག་མཛོད་ཀྱི་%sB་འདི་ལེན་དགོ་པས།\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, fuzzy, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "ཁ་སྐོང་གི་%sB་འདི་བཤུབ་པའི་ཤུལ་ལས་ཌིཀསི་གི་བར་སྟོང་དེ་ལག་ལེན་འཐབ་འོང་།\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, fuzzy, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "%sB་འདི་ཤུབ་པའི་ཤུལ་ལས་ཀྱི་བར་སྟོང་དེ་དལཝ་སྦེ་ལུས་འོང་།\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s་ནང་བར་སྟོང་" -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, c-format msgid "You don't have enough free space in %s." msgstr "%s ནང་ཁྱོད་ལུ་བར་སྟོང་དལཝ་ལངམ་སྦེ་མིན་འདུག" -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "གལ་ཆུང་རྐྱངམ་ཅིག་ཁསལ་བཀོད་འབད་ནུག་ འདི་འབདཝ་ད་འ་ནི་འདི་གལ་ཆུང་གི་བཀོལ་སྤྱོད་མེན།" #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "ཨིན་ ང་གིས་སླབ་དོ་བཟུམ་སྦེ་རང་འབད!" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -645,28 +664,29 @@ msgstr "" "འཕྲོ་མཐུད་འབད་ནིའི་དོན་ལུ་'%s'ཚིག་ཚན་ནང་ལུ་ཡིག་དཔར་རྐྱབས།\n" " ?] " -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "བར་བཤོལ་འབད།" -#: cmdline/apt-get.cc:1284 -msgid "Do you want to continue [Y/n]? " -msgstr "ཁྱོན་ཀྱི་འཕྲོ་མཐུད་ནི་འབད་ནི་ཨིན་ན་[Y/n]?" +#: cmdline/apt-get.cc:1313 +#, fuzzy +msgid "Do you want to continue?" +msgstr "ཁྱོན་ཀྱི་འཕྲོ་མཐུད་ནི་འབད་ནི་ཨིན་ན་" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "ཕབ་ལེན་ཐབས་ལམ་རྐྱངམ་གཅིག་ནང་མཇུག་བསྡུཝ་སྦེ་རང་ཕབ་ལེན་འབད།" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -674,19 +694,19 @@ msgstr "" "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་མི་ཚུགས་པས་ apt-get་དུས་མཐུན་བཟོ་ནི་གཡོག་བཀོལ་ནི་ཨིན་ན་ཡང་ན་--fix-" "missing་དང་གཅིག་ཁར་འབད་རྩོལ་བསྐྱེད་ནི་ཨིན་ན་?" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing་དང་བརྡ་ལམ་བརྗེ་སོར་འབད་ནི་འདི་ད་ལྟོ་ལས་རང་རྒྱབ་སྐྱོར་མི་འབད་བས།" -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "བརླག་སྟོར་ཞུགས་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་ནོར་བཅོས་འབད་མི་ཚུགས་པས།" -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "གཞི་བཙུགས་བར་བཤོལ་འབད་དོ།" -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -696,35 +716,35 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས།" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr "དུས་མཐུན་བཟོ་བའི་བརྡ་བཀོད་འདི་གིས་སྒྲུབ་རྟགས་ཚུ་མི་འབག་འབད།" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -740,16 +760,16 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 msgid "The following information may help to resolve the situation:" msgstr "འོག་གི་བརྡ་དོན་དེ་གིས་དུས་སྐབས་འདི་མོས་མཐུན་བཟོ་ནི་ལུ་གྲོགས་རམ་འབད་འོང་:" -#: cmdline/apt-get.cc:1824 +#: cmdline/apt-get.cc:1853 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -759,7 +779,7 @@ msgid_plural "" msgstr[0] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:" msgstr[1] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -767,21 +787,21 @@ msgid_plural "" msgstr[0] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:" msgstr[1] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:" -#: cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1866 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "ནང་འགོད་འཛོལ་བ་ ཡར་བསྐྱེད་ཀྱི་ཅ་ཆས་ཆ་མཉམ་མེདཔ་ཐལ་ཡོད།" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1984 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "འདི་ཚུ་ནོར་བཅོས་འབད་ནིའི་དོན་ལུ་ཁྱོད་ཀྱི་'apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་:" -#: cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -789,7 +809,7 @@ msgstr "" "མ་ཚང་བའི་རྟེན་འབྲེལ་ ཐུས་སྒྲིལ་མེད་མི་ཚུ་དང་གཅིག་ཁར་ 'apt-get -f install'དེ་འབཐ་རྩོལ་བསྐྱེདཔ།" "(ཡང་ན་ཐབས་ཤེས་ཅིག་གསལ་བཀོད་འབད།)" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:2002 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" @@ -800,85 +820,85 @@ msgstr "" "འབད་འབདཝ་འོང་ནི་མས་ ཡང་ན་ད་ལྟོ་ཡང་གསར་བསྐྲུན་མ་འབད་བར་ཡོད་པའི་ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་ཡང་ན་ནང་" "འབྱོར་གྱི་ཕྱི་ཁར་རྩ་བསྐྲད་བཏང་ཡོད་པའི་རྩ་བརྟན་མེད་པའི་བགོ་འགྲེམ་ཚུ་ལག་ལེན་འཐབ་དོ་ཡོདཔ་འོང་ནི་ཨིན་པས།" -#: cmdline/apt-get.cc:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "ཆད་པ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ།" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཐེབས་ཚུ་གཞི་བཙུགས་འབད་འོང་:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "བསམ་འཆར་བཀོད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "འོས་སྦྱོར་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "ཡར་བསྐྱེད་རྩིས་བཏོན་དོ་... " -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "འཐུས་ཤོར་བྱུང་ཡོད།" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "འབད་ཚར་ཡི།" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 msgid "Internal error, problem resolver broke stuff" msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།" -#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "ཕབ་ལེན་འབད་ནིའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབས་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 msgid "Must specify at least one package to fetch source for" msgstr "གི་དོན་ལུ་འབྱུང་ཁུངས་ལེན་ནི་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་ལེན་དགོ" -#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, c-format msgid "Unable to find a source package for %s" msgstr "%s་གི་དོན་ལུ་འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་ཅིག་འཚོལ་མ་འཐོབ" -#: cmdline/apt-get.cc:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, c-format msgid "" "Please use:\n" @@ -886,106 +906,106 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "གོམ་འགྱོ་གིས་ཧེ་མ་ལས་རང་'%s'་ཡིག་སྣོད་དེ་ཕབ་ལེན་འབད་ནུག\n" -#: cmdline/apt-get.cc:2604 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr " %s་ནང་ཁྱོད་ལུ་བར་སྟོང་ཚུ་ལངམ་སྦེ་མིན་འདུག་" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2644 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB་ལེན་དགོཔ་འདུག་ འབྱུང་ཁུངས་ཡིག་མཛོད་ཀྱི་%sB།\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2649 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "འབྱུང་ཁུངས་ཡིག་མཛོད་ཚུ་ཀྱི་%sB་ལེན་དགོ་པསས།\n" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "%s་འབྱུང་ཁུངས་ལེན།\n" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s་ནང་ཧེ་མ་ལས་སྦུང་ཚན་བཟོ་བཤོལ་ཨིན་མའི་སྦུང་ཚན་བཟོ་བཤོལ་གོམ་འགྱོ་འབད་དོ།\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s'སྦུང་ཚན་བཟོ་བཤོལ་འཐུས་ཤོར་བྱུང་ཡོད།\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n" -#: cmdline/apt-get.cc:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "'%s'་བཟོ་བརྩིགས་བརྡ་བཀོད་འཐུས་ཤོར་བྱུང་ཡོད།\n" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "ཆ་ལག་ལས་སྦྱོར་དེ་འཐུས་ཤོར་བྱུང་ནུག" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 msgid "Must specify at least one package to check builddeps for" msgstr "builddeps ཞིབ་དཔྱད་འབད་ནིའི་དོན་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་གསལ་བཀོད་འབད་དགོ" -#: cmdline/apt-get.cc:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་བརྡ་དོན་དེ་ལེན་མ་ཚུགས།" -#: cmdline/apt-get.cc:2839 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr "%s ལུ་བཟོ་བརྩིགས་རྟེན་འབྲེལ་མིན་འདུག\n" -#: cmdline/apt-get.cc:3009 +#: cmdline/apt-get.cc:3040 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "%sཐུམ་སྒྲིལ་འདི་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:3027 +#: cmdline/apt-get.cc:3058 #, 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:3050 +#: cmdline/apt-get.cc:3081 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%s:གི་དོན་ལུ་%s་རྟེན་འབྲེལ་དེ་གི་རེ་བ་སྐོང་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན་ གཞི་བཙུགས་འབད་ཡོད་པའི་ཐུམ་" "སྒྲིལ་%s་དེ་གནམ་མེད་ས་མེད་གསརཔ་ཨིན་པས།" -#: cmdline/apt-get.cc:3089 +#: cmdline/apt-get.cc:3120 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -994,37 +1014,37 @@ msgstr "" "%s གི་དོན་ལུ་%s་རྟེན་འབྲེལ་འདི་གི་རེ་བ་སྐོང་མི་ཚུགས་ནུག་ག་ཅི་འབད་ཟེར་བ་ཅིན་ཐུམ་སྒརིལ་%s་གི་འཐོན་རིམ་" "ཚུ་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་འཐོན་རིམ་དགོས་མཁོ་ཚུ་གི་རེ་བ་དོ་སྐོང་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:3095 +#: cmdline/apt-get.cc:3126 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "%sཐུམ་སྒྲིལ་འདི་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:3118 +#: cmdline/apt-get.cc:3149 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s: %s་གི་དོན་ལུ་་%s་རྟེན་འབྲེལ་འདི་ངལ་རངས་འབད་ནི་འཐུས་ཤོར་བྱུང་ནུག" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3164 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr " %s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་འདི་ངལ་རངས་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འདི་ལས་སྦྱོར་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "%s (%s)་ལུ་མཐུད་དོ།" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "རྒྱབ་སྐྱོར་འབད་ཡོད་པའི་ཚད་གཞི་ཚུ:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1108,12 +1128,12 @@ msgstr "" " -V བརྡ་དོན་ལེ་ཤཱ་གི་འཐོན་རིམ་ཨང་གྲངས་ཚུ་སྟོན།\n" " -c=? འ་ནི་རིམ་སྒྲིག་གི་ཡིག་སྣོད་འདི་ལྷག\n" " -o=? མཐུན་སྒྲིག་གདམ་ཁ་གི་རིམ་སྒྲིག་ཅིག་གཞི་བཙུགས་འབད་ དཔེན་ན་-o dir::cache=/tmp\n" -"བརྡ་དོན་དང་གདམ་ཁ་ཚུ་ཧེང་བཀལ་གི་དོན་ལུ་ apt-get(8)་ sources.list(5) དང་apt.conf(5)" -"ལག་ཐོག་\n" +"བརྡ་དོན་དང་གདམ་ཁ་ཚུ་ཧེང་བཀལ་གི་དོན་ལུ་ apt-get(8)་ sources.list(5) དང་apt." +"conf(5)ལག་ཐོག་\n" "ཤོག་ལེབ་ཚུ་ལུ་བལྟ།\n" " འ་ནི་ ཨེ་ཊི་པི་འདི་ལུ་ཡང་དག་ ཀའུ་ ནུས་ཤུགས་ཚུ་ཡོད།\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1184,8 +1204,8 @@ msgid "%s was already not hold.\n" msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རིམ་གསར་ཤོས་ཅིག་ཨིན།\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s་གི་དོན་ལུ་བསྒུག་སྡོད་ཅི་ འདི་འབདཝ་ད་ཕར་མིན་འདུག" @@ -1253,7 +1273,7 @@ msgstr "" msgid "Disk not found." msgstr "ཌིཀསི་དེ་འཚོལ་མ་ཐོབ།" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "ཡིག་སྣོད་འཚོལ་མ་ཐོབ།" @@ -1316,7 +1336,7 @@ msgstr "ནང་བསྐྱོད་ཡིག་ཚུགས་ བརྡ་ msgid "TYPE failed, server said: %s" msgstr "ཡིག་དཔར་རྐྱབ་མ་བཏུབ་སར་བར་གྱིས་སླབ་མས། %s" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "མཐུད་ལམ་ངལ་མཚམས" @@ -1324,8 +1344,8 @@ msgstr "མཐུད་ལམ་ངལ་མཚམས" msgid "Server closed the connection" msgstr "སར་བར་གྱིས་མཐུད་ལམ་འདི་ཁ་བསྡམས་ཏེ་ཡོདཔ་ཨིན།" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "འཛོལ་བ་ལྷབ།" @@ -1337,86 +1357,86 @@ msgstr "ལན་གྱིས་ གནད་ཁོངས་གུར་ལས msgid "Protocol corruption" msgstr "གནད་སྤེལ་ལམ་ལུགས་ ངན་ཅན།" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "འཛོལ་བ་འབྲི།" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "སོ་ཀེཊི་ཅིག་གསར་བསྐྲུན་འབད་མ་ཚུགས་པར་ཡོདཔ་ཨིན།" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "གནད་སྡུད་སོ་ཀེཊི་མཐུད་མ་ཚུགས་པར་ཡོདཔ་ཨིན་ མཐུད་ལམ་ངལ་མཚམས།" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "བྱ་ཡུལ་གྱི་སོ་ཀེཊི་མཐུད་མ་ཚུགས།" -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo་འདི་གིས་ཉན་ནིའི་སོ་ཀེཊི་ཅིག་ལེན་མ་ཚུགས།" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "སོ་ཀེཊི་ཅིག་བསྡམས་མ་ཚུགས།" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "སོ་ཀེཊི་གུར་ཉེན་མ་ཚུགས།" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "སོ་ཀེཊི་གི་མིང་འདི་གཏན་འབེབས་བཟོ་མ་ཚུགས།" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "འདྲེན་ལམ་གྱི་བརྡ་བཀོད་འདི་བཏང་མ་ཚུགས།" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "མ་ཤེས་པའི་ཁ་བྱང་གི་རིགས་ཚན་%u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "ཨི་པི་ཨར་ཊི་ འཐུས་ཤོར་བྱུང་ཡོད་ སར་བར་གིས་སླབ་མས:%s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "གནད་སྡུད་སོ་ཀེཊི་ མཐུད་ནི་ངལ་མཚམས་བྱུང་ནུག" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "མཐུད་ལམ་འདི་དང་ལེན་འབད་མ་ཚུགས།" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "ཡིག་སྣོད་ལུ་་དྲྭ་རྟགས་བཀལ་བའི་བསྒང་དཀའ་ངལ།" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "ཡིག་སྣོད་ལེན་མ་ཚུགས་ སར་བར་'%s'གིས་སླབ་མས" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "གནད་སྡུད་སོ་ཀེཊི་ངལ་མཚམས།" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "གནད་སྡུད་གནས་སོར་དེ་འཐུས་ཤོར་བྱུང་ཡོད་ སར་བར་'%s'་གིས་སླབ་མས།" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "འདྲི་དཔྱད།" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "ལས་བཀོལ་འབད་མ་ཚུགས།" @@ -1452,7 +1472,7 @@ msgstr " %s:%s (%s)ལུ་མཐུད་མ་ཚུགས།" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "%s་ལུ་མཐུད་དོ།" @@ -1482,40 +1502,40 @@ msgstr "'%s:%s' (%i)་མོས་མཐུན་འབདཝ་ད་ངན་ msgid "Unable to connect to %s:%s:" msgstr "%s %s:ལུ་མཐུད་མ་ཚུགས།" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:167 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "ནང་འཁོད་འཛོལ་བ: མིང་རྟགས་འདི་ལེགས་ཤོམ་ཅིག་འདུག་ འདི་འབདཝ་ད་མཛུབ་རྗེས་ལྡེ་མིག་དེ་གཏན་འབེབས་བཟོ་" "མ་ཚུགས?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "ཉུང་མཐའ་རང་ནུས་མེད་ཀྱི་མིང་རྟགས་ཅིག་གདོང་ཐུག་བྱུང་སྟེ་ཡོདཔ་ཨིན།" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:173 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "མིང་རྟགས་བདེན་སྦྱོར་འབད་ནི་ལུ་'%s'འདི་ལག་ལེན་འཐབ་མ་ཚུགས། (gpgv་དེ་ཁཞི་བཙུགས་འབད་ཡོདཔ་ཨིན་ན།?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "gpgv་ལག་ལེན་འཐབ་ནི་ལུ་མ་ཤེས་པའི་འཛོལ་བ་།" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 msgid "The following signatures were invalid:\n" msgstr "འོག་གི་མིང་རྟགས་ཚུ་ནུས་མེད་ཨིན་པས།:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1554,59 +1574,59 @@ msgstr "འ་ནི་ ཨེཆི་ཊི་ཊི་པི་ སར་བ msgid "Unknown date format" msgstr "མ་ཤེས་པའི་ཚེས་རྩ་སྒྲིག" -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "སེལ་འཐུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "མཐུད་ལམ་ངལ་མཚམས་འབད་ཡོད།" -#: methods/http.cc:855 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "ཨའུཊི་པུཊི་ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "ཡིག་སྣོད་འདི་ལུ་འབྲིཝ་ད་འཛོལ་བ།" -#: methods/http.cc:928 +#: methods/http.cc:927 msgid "Error reading from server. Remote end closed connection" msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ། ཐག་རིང་མཇུག་གི་མཐུད་ལམ་དེ་ཁ་བསྡམས།" -#: methods/http.cc:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ།" -#: methods/http.cc:1198 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "མགོ་ཡིག་གནད་སྡུད་བྱང་ཉེས།" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "བཐུད་ལམ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "ནང་འཁོད་འཛོལ་བ།" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "%s་འདི་ལུ་ལྷག་མ་ཚུགས།" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1655,7 +1675,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "ཡན་ལག་ལས་སྦྱོར་ལུ་ཨའི་པི་སི་རྒྱུད་དུང་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "དུས་སུ་མ་འབབ་པ་རང་མཐུད་ལམ་འདི་ག་བསྡམས་ཡོད།" @@ -2144,11 +2164,11 @@ msgstr "ནུས་མེད་ཡིག་མཛོད་འཐུས་མི msgid "Invalid archive member header" msgstr "ནུས་མེད་ཡིག་མཛོད་འཐུས་མི་གི་མགོ་ཡིག་" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "ཡིག་མཛོད་འདི་གནམ་མེད་ས་མེད་ཐུང་ཀུ་འདུག" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "ཡིག་མཛོད་མགོ་ཡིག་ཚུ་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" @@ -2473,7 +2493,7 @@ msgstr "ནུས་མེད་བཀོལ་སྤྱོད་%s" msgid "Unable to stat the mount point %s" msgstr "སྦྱར་བརྩེགས་ས་ཚིགས་%s་འདི་ངོ་བཤུས་འབད་མ་ཚུགས།" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "སི་ཌི་རོམ་འདི་ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" @@ -2492,102 +2512,102 @@ msgstr "%s ལྷག་ནི་རྐྱངམ་ཅིག་འབད་མི msgid "Could not open lock file %s" msgstr "ལྡེ་མིག་རྐྱབས་ཡོད་པའི་ཡིག་སྣོད་%s་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "ཨེན་ཨེཕ་ཨེསི་ %s སྦྱར་བརྩེགས་འབད་ཡོད་པའི་ལྡེ་མིག་ཡིག་སྣོད་ཀྱི་དོན་ལུ་ལྡེ་མིག་རྐྱབ་ནི་ལག་ལེན་མི་འཐབ་པས།" -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "%sལྡེ་མིག་རྐྱབ་ནི་ལེན་མ་ཚུགས།" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བགོས་ཀྱི་སྐྱོན་ཅིག་ཐོབ་ཡོདཔ་ཨིན།" -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བགོས་ཀྱི་སྐྱོན་ཅིག་ཐོབ་ཡོདཔ་ཨིན།" -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "ཡན་ལག་ལས་སྦྱོར་%s་གིས་འཛོལ་བའི་ཨང་རྟགས་(%u)ཅིག་སླར་ལོག་འབད་ཡོདཔ་ཨིན།" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "ཡན་ལག་ལས་སྦྱོར་་%s་གིས་རེ་བ་མེད་པར་ཕྱིར་ཐོན་ཡོདཔ་ཨིན།" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "%s་གི་དོན་ལུ་རྒྱུད་དུང་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "ཡན་ལག་ལས་སྦྱོར་ ཨའི་པི་སི་ གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "ཨེབ་འཕྲུལ་ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "ལྷག་ ད་ལྟོ་ཡང་ལྷག་ནི་ལུ་%lu་ཡོད་འདི་འབདཝ་ད་ཅི་ཡང་ལྷག་ལུས་མིན་འདུག" -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "འབྲི་ ད་ལྟོ་ཡང་འབྲི་ནི་ལུ་%lu་ཡོད་འདི་འདབཝ་ད་འབད་མ་ཚུགས།" -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "ཡིག་སྣོད་འདི་ཁ་བསྡམས་པའི་བསྒང་དཀའ་ངལ།" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "ཡིག་སྣོད་འདི་འབྲེལལམ་མེདཔ་བཟོ་བའི་བསྒང་དཀའ་ངལ།" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།" @@ -2786,19 +2806,19 @@ msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐི msgid "Type '%s' is not known on line %u in source list %s" msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2823,7 +2843,7 @@ msgstr "" "ཐུམ་སྒྲིལ་%s་འདི་ལོག་འདི་རང་གཞི་བཙུགས་འབད་དགོཔ་འདུག་ འདི་འབདཝ་ད་འདི་གི་དོན་ལུ་ཡིག་མཛོད་ཅིག་འཚོལ་" "མ་ཐོབ།" -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2831,11 +2851,11 @@ msgstr "" "འཛོལ་བ་ pkgProblemResolver::གིས་བཟོ་བཏོན་འབད་ཡོད་པའི་མཚམས་དེ་ཚུ་མོས་མཐུན་བཟོཝ་ཨིན འ་ནི་ཐུམ་" "སྒྲིལ་ཚུ་འཛིན་པའི་རྒྱུ་རྐྱེན་ལས་བརྟེན་ཨིན་པས།" -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "དཀའ་ངལ་འདི་ནོར་བཅོས་འབད་མ་ཚུགས་ ཁྱོད་ཀྱི་ཐུམ་སྒྲིལ་ཆད་པ་ཚུ་འཆང་འདི་འདུག" -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3006,41 +3026,41 @@ msgstr "%s (%s -> %s)བསྐྱར་མིང་བཏགས་ནི་འ msgid "MD5Sum mismatch" msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 #, fuzzy msgid "Hash Sum mismatch" msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "འོག་གི་ ཨའི་ཌི་་ ལྡེ་མིག་ཚུ་གི་དོན་ལུ་མི་དམང་གི་ལྡེ་མིག་འདི་འཐོབ་མི་ཚུགས་པས:\n" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3048,12 +3068,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3062,7 +3082,7 @@ msgstr "" " %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ " "འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག (arch འདི་བྱིག་སོངམ་ལས་བརྟེན།)" -#: apt-pkg/acquire-item.cc:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3071,14 +3091,14 @@ msgstr "" " %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ " "འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག " -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "ཐུམ་སྒྲིལ་ ཟུར་ཐོ་ཡིག་སྣོད་ཚུ་ངན་ཅན་འགྱོ་ནུག ཡིག་སྣོད་ཀྱི་མིང་མིན་འདུག: %s་ཐུམ་སྒྲིལ་གྱི་དོན་ལུ་ས་སྒོ།" -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "ཚད་མ་མཐུན།" @@ -3199,22 +3219,22 @@ msgstr "འབྱུང་ཁུངས་ཀྱི་ཐོ་ཡིག་གས msgid "Source list entries for this disc are:\n" msgstr "འ་ནི་ ཌིསིཀ་གི་དོན་ལུ་ འབྱུང་ཁུངས་ཧྲིལ་བུ་ཚུ་:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "%i་དྲན་མཐོ་དེ་ཚུ་བྲིས་ཡོད།\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i བྱིག་འགྱོ་ཡོད་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ %i དྲན་ཐོ་འདི་ཚུ་བྲིས་ཡོད།\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i་མཐུན་སྒྲིག་མེདཔ་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ %i་དྲན་ཐོ་ཚུ་བྲིས་བཞག་ཡོདཔ་ཨིན།\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3303,12 +3323,12 @@ msgstr "" msgid "Installing %s" msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr "%s་རིམ་སྒྲིག་འབད་དོ།" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr "%s་རྩ་བསྐྲད་གཏང་དོ།" @@ -3329,96 +3349,96 @@ msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "ཐོ་བཀོད་འབད་མི་སྣོད་ཐོ་%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་ཏེ་འདུག" -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr "%s་ གྲ་སྒྲིག་འབད་དོ།" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr " %s་ གི་སྦུང་ཚན་བཟོ་བཤོལ་འབད་དོ།" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "%s་ རིམ་སྒྲིག་ལུ་གྲ་སྒྲིག་འབད་དོ།" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "%s་ རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr "རྩ་བསྐྲད་བཏང་ཡོད་པའི་%s" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/el.po b/po/el.po index 305e2f1d3..5bfc14dac 100644 --- a/po/el.po +++ b/po/el.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_el\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2008-08-26 18:25+0300\n" "Last-Translator: Θανάσης Νάτσης \n" "Language-Team: Greek \n" @@ -101,78 +101,78 @@ msgstr "Σύνολο χώρου ασφαλείας: " msgid "Total space accounted for: " msgstr "Συνολικός Καταμετρημένος Χώρος: " -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "Το αρχείο πακέτου %s δεν είναι ενημερωμένο." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Δε βρέθηκαν πακέτα" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 msgid "You must give at least one search pattern" msgstr "Πρέπει να δώσετε τουλάχιστον ένα μοτίβο αναζήτησης" -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Αδυναμία εντοπισμού του πακέτου %s" -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "Αρχεία Πακέτου:" -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Η cache δεν είναι ενημερωμένη, αδυναμία παραπομπής σε ένα αρχείο πακέτου" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "Καθηλωμένα Πακέτα:" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(δε βρέθηκαν)" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr " Εγκατεστημένα: " -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr " Υποψήφιο: " -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(κανένα)" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr " Καθήλωση Πακέτου: " #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr " Πίνακας Έκδοσης:" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s για %s είναι μεταγλωττισμένο σε %s %s\n" -#: cmdline/apt-cache.cc:1730 +#: cmdline/apt-cache.cc:1760 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -306,83 +306,101 @@ msgstr "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +msgid "[Y/n]" +msgstr "[Ν/ο]" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "[ν/Ο]" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" -msgstr "Y" +msgstr "" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" msgstr "" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "σφάλμα μεταγλωτισμου - %s" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξαρτήσεις:" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "αλλά το %s είναι εγκατεστημένο" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "αλλά το %s πρόκειται να εγκατασταθεί" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "αλλά δεν είναι εγκαταστάσημο" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "αλλά είναι ένα εικονικό πακέτο" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "αλλά δεν είναι εγκατεστημένο" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "αλλά δεν πρόκειται να εγκατασταθεί" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr " η" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "Τα ακόλουθα ΝΕΑ πακέτα θα εγκατασταθούν:" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "Τα ακόλουθα πακέτα θα ΑΦΑΙΡΕΘΟΥΝ:" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 msgid "The following packages have been kept back:" msgstr "Τα ακόλουθα πακέτα θα μείνουν ως έχουν:" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "Τα ακόλουθα πακέτα θα αναβαθμιστούν:" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "Τα ακόλουθα πακέτα θα ΥΠΟΒΑΘΜΙΣΤΟΥΝ:" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "Τα ακόλουθα κρατημένα πακέτα θα αλλαχθούν:" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s (λόγω του %s) " -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -390,59 +408,59 @@ msgstr "" "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα απαραίτητα πακέτα θα αφαιρεθούν\n" "Αυτό ΔΕΝ θα έπρεπε να συμβεί, εκτός αν ξέρετε τι ακριβώς κάνετε!" -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu αναβαθμίστηκαν, %lu νέο εγκατεστημένα, " -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "%lu επανεγκατεστημένα," -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "%lu υποβαθμισμένα, " -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu θα αφαιρεθούν και %lu δεν αναβαθμίζονται.\n" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκαν.\n" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, fuzzy, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%s'\n" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, fuzzy, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%s'\n" -#: cmdline/apt-get.cc:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Το πακέτο %s είναι εικονικό και παρέχεται από τα:\n" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr " [Εγκατεστημένα]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 msgid " [Not candidate version]" msgstr "[Μγ Υποψήφια Εκδόση]" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "Θα πρέπει επακριβώς να επιλέξετε ένα για εγκατάσταση." -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -454,140 +472,140 @@ msgstr "" "Αυτό σημαίνει ότι το πακέτο αυτό λείπει, είναι παλαιωμένο, ή είναι διαθέσιμο " "από άλλη πηγή\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "Πάραυτα το ακόλουθο πακέτο το αντικαθιστά:" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, c-format msgid "Package '%s' has no installation candidate" msgstr "Το πακέτο %s δεν έχει υποψήφια εγκατάσταση" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "Εικονικά πακέτα όπως το '%s' δεν μπορούν να αφαιρεθούν\n" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "" "Το πακέτο %s δεν είναι εγκατεστημένο και δεν θα αφαιρεθεί. Εννοείτε '%s'?\n" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "Το πακέτο %s δεν είναι εγκατεστημένο και δεν θα αφαιρεθεί\n" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "Σημείωση, επιλέχθηκε το %s αντί του %s\n" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Παράκαμψη του %s, είναι εγκατεστημένο και η αναβάθμιση δεν έχει οριστεί.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "" "Παράκαμψη του %s, είναι εγκατεστημένο και μόνο αναβαθμίσεις έχουν οριστεί.\n" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "Η επανεγκατάσταση του %s δεν είναι εφικτή, δεν είναι δυνατή η μεταφόρτωσή " "του\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "το %s είναι ήδη η τελευταία έκδοση.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "το %s έχει εγκατασταθεί με το χέρι\n" -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:913 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "Επιλέχθηκε η έκδοση %s (%s) για το %s\n" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "Επιλέχθηκε η έκδοση %s (%s) για το %s λόγω του %s\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "Διόρθωση εξαρτήσεων..." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr " απέτυχε." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "Αδύνατη η διόρθωση των εξαρτήσεων" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "Αδύνατη η ελαχιστοποίηση του συνόλου αναβαθμίσεων" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr " Ετοιμο" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" "Ίσως να πρέπει να τρέξετε apt-get -f install για να διορθώσετε αυτά τα " "προβλήματα." -#: cmdline/apt-get.cc:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε με το -f." -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα πακέτα δεν εξακριβώθηκαν!" -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "Παράκαμψη προειδοποίησης ταυτοποίησης.\n" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " -msgstr "Εγκατάσταση των πακέτων χωρίς επαλήθευση [ν/Ο]; " +#: cmdline/apt-get.cc:1108 +msgid "Install these packages without verification?" +msgstr "Εγκατάσταση των πακέτων χωρίς επαλήθευση;" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" msgstr "Μερικά πακέτα δεν εξαακριβώθηκαν" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "Υπάρχουν προβλήματα και δώσατε -y χωρίς το --force-yes" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Εσωτερικό σφάλμα, έγινε κλήση του Install Packages με σπασμένα πακέτα!" -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 msgid "Packages need to be removed but remove is disabled." msgstr "" "Μερικά πακέτα πρέπει να αφαιρεθούν αλλά η Αφαίρεση είναι απενεργοποιημένη." -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 msgid "Internal error, Ordering didn't finish" msgstr "Εσωτερικό Σφάλμα, η Ταξινόμηση δεν ολοκληρώθηκε" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Πολύ περίεργο! Τα μεγέθη δεν ταιριάζουν, στείλτε μήνυμα στο apt@packages." @@ -595,21 +613,21 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB από αρχεία.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB από αρχεία.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" @@ -617,33 +635,33 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Μετά από αυτή τη λειτουργία, θα ελευθερωθούν %sB χώρου από το δίσκο.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Couldn't determine free space in %s" msgstr "Δεν μπόρεσα να προσδιορίσω τον ελεύθερο χώρο στο %s" -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, c-format msgid "You don't have enough free space in %s." msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Καθορίσατε συνηθισμένο, αλλά αυτή δεν είναι μια συνηθισμένη εργασία" #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "Ναι, κανε ότι λέω!" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -654,28 +672,28 @@ msgstr "" "Για να συνεχίσετε πληκτρολογήστε τη φράση '%s'\n" " ?] " -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "Εγκατάλειψη." -#: cmdline/apt-get.cc:1284 -msgid "Do you want to continue [Y/n]? " -msgstr "Θέλετε να συνεχίσετε [Ν/ο]; " +#: cmdline/apt-get.cc:1313 +msgid "Do you want to continue?" +msgstr "Θέλετε να συνεχίσετε;" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Αποτυχία ανάκτησης του %s %s\n" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "Για μερικά αρχεία απέτυχε η μεταφόρτωση" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -683,20 +701,20 @@ msgstr "" "Αδύνατη η μεταφόρτωση μερικών αρχείων, ίσως αν δοκιμάζατε με apt-get update " "ή το --fix-missing;" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "" "ο συνδυασμός --fix-missing με εναλλαγή μέσων δεν υποστηρίζεται για την ώρα" -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "Αδύνατη η επίλυση των χαμένων πακέτων." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "Εγκατάλειψη της εγκατάστασης." -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -706,36 +724,36 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Επιλογή του %s ώς λίστας πηγαίων πακέτων αντί της %s\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr "Η εντολή update δεν παίρνει ορίσματα" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Δεν επιτρέπεται οποιαδήποτε διαγραφή· αδυναμία εκκίνησης του AutoRemover" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -753,15 +771,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 msgid "The following information may help to resolve the situation:" msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:" -#: cmdline/apt-get.cc:1824 +#: cmdline/apt-get.cc:1853 msgid "Internal Error, AutoRemover broke stuff" msgstr "Εσωτερικό Σφάλμα, το AutoRemover δημιούργησε κάποιο πρόβλημα" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -771,7 +789,7 @@ msgstr[0] "Το ακόλουθο πακέτο εγκαταστάθηκε αυτ msgstr[1] "" "Τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χρειάζονται πλέον:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -781,21 +799,21 @@ msgstr[0] "" msgstr[1] "" "%lu τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χρειάζονται πλέον:" -#: cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1866 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Χρησιμοποιήστε 'apt-get autoremove' για να το διαγράψετε." msgstr[1] "Χρησιμοποιήστε 'apt-get autoremove' για να τα διαγράψετε." -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "Εσωτερικό Σφάλμα, η διαδικασία αναβάθμισης χάλασε" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1984 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Aν τρέξετε 'apt-get -f install' ίσως να διορθώσετε αυτά τα προβλήματα:" -#: cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -803,7 +821,7 @@ msgstr "" "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε 'apt-get -f install' χωρίς να ορίσετε " "πακέτο (ή καθορίστε μια λύση)." -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:2002 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" @@ -815,89 +833,89 @@ msgstr "" "διανομή, ότι μερικά από τα πακέτα δεν έχουν ακόμα δημιουργηθεί ή έχουν\n" "μετακινηθεί από τα εισερχόμενα." -#: cmdline/apt-get.cc:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "Χαλασμένα πακέτα" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "Προτεινόμενα πακέτα:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "Συνιστώμενα πακέτα:" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "Αδύνατη η εύρεση του πακέτου %s" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "το %s έχει εγκατασταθεί αυτόματα\n" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "Υπολογισμός της αναβάθμισης... " -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "Απέτυχε" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "Ετοιμο" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 msgid "Internal error, problem resolver broke stuff" msgstr "" "Εσωτερικό Σφάλμα, η προσπάθεια επίλυσης του προβλήματος \"έσπασε\" κάποιο " "υλικό" -#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 msgid "Must specify at least one package to fetch source for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον " "κωδικάτου" -#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, c-format msgid "Unable to find a source package for %s" msgstr "Αδυναμία εντοπισμού του κώδικά του πακέτου %s" -#: cmdline/apt-get.cc:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, c-format msgid "" "Please use:\n" @@ -905,86 +923,86 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Παράκαμψη του ήδη μεταφορτωμένου αρχείου `%s`\n" -#: cmdline/apt-get.cc:2604 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2644 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB πηγαίου κώδικα.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2649 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "Μεταφόρτωση Κωδικα %s\n" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών." -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "Απέτυχε η εντολή χτισίματος %s.\n" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "Η απογονική διεργασία απέτυχε" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 msgid "Must specify at least one package to check builddeps for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του" -#: cmdline/apt-get.cc:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s" -#: cmdline/apt-get.cc:2839 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n" -#: cmdline/apt-get.cc:3009 +#: cmdline/apt-get.cc:3040 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -993,7 +1011,7 @@ msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το %s δεν επιτρέπεται στο " "πακέτο %s" -#: cmdline/apt-get.cc:3027 +#: cmdline/apt-get.cc:3058 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1001,14 +1019,14 @@ msgid "" msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε" -#: cmdline/apt-get.cc:3050 +#: cmdline/apt-get.cc:3081 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s " "είναι νεώτερο" -#: cmdline/apt-get.cc:3089 +#: cmdline/apt-get.cc:3120 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1017,7 +1035,7 @@ msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες " "εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις της έκδοσης" -#: cmdline/apt-get.cc:3095 +#: cmdline/apt-get.cc:3126 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1026,30 +1044,30 @@ msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν έχει " "υποψήφιαέκδοση" -#: cmdline/apt-get.cc:3118 +#: cmdline/apt-get.cc:3149 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3164 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, c-format msgid "Changelog for %s (%s)" msgstr "Changelog για %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "Υποστηριζόμενοι Οδηγοί:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1134,7 +1152,7 @@ msgstr "" "για περισσότερες πληροφορίες και επιλογές.\n" " This APT has Super Cow Powers.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1205,8 +1223,8 @@ msgid "%s was already not hold.\n" msgstr "το %s είναι ήδη η τελευταία έκδοση.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Αναμονή του %s, αλλά δε βρισκόταν εκεί" @@ -1273,7 +1291,7 @@ msgstr "Αδυναμία απόσυναρμογής του CD-ROM στο %s, μ msgid "Disk not found." msgstr "Ο δίσκος δεν βρέθηκε." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "Το αρχείο Δε Βρέθηκε" @@ -1336,7 +1354,7 @@ msgstr "Η εντολή '%s' στο σενάριο εισόδου απέτυχε msgid "TYPE failed, server said: %s" msgstr "Η εντολή TYPE απέτυχε, ο διακομιστής απάντησε: %s" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "Λήξη χρόνου σύνδεσης" @@ -1344,8 +1362,8 @@ msgstr "Λήξη χρόνου σύνδεσης" msgid "Server closed the connection" msgstr "Ο διακομιστής έκλεισε την σύνδεση" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "Σφάλμα ανάγνωσης" @@ -1357,86 +1375,86 @@ msgstr "Το μήνυμα απάντησης υπερχείλισε την εν msgid "Protocol corruption" msgstr "Αλλοίωση του πρωτοκόλλου" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "Σφάλμα εγγραφής" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "Αδύνατη η δημιουργία μιας υποδοχής (socket)" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "Αδύνατη η σύνδεση υποδοχής δεδομένων, λήξη χρόνου σύνδεσης" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "Αδύνατη η σύνδεση σε παθητική υποδοχή (socket)." -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "Το getaddrinfo ήταν αδύνατο να δέσμευση υποδοχή παρακολούθησης" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "Αδύνατη η πρόσδεση στην υποδοχή (socket)" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "Αδύνατη η παρακολούθηση της υποδοχής (socket)" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "Αδύνατος ο καθορισμός του ονόματος της υποδοχής (socket)" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "Αδύνατη η αποστολή της εντολής PORT" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Άγνωστη οικογένεια διευθύνσεων %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "Το EPRT απέτυχε, ο διακομιστής απάντησε: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "Λήξη χρόνου σύνδεσης στην υποδοχή δεδομένων" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "Αδύνατη η αποδοχή συνδέσεων" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "Πρόβλημα κατά το hashing του αρχείου" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Αδυναμία λήψης του αρχείου, ο διακομιστής απάντησε '%s'" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "Λήξη χρόνου υποδοχής δεδομένων" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Αποτυχία κατά τη μεταφορά δεδομένων, ο διακομιστής απάντησε '%s'" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "Επερώτηση" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "Αδύνατη η εκτέλεση" @@ -1472,7 +1490,7 @@ msgstr "Αδύνατη η σύνδεση στο %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "Σύνδεση στο %s" @@ -1502,18 +1520,18 @@ msgstr "Κάτι παράξενο συνέβη κατά την εύρεση το msgid "Unable to connect to %s:%s:" msgstr "Αδύνατη η σύνδεση στο %s %s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:167 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Εσωτερικό σφάλμα: Η υπογραφή είναι καλή, αλλά αδυναμία προσδιορισμού του " "αποτυπώματος?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Βρέθηκε τουλάχιστον μια μη έγκυρη υπογραφή." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:173 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" @@ -1521,22 +1539,22 @@ msgstr "" "εγκατεστημένο το gpgv;)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "Άγνωστο σφάλμα κατά την εκτέλεση του gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 msgid "The following signatures were invalid:\n" msgstr "Οι παρακάτω υπογραφές ήταν μη έγκυρες:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1576,60 +1594,60 @@ msgstr "Ο διακομιστής http δεν υποστηρίζει πλήρω msgid "Unknown date format" msgstr "Άγνωστη μορφή ημερομηνίας" -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "Η επιλογή απέτυχε" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "Λήξη χρόνου σύνδεσης" -#: methods/http.cc:855 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "Σφάλμα στην εγγραφή στο αρχείο" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "Σφάλμα στην εγγραφή στο αρχείο" -#: methods/http.cc:928 +#: methods/http.cc:927 msgid "Error reading from server. Remote end closed connection" msgstr "" "Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση" -#: methods/http.cc:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "Σφάλμα στην ανάγνωση από το διακομιστή" -#: methods/http.cc:1198 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "Ελαττωματικά δεδομένα επικεφαλίδας" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "Η σύνδεση απέτυχε" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "Εσωτερικό Σφάλμα" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "Αδύνατη η ανάγνωση του %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1678,7 +1696,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "Αποτυχία κατά τη δημιουργία διασωλήνωσης IPC στην υποδιεργασία" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "Η σύνδεση έκλεισε πρόωρα" @@ -1715,8 +1733,8 @@ msgstr "" msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" -"πριν από το μήνυμα αυτό έχει σημασία. Παρακαλώ διορθώστε τα και τρέξτε [I]" -"nstall ξανά" +"πριν από το μήνυμα αυτό έχει σημασία. Παρακαλώ διορθώστε τα και τρέξτε " +"[I]nstall ξανά" #: dselect/update:30 msgid "Merging available information" @@ -2166,11 +2184,11 @@ msgstr "Μη έγκυρη επικεφαλίδα μέλος της αρχειο msgid "Invalid archive member header" msgstr "Μη έγκυρη επικεφαλίδα μέλος της αρχειοθήκης" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "Η αρχειοθήκη είναι πολύ μικρή" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "Αποτυχία ανάγνωσης των επικεφαλίδων της αρχειοθήκης" @@ -2499,7 +2517,7 @@ msgstr "Μη έγκυρη λειτουργία %s" msgid "Unable to stat the mount point %s" msgstr "Αδύνατη η εύρεση της κατάστασης του σημείου επαφής %s" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "Αδύνατη η εύρεση της κατάστασης του cdrom" @@ -2519,103 +2537,103 @@ msgstr "" msgid "Could not open lock file %s" msgstr "Αδύνατο το άνοιγμα του αρχείου κλειδώματος %s" -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Δε θα χρησιμοποιηθεί κλείδωμα για το συναρμοσμένο από nfs αρχείο κλειδώματος " "%s" -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "Αδύνατο το κλείδωμα %s" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμερισμού (segfault)" -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμερισμού (segfault)" -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Η υποδιεργασία %s επέστρεψε ένα κωδικός σφάλματος (%u)" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Η υποδιεργασία %s εγκατέλειψε απρόσμενα" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "Αδύνατο το άνοιγμα του αρχείου %s" -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "Αδύνατο το άνοιγμα διασωλήνωσης για το %s" -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "Αποτυχία δημιουργίας IPC στην υποδιεργασία" -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "Αποτυχία εκτέλεσης του συμπιεστή " -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "αναγνώστηκαν, απομένουν ακόμη %lu για ανάγνωση αλλά δεν απομένουν άλλα" -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "γράφτηκαν, απομένουν %lu για εγγραφή αλλά χωρίς επιτυχία" -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Πρόβλημα κατά το κλείσιμο του αρχείου" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Πρόβλημα κατά την διαγραφή του αρχείου" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου" @@ -2813,19 +2831,19 @@ msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγ msgid "Type '%s' is not known on line %u in source list %s" msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος " -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Αδύνατο το άνοιγμα του αρχείου %s" -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2850,7 +2868,7 @@ msgstr "" "Το πακέτο '%s' χρειάζεται να επανεγκατασταθεί, αλλά είναι αδύνατη η εύρεση " "κάποιας κατάλληλης αρχείοθήκης." -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2858,11 +2876,11 @@ msgstr "" "Σφάλμα, το pkgProblemResolver::Resolve παρήγαγε διακοπές, αυτό ίσως " "προκλήθηκε από κρατούμενα πακέτα." -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "Αδύνατη η διόρθωση προβλημάτων, έχετε κρατούμενα ελαττωματικά πακέτα." -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3040,40 +3058,40 @@ msgstr "απέτυχε η μετονομασία, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "Ανόμοιο MD5Sum" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 msgid "Hash Sum mismatch" msgstr "Ανόμοιο MD5Sum" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "Δεν υπάρχει διαθέσιμο δημόσιο κλειδί για τα ακολουθα κλειδιά:\n" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3081,12 +3099,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3095,7 +3113,7 @@ msgstr "" "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)" -#: apt-pkg/acquire-item.cc:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3104,7 +3122,7 @@ msgstr "" "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3112,7 +3130,7 @@ msgstr "" "Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο " "πακέτο %s." -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "Ανόμοιο μέγεθος" @@ -3234,22 +3252,22 @@ msgstr "Eγγραφή νέας λίστας πηγών\n" msgid "Source list entries for this disc are:\n" msgstr "Οι κατάλογοι με τις πηγές αυτού του δίσκου είναι: \n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "Εγιναν %i εγγραφές.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Εγιναν %i εγγραφές με %i ασύμβατα αρχεία.\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία και %i ασύμβατα αρχεία\n" @@ -3336,12 +3354,12 @@ msgstr "" msgid "Installing %s" msgstr "Εγκατάσταση του %s" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr "Ρύθμιση του %s" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr "Αφαιρώ το %s" @@ -3362,98 +3380,98 @@ msgid "Running post-installation trigger %s" msgstr "Εκτέλεση του post-installation trigger %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, c-format msgid "Directory '%s' missing" msgstr "Ο φάκελος %s αγνοείται." -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Αδύνατο το άνοιγμα του αρχείου %s" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr "Προετοιμασία του %s" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr "Ξεπακετάρισμα του %s" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "Προετοιμασία ρύθμισης του %s" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr "Έγινε εγκατάσταση του %s" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "Προετοιμασία για την αφαίρεση του %s" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr "Αφαίρεσα το %s" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "Προετοιμασία πλήρης αφαίρεσης του %s" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr "Το %s διαγράφηκε πλήρως" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Αδυναμία εγγραφής στο αρχείο γεγονότων, λόγω αποτυχίας του openpyt() (είναι " "προσαρτημένο το /dev/pts;)\n" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/es.po b/po/es.po index dea136d4d..645bc5dfc 100644 --- a/po/es.po +++ b/po/es.po @@ -33,7 +33,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.10\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2011-01-24 11:47+0100\n" "Last-Translator: Javier Fernández-Sanguino Peña \n" "Language-Team: Debian Spanish \n" @@ -146,78 +146,78 @@ msgstr "Espacio desperdiciado total: " msgid "Total space accounted for: " msgstr "Espacio registrado total: " -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "El archivo de paquetes %s está desincronizado." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "No se encontró ningún paquete" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 msgid "You must give at least one search pattern" msgstr "Debe proporcionar al menos un patrón de búsqueda" -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "No se ha podido localizar el paquete %s" -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "Archivos de paquetes:" -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Caché fuera de sincronismo, no se puede hacer x-ref a un archivo de paquetes" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "Paquetes con pin:" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(no encontrado)" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr " Instalados: " -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr " Candidato: " -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(ninguno)" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr " Pin del paquete: " #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr " Tabla de versión:" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s para %s compilado en %s %s\n" -#: cmdline/apt-cache.cc:1730 +#: cmdline/apt-cache.cc:1760 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -354,83 +354,101 @@ msgstr "" " -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::\n" " cache=/tmp\n" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +msgid "[Y/n]" +msgstr "[S/n]" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "[s/N]" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" msgstr "" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Error de compilación de expresiones regulares - %s" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "Los siguientes paquetes tienen dependencias incumplidas:" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "pero %s está instalado" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "pero %s va a ser instalado" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "pero no es instalable" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "pero es un paquete virtual" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "pero no está instalado" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "pero no va a instalarse" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr " o" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "Se instalarán los siguientes paquetes NUEVOS:" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "Los siguientes paquetes se ELIMINARÁN:" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 msgid "The following packages have been kept back:" msgstr "Los siguientes paquetes se han retenido:" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "Se actualizarán los siguientes paquetes:" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "Se DESACTUALIZARÁN los siguientes paquetes:" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "Se cambiarán los siguientes paquetes retenidos:" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s (por %s) " -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -438,59 +456,59 @@ msgstr "" "AVISO: Se van a eliminar los siguientes paquetes esenciales.\n" "¡NO debe hacerse a menos que sepa exactamente lo que está haciendo!" -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu actualizados, %lu se instalarán, " -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "%lu desactualizados, " -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu para eliminar y %lu no actualizados.\n" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu no instalados del todo o eliminados.\n" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "Nota, seleccionando «%s» para la tarea «%s»\n" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "Nota, seleccionando «%s» para la expresión regular «%s»\n" -#: cmdline/apt-get.cc:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "El paquete %s es un paquete virtual provisto por:\n" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr " [Instalado]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 msgid " [Not candidate version]" msgstr " [No es la versión candidata]" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "Necesita seleccionar explícitamente uno para instalar." -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -501,136 +519,136 @@ msgstr "" "a él. Esto puede significar que el paquete falta, está obsoleto o sólo se\n" "encuentra disponible desde alguna otra fuente\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "Sin embargo, los siguientes paquetes lo reemplazan:" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, c-format msgid "Package '%s' has no installation candidate" msgstr "El paquete «%s» no tiene un candidato para la instalación" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "No pueden eliminarse los paquetes virtuales como «%s»\n" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "El paquete %s no está instalado, no se eliminará\n" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "El paquete %s no está instalado, no se eliminará\n" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "Nota, seleccionando «%s» en lugar de «%s»\n" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Ignorando %s, ya está instalado y no está activada la actualización.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "" "Ignorando %s, no está instalado y sólo se están solicitando " "actualizaciones.\n" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "No es posible reinstalar el paquete %s, no se puede descargar.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ya está en su versión más reciente.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "fijado %s como instalado manualmente.\n" -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:913 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "Versión seleccionada «%s» (%s) para «%s»\n" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, fuzzy, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "Versión seleccionada «%s» (%s) para «%s»\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "Corrigiendo dependencias..." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr " falló." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "No se puede corregir las dependencias" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "No se puede minimizar el conjunto de actualización" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr " Listo" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 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:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "Dependencias incumplidas. Pruebe de nuevo usando -f." -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVISO: ¡No se han podido autenticar los siguientes paquetes!" -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "Aviso de autenticación ignorado.\n" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " -msgstr "¿Instalar estos paquetes sin verificación [s/N]? " +#: cmdline/apt-get.cc:1108 +msgid "Install these packages without verification?" +msgstr "¿Instalar estos paquetes sin verificación?" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" msgstr "Algunos paquetes no se pueden autenticar" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "Hay problemas y se utilizó -y sin --force-yes" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Error interno, ¡se llamó a «InstallPackages» con paquetes rotos!" -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 msgid "Packages need to be removed but remove is disabled." msgstr "" "Los paquetes necesitan eliminarse pero está deshabilitado la posibilidad de " "eliminar." -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 msgid "Internal error, Ordering didn't finish" msgstr "Error interno, no terminó la ordenación" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Qué raro.. Los tamaños no concuerdan, mande un correo a apt@packages.debian." @@ -638,21 +656,21 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Se necesita descargar %sB/%sB de archivos.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Necesito descargar %sB de archivos.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" @@ -660,33 +678,33 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Se liberarán %sB después de esta operación.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Couldn't determine free space in %s" msgstr "No pude determinar el espacio libre en %s" -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, c-format msgid "You don't have enough free space in %s." msgstr "No tiene suficiente espacio libre en %s." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Se especificó Trivial Only pero ésta no es una operación trivial." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "Sí, ¡haga lo que le digo!" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -697,28 +715,28 @@ msgstr "" "Para continuar escriba la frase «%s»\n" " ?] " -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "Abortado." -#: cmdline/apt-get.cc:1284 -msgid "Do you want to continue [Y/n]? " -msgstr "¿Desea continuar [S/n]? " +#: cmdline/apt-get.cc:1313 +msgid "Do you want to continue?" +msgstr "¿Desea continuar?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Imposible obtener %s %s\n" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "No se pudieron descargar algunos archivos" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "Descarga completa y en modo de sólo descarga" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -726,19 +744,19 @@ msgstr "" "No se pudieron obtener algunos archivos, ¿quizás deba ejecutar «apt-get " "update» o deba intentarlo de nuevo con --fix-missing?" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "Actualmente no están soportados --fix-missing e intercambio de medio" -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "No se pudieron corregir los paquetes que faltan." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "Abortando la instalación." -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -752,36 +770,36 @@ msgstr[1] "" "Los paquetes mostrados a continuación han desaparecido de su sistema\n" "dado que todos sus ficheros han sido sobreescritos por otros paquetes:" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Nota: Dpkg realiza esto de forma automática y a propósito." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Ignorar la distribución objetivo no disponible «%s» del paquete «%s»" -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Escogiendo «%s» como paquete fuente en lugar de «%s»\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Ignorar la versión no disponible «%s» del paquete «%s»" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr "El comando de actualización no toma argumentos" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 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:1817 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -799,15 +817,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 msgid "The following information may help to resolve the situation:" msgstr "La siguiente información puede ayudar a resolver la situación:" -#: cmdline/apt-get.cc:1824 +#: cmdline/apt-get.cc:1853 msgid "Internal Error, AutoRemover broke stuff" msgstr "Error interno, «AutoRemover» rompió cosas" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -820,7 +838,7 @@ msgstr[1] "" "Los paquetes indicados a continuación se instalaron de forma automática y ya " "no son necesarios." -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -829,22 +847,22 @@ msgstr[0] "Se instaló de forma automática %lu paquete y ya no es necesario.\n" msgstr[1] "" "Se instalaron de forma automática %lu paquetes y ya no son necesarios.\n" -#: cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1866 #, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Utilice «apt-get autoremove» para eliminarlos." msgstr[1] "Utilice «apt-get autoremove» para eliminarlos." -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "Error Interno, AllUpgrade rompió cosas" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1984 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:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -852,7 +870,7 @@ msgstr "" "Dependencias incumplidas. Intente «apt-get -f install» sin paquetes (o " "especifique una solución)." -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:2002 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" @@ -864,79 +882,79 @@ msgstr "" "inestable, que algunos paquetes necesarios no han sido creados o han\n" "sido movidos fuera de Incoming." -#: cmdline/apt-get.cc:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "Paquetes rotos" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "Se instalarán los siguientes paquetes extras:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "Paquetes sugeridos:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "Paquetes recomendados:" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "No se pudo encontrar el paquete %s" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "fijado %s como instalado automáticamente.\n" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "Calculando la actualización... " -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "Falló" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "Listo" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 msgid "Internal error, problem resolver broke stuff" msgstr "" "Error interno, el sistema de solución de problemas rompió algunas cosas" -#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "No se puede bloquear el directorio de descarga" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 msgid "Must specify at least one package to fetch source for" msgstr "Debe especificar al menos un paquete para obtener su código fuente" -#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, 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:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -946,7 +964,7 @@ msgstr "" "versiones «%s» en:\n" "%s\n" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, fuzzy, c-format msgid "" "Please use:\n" @@ -958,87 +976,87 @@ msgstr "" "para obtener las últimas actualizaciones (posiblemente no publicadas aún) " "del paquete.\n" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Omitiendo el fichero ya descargado «%s»\n" -#: cmdline/apt-get.cc:2604 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr "No tiene suficiente espacio libre en %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2644 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Necesito descargar %sB/%sB de archivos fuente.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2649 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Necesito descargar %sB de archivos fuente.\n" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "Fuente obtenida %s\n" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "No se pudieron obtener algunos archivos." -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, 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:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Falló la orden de desempaquetamiento «%s».\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, 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:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "Falló la orden de construcción «%s».\n" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "Falló el proceso hijo" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 msgid "Must specify at least one package to check builddeps for" msgstr "" "Debe especificar al menos un paquete para verificar sus dependencias de " "construcción" -#: cmdline/apt-get.cc:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "No se pudo obtener información de dependencias de construcción para %s" -#: cmdline/apt-get.cc:2839 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr "%s no tiene dependencias de construcción.\n" -#: cmdline/apt-get.cc:3009 +#: cmdline/apt-get.cc:3040 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -1047,7 +1065,7 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque no se puede encontrar " "el paquete %s" -#: cmdline/apt-get.cc:3027 +#: cmdline/apt-get.cc:3058 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1056,14 +1074,14 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque no se puede encontrar " "el paquete %s" -#: cmdline/apt-get.cc:3050 +#: cmdline/apt-get.cc:3081 #, 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:3089 +#: cmdline/apt-get.cc:3120 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1072,7 +1090,7 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque ninguna versión " "disponible del paquete %s satisface los requisitos de versión" -#: cmdline/apt-get.cc:3095 +#: cmdline/apt-get.cc:3126 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1081,30 +1099,30 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque no se puede encontrar " "el paquete %s" -#: cmdline/apt-get.cc:3118 +#: cmdline/apt-get.cc:3149 #, 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:3133 +#: cmdline/apt-get.cc:3164 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "No se pudieron satisfacer las dependencias de construcción de %s." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "No se pudieron procesar las dependencias de construcción" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Conectando a %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "Módulos soportados:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1190,12 +1208,12 @@ msgstr "" " -c=? Lee este archivo de configuración\n" " -o=? Establece una opción de configuración arbitraria, p. ej. \n" " -o dir::cache=/tmp\n" -"Consulte las páginas del manual de apt-get(8), sources.list(5) y apt.conf" -"(5)\n" +"Consulte las páginas del manual de apt-get(8), sources.list(5) y apt." +"conf(5)\n" "para más información y opciones.\n" " Este APT tiene poderes de Super Vaca.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1270,8 +1288,8 @@ msgid "%s was already not hold.\n" msgstr "%s ya está en su versión más reciente.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperaba %s pero no estaba allí" @@ -1338,7 +1356,7 @@ msgstr "No pude desmontar el CD-ROM de %s, tal vez todavía este en uso." msgid "Disk not found." msgstr "Disco no encontrado." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "Fichero no encontrado" @@ -1401,7 +1419,7 @@ msgstr "Falló la orden «%s» del script de entrada, el servidor dijo: %s" msgid "TYPE failed, server said: %s" msgstr "Tipo (TYPE) falló, el servidor dijo: %s" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "La conexión expiró" @@ -1409,8 +1427,8 @@ msgstr "La conexión expiró" msgid "Server closed the connection" msgstr "El servidor cerró la conexión" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "Error de lectura" @@ -1422,86 +1440,86 @@ msgstr "No pude crear un socket." msgid "Protocol corruption" msgstr "Fallo del protocolo" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "Error de escritura" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "No pude crear un socket" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "No pude conectar el socket de datos, expiró el tiempo de conexión" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "No pude conectar un socket pasivo." -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo no pude obtener un socket oyente" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "No pude ligar un socket" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "No pude escuchar en el socket" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "No pude determinar el nombre del socket" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "No pude mandar la orden PORT" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Dirección de familia %u desconocida (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT falló, el servidor dijo: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "Expiró conexión a socket de datos" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "No pude aceptar la conexión" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "Se produjo un problema al hacer un hash del archivo" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Imposible traer archivo, el servidor dijo «%s»" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "Expiró el socket de datos" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Falló transferencia de datos, el servidor dijo «%s»" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "Consulta" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "No pude invocar " @@ -1537,7 +1555,7 @@ msgstr "No pude conectarme a %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "Conectando a %s" @@ -1567,39 +1585,39 @@ msgstr "Algo raro pasó al resolver «%s:%s» (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "No se pudo conectar a %s:%s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:167 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:170 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Se encontró al menos una firma inválida." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:173 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "No se pudo ejecutar «gpgv» para verificar la firma (¿está instalado gpgv?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "Error desconocido ejecutando gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 msgid "The following signatures were invalid:\n" msgstr "Las siguientes firms fueron inválidas:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1639,59 +1657,59 @@ msgstr "Éste servidor de http tiene el soporte de alcance roto" msgid "Unknown date format" msgstr "Formato de fecha desconocido" -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "Falló la selección" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "Expiró la conexión" -#: methods/http.cc:855 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "Error escribiendo al archivo de salida" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "Error escribiendo a archivo" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "Error escribiendo al archivo" -#: methods/http.cc:928 +#: methods/http.cc:927 msgid "Error reading from server. Remote end closed connection" msgstr "Error leyendo del servidor, el lado remoto cerró la conexión." -#: methods/http.cc:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "Error leyendo del servidor" -#: methods/http.cc:1198 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "Mala cabecera Data" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "Fallo la conexión" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "Error interno" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "No pude leer %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1744,7 +1762,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "Falló la creación de una tubería IPC para el subproceso" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "La conexión se cerró prematuramente" @@ -1781,8 +1799,8 @@ msgstr "" msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" -"encima de este mensaje son importantes. Por favor, corríjalas y ejecute «[I]" -"nstall» otra vez" +"encima de este mensaje son importantes. Por favor, corríjalas y ejecute " +"«[I]nstall» otra vez" #: dselect/update:30 msgid "Merging available information" @@ -2235,11 +2253,11 @@ msgstr "Cabecera de miembro del archivo inválida %s" msgid "Invalid archive member header" msgstr "Cabecera de miembro del archivo inválida" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "El archivo es muy pequeño" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "No pude leer las cabeceras del archivo" @@ -2573,7 +2591,7 @@ msgstr "Operación inválida: %s" msgid "Unable to stat the mount point %s" msgstr "No se puede obtener información del punto de montaje %s" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "No pude montar el cdrom" @@ -2592,101 +2610,101 @@ msgstr "No se utiliza bloqueos para el fichero de bloqueo de sólo lectura %s" msgid "Could not open lock file %s" msgstr "No se pudo abrir el fichero de bloqueo «%s»" -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "No se utilizan bloqueos para el fichero de bloqueo de montaje nfs %s" -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "No se pudo bloquear %s" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "El subproceso %s recibió un fallo de segmentación." -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, c-format msgid "Sub-process %s received signal %u." msgstr "El subproceso %s recibió la señal %u." -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "El subproceso %s devolvió un código de error (%u)" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "El subproceso %s terminó de forma inesperada" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "No pude abrir el fichero %s" -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, c-format msgid "Could not open file descriptor %d" msgstr "No se pudo abrir el descriptor de fichero %d" -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "No se pudo crear el subproceso IPC" -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "No se pudo ejecutar el compresor " -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "leídos, todavía debía leer %lu pero no queda nada" -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "escritos, todavía tenía que escribir %lu pero no pude hacerlo" -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, c-format msgid "Problem closing the file %s" msgstr "Se produjo un problema al cerrar el fichero %s" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Se produjo un problema al renombrar el fichero %s a %s" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, c-format msgid "Problem unlinking the file %s" msgstr "Se produjo un problema al desligar el fichero %s" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "Se produjo un problema al sincronizar el fichero" @@ -2890,7 +2908,7 @@ msgstr "Línea %u mal formada en la lista de fuentes %s (tipo)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipo «%s» desconocido en la línea %u de lista de fuentes %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2900,12 +2918,12 @@ msgstr "" "de manual con «man 5 apt.conf» bajo «APT::Immediate-Configure» para más " "información. (%d)" -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "No pude abrir el fichero «%s»" -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2930,7 +2948,7 @@ msgstr "" "El paquete %s necesita ser reinstalado, pero no se encuentra un archivo para " "éste." -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2938,12 +2956,12 @@ msgstr "" "Error, pkgProblemResolver::Resolve generó cortes, esto puede haber sido " "causado por paquetes retenidos." -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "" "No se pudieron corregir los problemas, usted ha retenido paquetes rotos." -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3120,42 +3138,42 @@ msgstr "falló el cambio de nombre, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "La suma MD5 difiere" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 msgid "Hash Sum mismatch" msgstr "La suma hash difiere" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "No se pudo leer el archivo «Release» %s" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "" "No existe ninguna clave pública disponible para los siguientes " "identificadores de clave:\n" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribución conflictiva: %s (se esperaba %s, pero se obtuvo %s)" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3166,12 +3184,12 @@ msgstr "" "GPG es: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "Error de GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3181,7 +3199,7 @@ msgstr "" "que necesita arreglar manualmente este paquete (debido a que falta una " "arquitectura)" -#: apt-pkg/acquire-item.cc:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3190,7 +3208,7 @@ msgstr "" "No se pudo localizar un archivo para el paquete %s. Esto puede significar " "que necesita arreglar manualmente este paquete." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3198,7 +3216,7 @@ msgstr "" "Los archivos de índice de paquetes están dañados. No existe un campo " "«Filename:» para el paquete %s." -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "El tamaño difiere" @@ -3322,22 +3340,22 @@ msgstr "Escribiendo nueva lista de fuente\n" msgid "Source list entries for this disc are:\n" msgstr "Las entradas de la lista de fuentes para este disco son:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "%i registros escritos.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i registros escritos con %i fichero de menos.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i registros escritos con %i fichero mal emparejado\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3435,12 +3453,12 @@ msgstr "" msgid "Installing %s" msgstr "Instalando %s" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr "Configurando %s" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr "Eliminando %s" @@ -3461,82 +3479,82 @@ msgid "Running post-installation trigger %s" msgstr "Ejecutando disparador post-instalación %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, c-format msgid "Directory '%s' missing" msgstr "Falta el directorio «%s»." -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, c-format msgid "Could not open file '%s'" msgstr "No pude abrir el fichero «%s»" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr "Preparando %s" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr "Desempaquetando %s" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "Preparándose para configurar %s" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr "%s instalado" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "Preparándose para eliminar %s" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr "%s eliminado" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparándose para eliminar completamente %s" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr "Se borró completamente %s" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "No pudo escribirse el registro, falló la llamada a openpty() (¿está montado " "«/dev/pts?)\n" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "Ejecutando dpkg" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "" "No se escribió ningún informe «apport» porque ya se ha alcanzado el valor de " "«MaxReports»" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "problemas de dependencias - dejando sin instalar" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3544,7 +3562,7 @@ msgstr "" "No se escribió un informe «apport» porque el mensaje de error indica que es " "un mensaje de error asociado a un fallo previo." -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3552,7 +3570,7 @@ msgstr "" "No se escribió un informe «apport» porque el mensaje de error indica que el " "error es de disco lleno" -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3560,7 +3578,7 @@ msgstr "" "No se escribió un informe «apport» porque el mensaje de error indica un " "error de memoria excedida" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/eu.po b/po/eu.po index 8cea79e8f..a270c4bf8 100644 --- a/po/eu.po +++ b/po/eu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_eu\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2009-05-17 00:41+0200\n" "Last-Translator: Piarres Beobide \n" "Language-Team: Euskara \n" @@ -92,80 +92,80 @@ msgstr "Guztira galdutako tokia:" msgid "Total space accounted for: " msgstr "Guztira erregistratutako lekua: " -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "%s pakete fitxategia ez dago sinkronizatuta." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Ez da paketerik aurkitu" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 #, fuzzy msgid "You must give at least one search pattern" msgstr "Zehazki eredu bat eman behar duzu." -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Ezin da %s paketea lokalizatu" -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "Pakete Fitxategiak:" -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Katxea ez dago sinkronizatuta, ezin zaio erreferentziarik (x-ref) egin " "pakete fitxategi bati" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "Pin duten Paketeak:" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(ez da aurkitu)" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr " Instalatuta: " -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr " Hautagaia: " -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(bat ere ez)" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr " Paketearen pin-a:" #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr " Bertsio taula:" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s %s-rentzat %s %s-ean konpilatua\n" -#: cmdline/apt-cache.cc:1730 +#: cmdline/apt-cache.cc:1760 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -296,83 +296,101 @@ msgstr "" " -c=? Irakurri konfigurazio fitxategi hau\n" " -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +msgid "[Y/n]" +msgstr "[B/e]" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "[b/E]" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" -msgstr "Y" +msgstr "" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" msgstr "" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Adierazpen erregularren konpilazio errorea - %s" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "Ondorengo paketeetan bete gabeko mendekotasunak daude:" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "baina %s instalatuta dago" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "baina %s instalatzeko dago" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "baina ez da instalagarria" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "baina pakete birtuala da" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "baina ez dago instalatuta" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "baina ez da instalatuko" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr " edo" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "Ondorengo pakete BERRIAK instalatuko dira:" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "Ondorengo paketeak KENDUKO dira:" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 msgid "The following packages have been kept back:" msgstr "Ondorengo paketeak mantendu egin dira:" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "Ondorengo paketeak bertsio-berrituko dira:" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "Ondorengo paketeak AURREKO BERTSIORA itzuliko dira:" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "Ondorengo pakete atxikiak aldatu egingo dira:" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s (arrazoia: %s) " -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -380,60 +398,60 @@ msgstr "" "KONTUZ: Ondorengo funtsezko paketeak kendu egingo dira\n" "EZ ezazu horrelakorik egin, ez badakizu ondo zertan ari zaren!" -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu bertsio berritua(k), %lu berriki instalatuta, " -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "%lu berrinstalatuta, " -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "%lu aurreko bertsiora itzulita, " -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu kentzeko, eta %lu bertsio-berritu gabe.\n" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ez erabat instalatuta edo kenduta.\n" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, fuzzy, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\n" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, fuzzy, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\n" -#: cmdline/apt-get.cc:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "%s pakete birtual bat da, honek hornitua:\n" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr " [Instalatuta]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 #, fuzzy msgid " [Not candidate version]" msgstr "Hautagaien bertsioak" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "Zehazki bat hautatu behar duzu instalatzeko." -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -444,132 +462,132 @@ msgstr "" "egiten dio. Beharbada paketea faltako da, edo zaharkituta egongo da, edo \n" "beste iturburu batean bakarrik egongo da erabilgarri\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "Baina ondorengo paketeek ordezten dute:" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, fuzzy, c-format msgid "Package '%s' has no installation candidate" msgstr "%s paketeak ez du instalatzeko hautagairik" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, fuzzy, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "Oharra, %s hautatzen %s(r)en ordez\n" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "%s saltatzen. Instalatuta dago, eta ez dago bertsio-berritzerik.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, fuzzy, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "%s saltatzen. Instalatuta dago, eta ez dago bertsio-berritzerik.\n" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "%s berriro instalatzea ez da posible; ezin da deskargatu.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "%s bertsiorik berriena da jada.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s eskuz instalatua bezala ezarri.\n" -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:913 #, fuzzy, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "Hautatutako bertsioa: %s (%s) -- %s\n" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, fuzzy, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "Hautatutako bertsioa: %s (%s) -- %s\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "Mendekotasunak zuzentzen..." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr " : huts egin du." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "Ezin dira mendekotasunak zuzendu" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "Ezin da bertsio berritzeko multzoa minimizatu" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr " Eginda" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Beharbada 'apt-get -f install' exekutatu nahiko duzu zuzentzeko." -#: cmdline/apt-get.cc:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "Bete gabeko mendekotasunak. Probatu -f erabiliz." -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 msgid "WARNING: The following packages cannot be authenticated!" msgstr "KONTUZ: Hurrengo paketeak ezin dira egiaztatu!" -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "Egiaztapen abisua gainidazten.\n" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " -msgstr "Paketeak egiaztapen gabe instalatu [b/E]? " +#: cmdline/apt-get.cc:1108 +msgid "Install these packages without verification?" +msgstr "Paketeak egiaztapen gabe instalatu?" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" msgstr "Zenbait pakete ezin dira egiaztatu" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "Arazoak daude, eta -y erabili da --force-yes gabe" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Barne errorea, InstallPackages apurturiko paketeez deitu da!" -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 msgid "Packages need to be removed but remove is disabled." msgstr "Paketeak ezabatu beharra dute baina Ezabatzea ezgaiturik dago." -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 msgid "Internal error, Ordering didn't finish" msgstr "Barne errorea, ez da ordenatzeaz amaitu" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Hau bitxia.. Tamainak ez dira berdina, idatzi apt@packages.debian.org-ra " @@ -577,54 +595,54 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Artxiboetako %sB/%sB eskuratu behar dira.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Artxiboetako %sB eskuratu behar dira.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Ekintza honen ondoren, %sB gehiago erabiliko dira diskoan.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Ekintza honen ondoren, %sB libratuko dira diskoan.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Couldn't determine free space in %s" msgstr "Ezin da %s(e)n duzun leku librea atzeman." -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, c-format msgid "You don't have enough free space in %s." msgstr "Ez daukazu nahikoa leku libre %s(e)n." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "'Trivial Only' zehaztu da, baina hau ez da eragiketa tribial bat." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "Bai, egin esandakoa!" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -635,28 +653,28 @@ msgstr "" "Jarraitzeko, idatzi '%s' esaldia\n" " ?] " -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "Abortatu." -#: cmdline/apt-get.cc:1284 -msgid "Do you want to continue [Y/n]? " -msgstr "Aurrera jarraitu nahi al duzu [B/e]? " +#: cmdline/apt-get.cc:1313 +msgid "Do you want to continue?" +msgstr "Aurrera jarraitu nahi al duzu?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ezin da lortu %s %s\n" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "Fitxategi batzuk ezin izan dira deskargatu" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "Deskarga amaituta eta deskarga soileko moduan" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -664,19 +682,19 @@ msgstr "" "Ezin izan dira artxibo batzuk lortu; beharbada apt-get update exekutatu, edo " "--fix-missing aukerarekin saiatu?" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing eta euskarri aldaketa ez dira onartzen oraingoz" -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "Falta diren paketeak ezin dira zuzendu." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "Abortatu instalazioa." -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -686,35 +704,35 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Ezin da atzitu %s iturburu paketeen zerrenda" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr "Eguneratzeko komandoak ez du argumenturik hartzen" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Suposatu ez dugun zerbait ezabatuko da, ezin da AutoRemover abiarazi" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -732,15 +750,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 msgid "The following information may help to resolve the situation:" msgstr "Informazio honek arazoa konpontzen lagun dezake:" -#: cmdline/apt-get.cc:1824 +#: cmdline/apt-get.cc:1853 msgid "Internal Error, AutoRemover broke stuff" msgstr "Barne Errorea, AutoRemover-ek zerbait apurtu du" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -754,7 +772,7 @@ msgstr[1] "" "Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago " "behar." -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -766,22 +784,22 @@ msgstr[1] "" "Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago " "behar." -#: cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1866 #, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "'apt-get autoremove' erabili ezabatzeko." msgstr[1] "'apt-get autoremove' erabili ezabatzeko." -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1984 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Beharbada 'apt-get -f install' exekutatu nahiko duzu hauek zuzentzeko:" -#: cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -789,7 +807,7 @@ msgstr "" "Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo " "zehaztu konponbide bat)." -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:2002 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" @@ -801,85 +819,85 @@ msgstr "" "beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n" "Sarrerakoetan (Incoming) egoten jarraituko dute." -#: cmdline/apt-get.cc:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "Hautsitako paketeak" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "Ondorengo pakete gehigarriak instalatuko dira:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "Iradokitako paketeak:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "Gomendatutako paketeak:" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "Ezin izan da %s paketea aurkitu" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "%s eskuz instalatua bezala ezarri.\n" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "Berriketak kalkulatzen... " -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "Huts egin du" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "Eginda" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 msgid "Internal error, problem resolver broke stuff" msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du" -#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "Ezin da deskarga direktorioa blokeatu" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 msgid "Must specify at least one package to fetch source for" msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko" -#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, c-format msgid "Unable to find a source package for %s" msgstr "Ezin da iturburu paketerik aurkitu %s(r)entzat" -#: cmdline/apt-get.cc:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, c-format msgid "" "Please use:\n" @@ -887,87 +905,87 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n" -#: cmdline/apt-get.cc:2604 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr "Ez daukazu nahikoa leku libre %s(e)n." #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2644 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Iturburu artxiboetako %sB/%sB eskuratu behar dira.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2649 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Iturburu artxiboetako %sB eskuratu behar dira.\n" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "Eskuratu %s iturburua\n" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "Huts egin du zenbat artxibo lortzean." -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n" -#: cmdline/apt-get.cc:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "Eraikitzeko '%s' komandoak huts egin du.\n" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "Prozesu umeak huts egin du" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 msgid "Must specify at least one package to check builddeps for" msgstr "" "Gutxienez pakete bat zehaztu behar duzu eraikitze mendekotasunak egiaztatzeko" -#: cmdline/apt-get.cc:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ezin izan da %s(r)en eraikitze mendekotasunen informazioa eskuratu" -#: cmdline/apt-get.cc:2839 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr "%s: ez du eraikitze mendekotasunik.\n" -#: cmdline/apt-get.cc:3009 +#: cmdline/apt-get.cc:3040 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -975,7 +993,7 @@ msgid "" msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" -#: cmdline/apt-get.cc:3027 +#: cmdline/apt-get.cc:3058 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -983,14 +1001,14 @@ msgid "" msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" -#: cmdline/apt-get.cc:3050 +#: cmdline/apt-get.cc:3081 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: instalatutako %3$s " "paketea berriegia da" -#: cmdline/apt-get.cc:3089 +#: cmdline/apt-get.cc:3120 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -999,7 +1017,7 @@ msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, ez baitago bertsio-eskakizunak " "betetzen dituen %3$s paketearen bertsio erabilgarririk" -#: cmdline/apt-get.cc:3095 +#: cmdline/apt-get.cc:3126 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1007,30 +1025,30 @@ msgid "" msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" -#: cmdline/apt-get.cc:3118 +#: cmdline/apt-get.cc:3149 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: %3$s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3164 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s(r)en eraikitze mendekotasunak ezin izan dira bete." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "Huts egin du eraikitze mendekotasunak prozesatzean" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Konektatzen -> %s.(%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "Onartutako Moduluak:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1117,7 +1135,7 @@ msgstr "" "sources.list(5) eta apt.conf(5) orrialdeak eskuliburuan.\n" " APT honek Super Behiaren Ahalmenak ditu.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1188,8 +1206,8 @@ msgid "%s was already not hold.\n" msgstr "%s bertsiorik berriena da jada.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s espero zen baina ez zegoen han" @@ -1257,7 +1275,7 @@ msgstr "" msgid "Disk not found." msgstr "Ez da diska aurkitu" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "Ez da fitxategia aurkitu" @@ -1322,7 +1340,7 @@ msgstr "" msgid "TYPE failed, server said: %s" msgstr "TYPEk huts egin du, eta zerbitzariak hau esan du: %s" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "Konexioa denboraz kanpo" @@ -1330,8 +1348,8 @@ msgstr "Konexioa denboraz kanpo" msgid "Server closed the connection" msgstr "Zerbitzariak konexioa itxi du" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "Irakurketa errorea" @@ -1343,87 +1361,87 @@ msgstr "Erantzun batek bufferrari gainez eragin dio." msgid "Protocol corruption" msgstr "Protokolo hondatzea" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "Idazketa errorea" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "Ezin izan da socket-a sortu" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "" "Ezin izan da datu-socketa konektatu; konexioak denbora muga gainditu du" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "Ezin izan da socket pasibora konektatu." -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo-k ezin izan du socket entzule bat eskuratu" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "Ezin izan da socket bat lotu" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "Ezin izan da socket-ean entzun" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "Ezin izan da socket-aren izena zehaztu" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "Ezin da PORT komandoa bidali" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Helbide familia ezezagunaa: %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRTek huts egin du, eta zerbitzariak hau esan du: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "Datu-socket konexioak denbora muga gainditu du" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "Ezin da konexioa onartu" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "Arazoa fitxategiaren hash egitean" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Ezin da fitxategia lortu; zerbitzariak hau esan du: '%s'" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "Datu-socketak denbora muga gainditu du" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Datu transferentziak huts egin du, eta zerbitzariak hau esan du: '%s'" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "Kontsulta" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "Ezin da deitu " @@ -1460,7 +1478,7 @@ msgstr "Ezin izan da konektatu -> %s:%s (%s)" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "Konektatzen -> %s..." @@ -1490,37 +1508,37 @@ msgstr "Zerbait arraroa pasatu da '%s:%s' (%i) ebaztean" msgid "Unable to connect to %s:%s:" msgstr "Ezin da konektatu -> %s %s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:167 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Barne errorea: Sinadura zuzena, baina ezin da egiaztapen marka zehaztu" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Beintza sinadura baliogabe bat aurkitu da." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:173 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Ezin da %s abiarazi sinadura egiaztatzeko (gpgv instalaturik al dago?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "Errore ezezaguna gpgv exekutatzean" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 msgid "The following signatures were invalid:\n" msgstr "Ondorengo sinadurak baliogabeak dira:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1560,59 +1578,59 @@ msgstr "http zerbitzariak barruti onarpena apurturik du" msgid "Unknown date format" msgstr "Datu formatu ezezaguna" -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "Hautapenak huts egin du" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "Konexioaren denbora muga gainditu da" -#: methods/http.cc:855 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "Errorea irteerako fitxategian idaztean" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:928 +#: methods/http.cc:927 msgid "Error reading from server. Remote end closed connection" msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera" -#: methods/http.cc:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "Errorea zerbitzaritik irakurtzean" -#: methods/http.cc:1198 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "Goiburu data gaizki dago" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "Konexioak huts egin du" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "Barne errorea" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "Ezin da %s irakurri" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1661,7 +1679,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "Huts egin du azpiprozesuarentzako IPC kanalizazio bat sortzean" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "Konexioa behar baino lehenago itxi da" @@ -2141,11 +2159,11 @@ msgstr "Artxiboko kidearen goiburua baliogabea da" msgid "Invalid archive member header" msgstr "Artxiboko kidearen goiburua baliogabea da" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "Artxiboa laburregia da" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "Huts egin artxibo goiburuak irakurtzean" @@ -2473,7 +2491,7 @@ msgstr "Eragiketa baliogabea: %s" msgid "Unable to stat the mount point %s" msgstr "Ezin da atzitu %s muntatze puntua" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "Huts egin du CDROMa atzitzean" @@ -2494,102 +2512,102 @@ msgstr "" msgid "Could not open lock file %s" msgstr "Ezin izan da %s blokeo fitxategia ireki" -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Ez da blokeorik erabiltzen ari nfs %s muntatutako blokeo fitxategiarentzat" -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "Ezin izan da %s blokeoa hartu" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "%s azpiprozesuak segmentaziuo hutsegitea jaso du." -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "%s azpiprozesuak segmentaziuo hutsegitea jaso du." -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "%s azpiprozesuak errore kode bat itzuli du (%u)" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "%s azpiprozesua ustekabean amaitu da" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "%s fitxategia ezin izan da ireki" -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "Ezin izan da %s(r)en kanalizazioa ireki" -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "Huts egin du IPC azpiprozesua sortzean" -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "Huts egin du konpresorea exekutatzean " -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "irakurrita; oraindik %lu irakurtzeke, baina ez da ezer geratzen" -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "idatzita; oraindik %lu idazteke, baina ezin da" -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Arazoa fitxategia ixtean" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Arazoa fitxategia sinkronizatzean" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Arazoa fitxategia desestekatzean" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "Arazoa fitxategia sinkronizatzean" @@ -2787,19 +2805,19 @@ msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (type)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "'%s' mota ez da ezagutzen %u lerroan %s Iturburu zerrendan" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "%s fitxategia ezin izan da ireki" -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2823,7 +2841,7 @@ msgid "" msgstr "" "%s paketea berriro instalatu behar da, baina ezin dut artxiborik aurkitu." -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2831,11 +2849,11 @@ msgstr "" "Errorea: pkgProblemResolver::Resolve. Etenak sortu ditu, beharbada " "atxikitako paketeek eraginda." -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "Ezin dira arazoak konpondu; hautsitako paketeak atxiki dituzu." -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3004,40 +3022,40 @@ msgstr "huts egin du izen-aldaketak, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "MD5Sum ez dator bat" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 msgid "Hash Sum mismatch" msgstr "Egiaztapena ez dator bat" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Ezin da %s pakete fitxategia analizatu (1)" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "Ez dago gako publiko erabilgarririk hurrengo gako ID hauentzat:\n" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3045,12 +3063,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3059,7 +3077,7 @@ msgstr "" "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu " "beharko duzu paketea. (arkitektura falta delako)" -#: apt-pkg/acquire-item.cc:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3068,7 +3086,7 @@ msgstr "" "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu " "beharko duzu paketea." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3076,7 +3094,7 @@ msgstr "" "Paketearen indize fitxategiak hondatuta daude. 'Filename:' eremurik ez %s " "paketearentzat." -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "Tamaina ez dator bat" @@ -3198,22 +3216,22 @@ msgstr "Jatorri zerrenda berria idazten\n" msgid "Source list entries for this disc are:\n" msgstr "Diskoarentzako jatorri sarrerak:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "%i erregistro grabaturik.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i erregistro eta %i galdutako fitxategi grabaturik.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i erregistro eta %i okerreko fitxategi grabaturik\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3301,12 +3319,12 @@ msgstr "" msgid "Installing %s" msgstr "%s Instalatzen" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr "%s konfiguratzen" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr "%s kentzen" @@ -3327,98 +3345,98 @@ msgid "Running post-installation trigger %s" msgstr "Inbstalazio-ondorengo %s abiarazlea exekutatzen" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, c-format msgid "Directory '%s' missing" msgstr "'%s' direktorioa falta da" -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "%s fitxategia ezin izan da ireki" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr "%s prestatzen" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr "%s irekitzen" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "%s konfiguratzeko prestatzen" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr "%s Instalatuta" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "%s kentzeko prestatzen" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr "%s kendurik" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "%s guztiz ezabatzeko prestatzen" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr "%s guztiz ezabatu da" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Ezin da erregistroa idatzi, openpty() -ek huts egin du (/dev/pts ez dago " "muntaturik?)\n" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/fi.po b/po/fi.po index 36a96a4be..fca44794c 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2008-12-11 14:52+0200\n" "Last-Translator: Tapio Lehtonen \n" "Language-Team: Finnish \n" @@ -92,78 +92,78 @@ msgstr "Löysää tilaa yhteensä: " msgid "Total space accounted for: " msgstr "Käytetty tila yhteensä: " -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "Pakettitiedosto %s ei ole ajan tasalla." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Yhtään pakettia ei löytynyt" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 #, fuzzy msgid "You must give at least one search pattern" msgstr "On annettava täsmälleen yksi lauseke" -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Pakettia %s ei löydy" -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "Pakettitiedostot:" -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Varasto ei ole ajan tasalla, pakettitiedostoa ei löydy kansiosta" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "Paketit joissa tunniste:" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(ei löydy)" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr " Asennettu: " -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr " Ehdokas: " -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(ei mitään)" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr " Paketin tunnistenumero: " #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr " Versiotaulukko:" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s laitealustalle %s käännöksen päiväys %s %s\n" -#: cmdline/apt-cache.cc:1730 +#: cmdline/apt-cache.cc:1760 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -293,83 +293,101 @@ msgstr "" " -c=? Lue tämä asetustiedosto\n" " -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +msgid "[Y/n]" +msgstr "[K/e]" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" msgstr "K" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" msgstr "" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Käännösvirhe lausekkeessa - %s" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "Näillä paketeilla on tyydyttämättömiä riippuvuuksia:" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "mutta %s on asennettu" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "mutta %s on merkitty asennettavaksi" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "mutta ei ole asennuskelpoinen" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "mutta on näennäispaketti" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "mutta ei ole asennettu" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "mutta ei ole merkitty asennettavaksi" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr " tai" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "Seuraavat UUDET paketit asennetaan:" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "Seuraavat paketit POISTETAAN:" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 msgid "The following packages have been kept back:" msgstr "Nämä paketit on jätetty odottamaan:" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "Nämä paketit päivitetään:" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "Nämä paketit VARHENNETAAN:" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "Seuraavat pysytetyt paketit muutetaan:" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s (syynä %s) " -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -377,60 +395,60 @@ msgstr "" "VAROITUS: Seuraavat välttämättömät paketit poistetaan.\n" "Näin EI PITÄISI tehdä jos ei aivan tarkkaan tiedä mitä tekee!" -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu päivitetty, %lu uutta asennusta, " -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "%lu uudelleen asennettua, " -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "%lu varhennettua, " -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu poistettavaa ja %lu päivittämätöntä.\n" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ei asennettu kokonaan tai poistettiin.\n" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, fuzzy, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "Huomautus, valitaan %s lausekkeella \"%s\"\n" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, fuzzy, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "Huomautus, valitaan %s lausekkeella \"%s\"\n" -#: cmdline/apt-get.cc:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Paketti %s on näennäispaketti, jonka kattaa:\n" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr " [Asennettu]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 #, fuzzy msgid " [Not candidate version]" msgstr "Mahdolliset versiot" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "Yksi pitää valita asennettavaksi." -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -441,187 +459,187 @@ msgstr "" "Tämä voi tarkoittaa paketin puuttuvan, olevan vanhentunut tai\n" "saatavilla vain jostain muusta lähteestä\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "Seuraavat paketit kuitenkin korvaavat sen:" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, fuzzy, c-format msgid "Package '%s' has no installation candidate" msgstr "Paketilla %s ei ole asennettavaa valintaa" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, fuzzy, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "Huomautus, valitaan %s eikä %s\n" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Ohitetaan %s, se on jo asennettu eikä ole komennettu päivitystä.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, fuzzy, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "Ohitetaan %s, se on jo asennettu eikä ole komennettu päivitystä.\n" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Paketin %s uudelleenasennus ei ole mahdollista, sitä ei voi noutaa.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "%s on jo uusin versio.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n" -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:913 #, fuzzy, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "Valittiin versio %s (%s) paketille %s\n" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, fuzzy, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "Valittiin versio %s (%s) paketille %s\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "Korjataan riippuvuuksia..." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr " ei onnistunut." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "Riippuvuuksien korjaus ei onnistu" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "Päivitysjoukon minimointi ei onnistu" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr " Valmis" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Halunnet suorittaa \"apt-get -f install\" korjaamaan nämä." -#: cmdline/apt-get.cc:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "Tyydyttämättömiä riippuvuuksia. Koita käyttää -f." -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 msgid "WARNING: The following packages cannot be authenticated!" msgstr "VAROITUS: Seuraavian pakettien alkuperää ei voi varmistaa!" -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "Varoitus varmistamisesta on ohitettu.\n" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " -msgstr "Asennetaanko nämä paketit ilman todennusta [y/N]? " +#: cmdline/apt-get.cc:1108 +msgid "Install these packages without verification?" +msgstr "Asennetaanko nämä paketit ilman todennusta?" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" msgstr "Joidenkin pakettien alkuperästä ei voitu varmistua" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "Oli pulmia ja -y käytettiin ilman valitsinta --force-yes" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Sisäinen virhe, InstallPackages kutsuttiin rikkinäisille paketeille!" -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 msgid "Packages need to be removed but remove is disabled." msgstr "Paketteja pitäisi poistaa mutta Remove ei ole käytössä." -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 msgid "Internal error, Ordering didn't finish" msgstr "Tapahtui sisäinen virhe, järjestäminen keskeytyi" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "No jo on... Koot eivät täsmää, sähköpostita email apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Noudettavaa arkistoa %st/%st.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Noudettavaa arkistoa %st.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Toiminnon jälkeen käytetään %s t lisää levytilaa.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Toiminnon jälkeen vapautuu %s t levytilaa.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kansion %s vapaan tilan määrä ei selvinnyt" -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, 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:1257 cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "On määritetty Trivial Only mutta tämä ei ole itsestäänselvä toimenpide." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "Kyllä, tee kuten käsketään!" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -632,28 +650,28 @@ msgstr "" "Jatka kirjoittamalla \"%s\"\n" " ?] " -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "Keskeytä." -#: cmdline/apt-get.cc:1284 -msgid "Do you want to continue [Y/n]? " -msgstr "Haluatko jatkaa [K/e]? " +#: cmdline/apt-get.cc:1313 +msgid "Do you want to continue?" +msgstr "Haluatko jatkaa?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Tiedoston %s nouto ei onnistunut %s\n" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "Joidenkin tiedostojen nouto ei onnistunut" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "Nouto on valmis ja määrätty vain nouto" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -661,19 +679,19 @@ msgstr "" "Joidenkin arkistojen nouto ei onnistunut, ehkä \"apt-get update\" auttaa tai " "kokeile --fix-missing?" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing ja taltion vaihto ei ole nyt tuettu" -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "Puuttuvia paketteja ei voi korjata." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "Asennus keskeytetään." -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -683,36 +701,36 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "stat ei toiminut lähdepakettiluettelolle %s" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr "Komento update ei käytä parametreja" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 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:1817 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -730,15 +748,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 msgid "The following information may help to resolve the situation:" msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:" -#: cmdline/apt-get.cc:1824 +#: cmdline/apt-get.cc:1853 msgid "Internal Error, AutoRemover broke stuff" msgstr "Sisäinen virhe, AutoRemover rikkoi jotain" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -752,7 +770,7 @@ msgstr[1] "" "Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää " "vaadittuja:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -764,22 +782,22 @@ msgstr[1] "" "Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää " "vaadittuja:" -#: cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1866 #, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Poista ne komennolla \"apt-get autoremove\"." msgstr[1] "Poista ne komennolla \"apt-get autoremove\"." -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1984 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:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -787,7 +805,7 @@ msgstr "" "Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" " "ilmanpaketteja (tai ratkaise itse)." -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:2002 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" @@ -798,85 +816,85 @@ msgstr "" "jos käytetään epävakaata jakelua, joitain vaadittuja paketteja ei ole\n" "vielä luotu tai siirretty Incoming-kansiosta." -#: cmdline/apt-get.cc:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "Rikkinäiset paketit" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "Ehdotetut paketit:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "Suositellut paketit:" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "Pakettia %s ei löytynyt" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "Käsitellään päivitystä ... " -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "Ei onnistunut" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "Valmis" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 msgid "Internal error, problem resolver broke stuff" msgstr "Sisäinen virhe, resolver rikkoi jotain" -#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "Noutokansiota ei saatu lukittua" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 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:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, c-format msgid "Unable to find a source package for %s" msgstr "Paketin %s lähdekoodipakettia ei löytynyt" -#: cmdline/apt-get.cc:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, c-format msgid "" "Please use:\n" @@ -884,86 +902,86 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Ohitetaan jo noudettu tiedosto \"%s\"\n" -#: cmdline/apt-get.cc:2604 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2644 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2649 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "On noudettava %st lähdekoodiarkistoja.\n" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "Nouda lähdekoodi %s\n" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "Joidenkin arkistojen noutaminen ei onnistunut." -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, 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:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Purkukomento \"%s\" ei onnistunut.\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n" -#: cmdline/apt-get.cc:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "Paketointikomento \"%s\" ei onnistunut.\n" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "Lapsiprosessi kaatui" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 msgid "Must specify at least one package to check builddeps for" msgstr "" "On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan" -#: cmdline/apt-get.cc:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Paketille %s ei ole saatavilla riippuvuustietoja" -#: cmdline/apt-get.cc:2839 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n" -#: cmdline/apt-get.cc:3009 +#: cmdline/apt-get.cc:3040 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -971,7 +989,7 @@ msgid "" msgstr "" "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy" -#: cmdline/apt-get.cc:3027 +#: cmdline/apt-get.cc:3058 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -979,14 +997,14 @@ msgid "" msgstr "" "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy" -#: cmdline/apt-get.cc:3050 +#: cmdline/apt-get.cc:3081 #, 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:3089 +#: cmdline/apt-get.cc:3120 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -995,7 +1013,7 @@ msgstr "" "%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio " "ei vastaa versioriippuvuuksia" -#: cmdline/apt-get.cc:3095 +#: cmdline/apt-get.cc:3126 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1003,30 +1021,30 @@ msgid "" msgstr "" "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy" -#: cmdline/apt-get.cc:3118 +#: cmdline/apt-get.cc:3149 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3164 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "Paketointiriippuvuuksien käsittely ei onnistunut" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Avataan yhteys %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "Tuetut moduulit:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1112,7 +1130,7 @@ msgstr "" "lisätietoja ja lisää valitsimia.\n" " This APT has Super Cow Powers.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1183,8 +1201,8 @@ msgid "%s was already not hold.\n" msgstr "%s on jo uusin versio.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Odotettiin %s, mutta sitä ei ollut" @@ -1251,7 +1269,7 @@ msgstr "Rompun %s irrottaminen ei onnistu, se on ehkä käytössä." msgid "Disk not found." msgstr "Levyä ei löydy" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "Tiedostoa ei löydy" @@ -1314,7 +1332,7 @@ msgstr "Komentotiedoston rivi \"%s\" ei toiminut, palvelin ilmoitti: %s" msgid "TYPE failed, server said: %s" msgstr "TYPE ei toiminut, palvelin ilmoitti: %s" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "Yhteys aikakatkaistiin" @@ -1322,8 +1340,8 @@ msgstr "Yhteys aikakatkaistiin" msgid "Server closed the connection" msgstr "Palvelin sulki yhteyden" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "Lukuvirhe" @@ -1335,86 +1353,86 @@ msgstr "Vastaus aiheutti puskurin ylivuodon." msgid "Protocol corruption" msgstr "Yhteyskäytäntö on turmeltunut" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "Virhe kirjoitettaessa" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "Pistoketta ei voitu luoda" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "Pistoketta ei voitu kytkeä, yhteys aikakatkaistiin" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "Passiivista pistoketta ei voitu kytkeä." -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo ei saanut kuuntelupistoketta" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "Pistoketta ei voitu nimetä" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "Pistoketta ei voitu kuunnella" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "Pistokkeen nimeä ei saatu selville" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "Komennon PORT lähetys ei onnistu" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Tuntematon osoiteperhe %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT ei onnistunut, palvelin ilmoitti: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "Pistokkeen kytkeminen aikakatkaistiin" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "Yhteyttä ei voitu hyväksyä" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "Pulmia tiedoston hajautuksessa" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Tiedostoa ei saatu noudettua, palvelin ilmoitti \"%s\"" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "Pistoke aikakatkaistiin" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Tiedonsiirto ei onnistunut, palvelin ilmoitti \"%s\"" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "Kysely" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "Käynnistys ei onnistu" @@ -1450,7 +1468,7 @@ msgstr "Yhteyttä %s ei voitu muodostaa: %s (%s)" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "Avataan yhteys %s" @@ -1480,39 +1498,39 @@ 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:166 +#: methods/gpgv.cc:167 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:170 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "LÖytyi ainakin yksi kelvoton allekirjoitus." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:173 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Ei käynnistynyt \"%s\" allekirjoitusta tarkistamaan (onko gpgv asennettu?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "Tapahtui tuntematon virhe suoritettaessa gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 msgid "The following signatures were invalid:\n" msgstr "Seuraavat allekirjoitukset eivät olleet kelvollisia:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1552,59 +1570,59 @@ msgstr "HTTP-palvelimen arvoaluetuki on rikki" msgid "Unknown date format" msgstr "Tuntematon päiväysmuoto" -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "Select ei toiminut" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "Yhteys aikakatkaistiin" -#: methods/http.cc:855 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:928 +#: methods/http.cc:927 msgid "Error reading from server. Remote end closed connection" msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden" -#: methods/http.cc:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "Tapahtui virhe luettaessa palvelimelta" -#: methods/http.cc:1198 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "Virheellinen otsikkotieto" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "Yhteys ei toiminut" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "Sisäinen virhe" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "Tiedostoa %s ei voi lukea" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1653,7 +1671,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "IPC-putken luominen aliprosessiin ei onnistunut" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "Yhteys katkesi ennenaikaisesti" @@ -2138,11 +2156,11 @@ msgstr "Arkiston tiedoston otsikko on virheellinen" msgid "Invalid archive member header" msgstr "Arkiston tiedoston otsikko on virheellinen" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "Arkisto on pienempi kuin pitäisi" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "Arkiston otsikoiden luku ei onnistunut" @@ -2468,7 +2486,7 @@ msgstr "Virheellinen toiminto %s" msgid "Unable to stat the mount point %s" msgstr "Komento stat ei toiminut liitoskohdalle %s" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "Komento stat ei toiminut rompulle" @@ -2487,101 +2505,101 @@ msgstr "Lukkoa ei käytetä kirjoitussuojatulle tiedostolle %s" msgid "Could not open lock file %s" msgstr "Lukkotiedostoa %s ei voitu avata" -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Lukitusta ei käytetä NFS-liitetylle tiedostolle %s" -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "Lukkoa %s ei saada" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Aliprosessi %s aiheutti suojausvirheen." -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Aliprosessi %s aiheutti suojausvirheen." -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Aliprosessi %s palautti virhekoodin (%u)" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Aliprosessi %s lopetti odottamatta" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "Tiedostoa %s ei voitu avata" -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "Putkea %s ei voitu avata" -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "Prosessien välistä kommunikaatiota aliprosessiin ei saatu luotua" -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "Pakkaajan käynnistäminen ei onnistunut" -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "read, vielä %lu lukematta mutta tiedosto loppui" -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "write, vielä %lu kirjoittamatta mutta epäonnistui" -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Pulmia tiedoston sulkemisessa" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Pulmia tehtäessä tiedostolle sync" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Pulmia tehtäessä tiedostolle unlink" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "Pulmia tehtäessä tiedostolle sync" @@ -2779,19 +2797,19 @@ msgstr "Rivi %u on väärän muotoinen lähdeluettelossa %s (tyyppi)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Tiedostoa %s ei voitu avata" -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2813,7 +2831,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Paketti %s olisi asennettava uudelleen, mutta sen arkistoa ei löydy." -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2821,11 +2839,11 @@ msgstr "" "Virhe, pkgProblemResolver::Resolve tuotti katkoja, syynä voi olla pysytetyt " "paketit." -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "Pulmia ei voi korjata, rikkinäisiä paketteja on pysytetty." -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2996,40 +3014,40 @@ msgstr "nimen vaihto ei onnistunut, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "MD5Sum ei täsmää" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 msgid "Hash Sum mismatch" msgstr "Tarkistussumma ei täsmää" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Pakettitiedostoa %s (1) ei voi jäsentää" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "Julkisia avaimia ei ole saatavilla, avainten ID:t ovat:\n" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3037,12 +3055,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3051,7 +3069,7 @@ msgstr "" "En löytänyt pakettia %s vastaavaa tiedostoa. Voit ehkä joutua korjaamaan " "tämän paketin itse (puuttuvan arkkitehtuurin vuoksi)" -#: apt-pkg/acquire-item.cc:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3060,7 +3078,7 @@ msgstr "" "Pakettia %s vastaavaa tiedostoa ei löytynyt. Voit ehkä joutua korjaamaan " "tämän paketin itse." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3068,7 +3086,7 @@ msgstr "" "Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-" "kenttää." -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "Koko ei täsmää" @@ -3190,22 +3208,22 @@ msgstr "Kirjoitetaan uusi lähdeluettelo\n" msgid "Source list entries for this disc are:\n" msgstr "Tämän levyn lähdekoodipakettien luettelon tietueita ovat:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "Kirjoitettiin %i tietuetta.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Kirjoitettiin %i tietuetta joissa oli %i puuttuvaa tiedostoa.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Kirjoitettiin %i tietuetta joissa oli %i paritonta tiedostoa\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3294,12 +3312,12 @@ msgstr "" msgid "Installing %s" msgstr "Asennetaan %s" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr "Tehdään asetukset: %s" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr "Poistetaan %s" @@ -3320,98 +3338,98 @@ msgid "Running post-installation trigger %s" msgstr "Suoritetaan jälkiasennusliipaisin %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, c-format msgid "Directory '%s' missing" msgstr "Kansio \"%s\" puuttuu." -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Tiedostoa %s ei voitu avata" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr "Valmistellaan %s" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr "Puretaan %s" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "Valmistaudutaan tekemään asetukset: %s" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr "%s asennettu" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "Valmistaudutaan poistamaan %s" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr "%s poistettu" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "Valmistaudutaan poistamaan %s kokonaan" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr "%s poistettiin kokonaan" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Lokiin ei voi kirjoittaa, openpty() epäonnistui (onko /dev/pts " "liittämättä?)\n" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/fr.po b/po/fr.po index 45b16cb5a..9b26539b0 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2013-04-09 07:58+0200\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" @@ -92,77 +92,77 @@ msgstr "Espace disque gaspillé : " msgid "Total space accounted for: " msgstr "Total de l'espace attribué : " -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "Fichier %s désynchronisé." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Aucun paquet n'a été trouvé" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 msgid "You must give at least one search pattern" msgstr "Vous devez fournir au moins un motif de recherche" -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "Cette commande est obsolète. Veuillez utiliser « apt-mark showauto »." -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Impossible de trouver le paquet %s" -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "Fichiers du paquet :" -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Le cache est désynchronisé, impossible de référencer un fichier" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "Paquets épinglés :" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(non trouvé)" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr " Installé : " -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr " Candidat : " -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(aucun)" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr " Épinglage de paquet : " #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr " Table de version :" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s pour %s compilé sur %s %s\n" -#: cmdline/apt-cache.cc:1730 +#: cmdline/apt-cache.cc:1760 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -297,83 +297,101 @@ msgstr "" " -c=? Lit ce fichier de configuration\n" " -o=? Spécifie une option de configuration, p. ex. -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +msgid "[Y/n]" +msgstr "[O/n]" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "[o/N]" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" msgstr "O" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" msgstr "N" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Erreur de compilation de l'expression rationnelle - %s" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "Les paquets suivants contiennent des dépendances non satisfaites :" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "mais %s est installé" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "mais %s devra être installé" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "mais il n'est pas installable" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "mais c'est un paquet virtuel" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "mais il n'est pas installé" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "mais ne sera pas installé" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr " ou" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "Les NOUVEAUX paquets suivants seront installés :" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "Les paquets suivants seront ENLEVÉS :" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 msgid "The following packages have been kept back:" msgstr "Les paquets suivants ont été conservés :" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "Les paquets suivants seront mis à jour :" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "Les paquets suivants seront mis à une VERSION INFÉRIEURE :" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "Les paquets retenus suivants seront changés :" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s (en raison de %s) " -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -382,59 +400,59 @@ msgstr "" "Vous NE devez PAS faire ceci, à moins de savoir exactement ce\n" "que vous êtes en train de faire." -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu mis à jour, %lu nouvellement installés, " -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "%lu réinstallés, " -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "%lu remis à une version inférieure, " -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu à enlever et %lu non mis à jour.\n" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu partiellement installés ou enlevés.\n" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "Note : sélection de %s pour la tâche « %s »\n" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "Note : sélection de %s pour l'expression rationnelle « %s »\n" -#: cmdline/apt-get.cc:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Le paquet %s est un paquet virtuel fourni par :\n" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr " [Installé]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 msgid " [Not candidate version]" msgstr " [Pas de version candidate]" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "Vous devez explicitement sélectionner un paquet à installer." -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -446,138 +464,138 @@ msgstr "" "devenu obsolète\n" "ou qu'il n'est disponible que sur une autre source\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "Cependant les paquets suivants le remplacent :" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, c-format msgid "Package '%s' has no installation candidate" msgstr "Le paquet « %s » n'a pas de version susceptible d'être installée" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "Les paquets virtuels comme « %s » ne peuvent pas être supprimés\n" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "" "Le paquet « %s » n'est pas installé, et ne peut donc être supprimé. Peut-" "être vouliez-vous écrire « %s » ?\n" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "Le paquet « %s » n'est pas installé, et ne peut donc être supprimé\n" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "Note : sélection de « %s » au lieu de « %s »\n" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Passe %s, il est déjà installé et la mise à jour n'est pas prévue.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "" "%s ignoré : il n'est pas installé et seules des mises à jour ont été " "demandées.\n" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, 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" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "%s est déjà la plus récente version disponible.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s passé en « installé manuellement ».\n" -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:913 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "Version choisie « %s » (%s) pour « %s »\n" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "Version choisie « %s » (%s) pour « %s » à cause de « %s »\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "Correction des dépendances..." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr " a échoué." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "Impossible de corriger les dépendances" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "Impossible de minimiser le nombre des paquets mis à jour" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr " Fait" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes." -#: cmdline/apt-get.cc:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "Dépendances manquantes. Essayez d'utiliser l'option -f." -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ATTENTION : les paquets suivants n'ont pas été authentifiés." -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "Avertissement d'authentification ignoré.\n" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " -msgstr "Faut-il installer ces paquets sans vérification (o/N) ? " +#: cmdline/apt-get.cc:1108 +msgid "Install these packages without verification?" +msgstr "Faut-il installer ces paquets sans vérification ?" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" msgstr "Certains paquets n'ont pas pu être authentifiés" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "Il y a des problèmes et -y a été employé sans --force-yes" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Erreur interne, « InstallPackages » appelé avec des paquets cassés." -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 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." -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 msgid "Internal error, Ordering didn't finish" msgstr "Erreur interne. Le tri a été interrompu." -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Étrangement, les tailles ne correspondent pas. Veuillez le signaler par " @@ -585,21 +603,21 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Il est nécessaire de prendre %so/%so dans les archives.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Il est nécessaire de prendre %so dans les archives.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" @@ -607,23 +625,23 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Après cette opération, %so d'espace disque seront libérés.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossible de déterminer l'espace disponible sur %s" -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, c-format msgid "You don't have enough free space in %s." msgstr "Pas assez d'espace disponible sur %s" -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "L'option --trivial-only a été indiquée mais il ne s'agit pas d'une opération " @@ -633,11 +651,11 @@ msgstr "" # sentence is supposed to be typed by a user who cannot see the difference. #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "Oui, faites ce que je vous dis !" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -648,28 +666,28 @@ msgstr "" "Pour continuer, tapez la phrase « %s »\n" " ?]" -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "Annulation." -#: cmdline/apt-get.cc:1284 -msgid "Do you want to continue [Y/n]? " -msgstr "Souhaitez-vous continuer [O/n] ? " +#: cmdline/apt-get.cc:1313 +msgid "Do you want to continue?" +msgstr "Souhaitez-vous continuer ?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossible de récupérer %s %s\n" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "Certains fichiers n'ont pu être téléchargés." -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "Téléchargement achevé et dans le mode téléchargement uniquement" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -677,20 +695,20 @@ msgstr "" "Impossible de récupérer quelques archives, peut-être devrez-vous lancer apt-" "get update ou essayer avec --fix-missing ?" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 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." -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "Impossible de corriger le fait que les paquets manquent." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "Annulation de l'installation." -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -704,39 +722,39 @@ msgstr[1] "" "Les paquets suivants ont disparu du système car tous leurs fichiers\n" "ont été remplacés par d'autres paquets :" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" "Note : cette opération volontaire (effectuée par dpkg) est automatique." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" "La distribution cible « %s » indisponible pour le paquet « %s » est ignorée" -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Choix de « %s » comme paquet source à la place de « %s »\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "La version « %s » indisponible du paquet « %s » est ignorée" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr "La commande de mise à jour ne prend pas de paramètre" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Aucune suppression n'est censée se produire : impossible de lancer " "« Autoremover »" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -755,16 +773,16 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 msgid "The following information may help to resolve the situation:" msgstr "L'information suivante devrait vous aider à résoudre la situation : " -#: cmdline/apt-get.cc:1824 +#: cmdline/apt-get.cc:1853 msgid "Internal Error, AutoRemover broke stuff" msgstr "" "Erreur interne, l'outil de suppression automatique a cassé quelque chose." -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -776,7 +794,7 @@ msgstr[1] "" "Les paquets suivants ont été installés automatiquement et ne sont plus " "nécessaires :" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -786,22 +804,22 @@ msgstr[0] "" msgstr[1] "" "%lu paquets ont été installés automatiquement et ne sont plus nécessaires.\n" -#: cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1866 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Veuillez utiliser « apt-get autoremove » pour le supprimer." msgstr[1] "Veuillez utiliser « apt-get autoremove » pour les supprimer." -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erreur interne, AllUpgrade a cassé le boulot !" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1984 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes :" -#: cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -809,7 +827,7 @@ msgstr "" "Dépendances non satisfaites. Essayez « apt-get -f install » sans paquet\n" "(ou indiquez une solution)." -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:2002 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" @@ -821,33 +839,33 @@ msgstr "" "la distribution unstable, que certains paquets n'ont pas encore\n" "été créés ou ne sont pas sortis d'Incoming." -#: cmdline/apt-get.cc:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "Paquets défectueux" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "Les paquets supplémentaires suivants seront installés : " -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "Paquets suggérés :" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "Paquets recommandés :" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "Impossible de trouver le paquet %s" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s passé en « installé automatiquement ».\n" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -855,50 +873,50 @@ msgstr "" "Cette commande est obsolète. Veuillez utiliser « apt-mark auto » et « apt-" "mark manual »." -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "Calcul de la mise à jour... " -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "Échec" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "Fait" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 msgid "Internal error, problem resolver broke stuff" msgstr "" "Erreur interne, la tentative de résolution du problème a cassé certaines " "parties" -#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "Impossible de verrouiller le répertoire de téléchargement" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" "Impossible de trouver une source de téléchargement de la version « %s » de " "« %s »" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "Téléchargement de %s %s" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 msgid "Must specify at least one package to fetch source for" msgstr "Vous devez spécifier au moins un paquet source" -#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossible de trouver une source de paquet pour %s" -#: cmdline/apt-get.cc:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -908,7 +926,7 @@ msgstr "" "suivi de versions « %s » à l'adresse :\n" "%s\n" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, c-format msgid "" "Please use:\n" @@ -920,70 +938,70 @@ msgstr "" "pour récupérer les dernières mises à jour (éventuellement non encore " "publiées) du paquet.\n" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Saut du téléchargement du fichier « %s », déjà téléchargé\n" -#: cmdline/apt-get.cc:2604 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr "Pas assez d'espace disponible sur %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2644 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Nécessité de prendre %so/%so dans les sources.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2649 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Nécessité de prendre %so dans les sources.\n" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "Récupération des sources %s\n" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "Échec lors de la récupération de quelques archives." -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Saut du décompactage des paquets sources déjà décompactés dans %s\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "La commande de décompactage « %s » a échoué.\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Veuillez vérifier si le paquet dpkg-dev est installé.\n" -#: cmdline/apt-get.cc:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "La commande de construction « %s » a échoué.\n" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "Échec du processus fils" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 msgid "Must specify at least one package to check builddeps for" msgstr "" "Il faut spécifier au moins un paquet pour vérifier les dépendances de " "construction" -#: cmdline/apt-get.cc:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -993,17 +1011,17 @@ msgstr "" "consulter la section à propos de APT::Architectures dans la page de manuel " "apt.conf(5)." -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossible d'obtenir les dépendances de construction pour %s" -#: cmdline/apt-get.cc:2839 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr "%s n'a pas de dépendance de construction.\n" -#: cmdline/apt-get.cc:3009 +#: cmdline/apt-get.cc:3040 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -1012,7 +1030,7 @@ msgstr "" "La dépendance %s vis-à-vis de %s ne peut être satisfaite car %s n'est pas " "autorisé avec les paquets « %s »." -#: cmdline/apt-get.cc:3027 +#: cmdline/apt-get.cc:3058 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1021,14 +1039,14 @@ msgstr "" "La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s ne " "peut être trouvé" -#: cmdline/apt-get.cc:3050 +#: cmdline/apt-get.cc:3081 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Impossible de satisfaire la dépendance %s pour %s : le paquet installé %s " "est trop récent" -#: cmdline/apt-get.cc:3089 +#: cmdline/apt-get.cc:3120 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1037,7 +1055,7 @@ msgstr "" "La dépendance %s vis-à-vis de %s ne peut être satisfaite car aucune version " "disponible du paquet %s ne peut satisfaire les prérequis de version." -#: cmdline/apt-get.cc:3095 +#: cmdline/apt-get.cc:3126 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1046,31 +1064,31 @@ msgstr "" "La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s " "n'a pas de version disponible." -#: cmdline/apt-get.cc:3118 +#: cmdline/apt-get.cc:3149 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Impossible de satisfaire les dépendances %s pour %s : %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3164 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" "Les dépendances de compilation pour %s ne peuvent pas être satisfaites." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "Impossible d'activer les dépendances de construction" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, c-format msgid "Changelog for %s (%s)" msgstr "Journal des modifications pour %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "Modules reconnus :" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1160,7 +1178,7 @@ msgstr "" "apt.conf(5) pour plus d'informations et d'options.\n" " Cet APT a les « Super Cow Powers »\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1237,8 +1255,8 @@ msgid "%s was already not hold.\n" msgstr "%s était déjà marqué comme non figé.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr "A attendu %s mais il n'était pas présent" @@ -1331,7 +1349,7 @@ msgstr "" msgid "Disk not found." msgstr "Disque non trouvé." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "Fichier non trouvé" @@ -1395,7 +1413,7 @@ msgstr "" msgid "TYPE failed, server said: %s" msgstr "Échec de TYPE, le serveur a répondu : %s" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "Dépassement du délai de connexion" @@ -1403,8 +1421,8 @@ msgstr "Dépassement du délai de connexion" msgid "Server closed the connection" msgstr "Le serveur a fermé la connexion" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "Erreur de lecture" @@ -1416,87 +1434,87 @@ msgstr "Une réponse a fait déborder le tampon." msgid "Protocol corruption" msgstr "Corruption du protocole" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "Erreur d'écriture" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "Impossible de créer un connecteur" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 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é" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "Impossible de se connecter au port en mode passif." -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "gettaddrinfo n'a pu obtenir un port d'écoute" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "Impossible de se connecter à un port" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "Impossible d'écouter sur le port" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "Impossible de déterminer le nom du port" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "Impossible d'envoyer la commande PORT" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Famille d'adresses %u inconnue (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT a échoué, le serveur a répondu : %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "Délai de connexion au port de données dépassé" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "Impossible d'accepter une connexion" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "Problème de hachage du fichier" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Impossible de récupérer le fichier, le serveur a répondu « %s »" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "Pas de réponse du port données dans les délais" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Le transfert de données a échoué, le serveur a répondu « %s »" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "Requête" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "Impossible d'invoquer " @@ -1532,7 +1550,7 @@ msgstr "Connexion à %s: %s (%s) impossible." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "Connexion à %s" @@ -1564,40 +1582,40 @@ msgstr "" msgid "Unable to connect to %s:%s:" msgstr "Impossible de se connecter à %s:%s :" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:167 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Erreur interne : signature correcte, mais il est impossible de déterminer " "l'empreinte de la clé." -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Au moins une signature non valable a été rencontrée." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:173 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Impossible d'exécuter « gpgv » pour contrôler la signature (veuillez " "vérifier si gpgv est installé)." #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "Erreur inconnue à l'exécution de gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 msgid "The following signatures were invalid:\n" msgstr "Les signatures suivantes ne sont pas valables :\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1637,59 +1655,59 @@ msgstr "Ce serveur http possède un support des limites non-valide" msgid "Unknown date format" msgstr "Format de date inconnu" -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "Sélection défaillante" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "Délai de connexion dépassé" -#: methods/http.cc:855 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "Erreur d'écriture du fichier de sortie" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "Erreur d'écriture sur un fichier" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "Erreur d'écriture sur le fichier" -#: methods/http.cc:928 +#: methods/http.cc:927 msgid "Error reading from server. Remote end closed connection" msgstr "Erreur de lecture depuis le serveur distant et clôture de la connexion" -#: methods/http.cc:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "Erreur de lecture du serveur" -#: methods/http.cc:1198 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "Mauvais en-tête de donnée" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "Échec de la connexion" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "Erreur interne" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "Impossible de lire %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1742,7 +1760,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "Impossible de créer le tube IPC sur le sous-processus" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "Connexion fermée prématurément" @@ -2231,11 +2249,11 @@ msgstr "En-tête du membre d'archive %s non valable" msgid "Invalid archive member header" msgstr "En-tête du membre d'archive non-valable" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "L'archive est trop petite" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "Échec de la lecture des en-têtes d'archive" @@ -2570,7 +2588,7 @@ msgstr "L'opération %s n'est pas valable" msgid "Unable to stat the mount point %s" msgstr "Impossible de localiser le point de montage %s" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "Impossible d'accéder au cédérom." @@ -2589,38 +2607,38 @@ msgstr "Verrou non utilisé pour le fichier %s en lecture seule" msgid "Could not open lock file %s" msgstr "Impossible d'ouvrir le fichier verrou %s" -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Verrou non utilisé pour le fichier %s se situant sur une partition nfs" -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "Impossible d'obtenir le verrou %s" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" "La liste des fichiers ne peut pas être créée car « %s » n'est pas un " "répertoire" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" "« %s » dans le répertoire « %s » a été ignoré car ce n'est pas un fichier " "ordinaire" -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" "« %s » dans le répertoire « %s » a été ignoré car il n'utilise pas " "d'extension" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" @@ -2628,70 +2646,70 @@ msgstr "" "« %s » dans le répertoire « %s » a été ignoré car il utilise une extension " "non valable" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Le sous-processus %s a commis une violation d'accès mémoire" -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, c-format msgid "Sub-process %s received signal %u." msgstr "Le sous-processus %s a reçu le signal %u" -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Le sous-processus %s a renvoyé un code d'erreur (%u)" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Le sous-processus %s s'est arrêté prématurément" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "Impossible d'ouvrir le fichier %s" -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, c-format msgid "Could not open file descriptor %d" msgstr "Impossible d'ouvrir le descripteur de fichier %d" -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "Impossible de créer un sous-processus IPC" -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "Impossible d'exécuter la compression " -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, c-format msgid "read, still have %llu to read but none left" msgstr "lu(s), %llu restant à lire, mais rien n'est disponible" -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "écrit(s), %llu restant à écrire, mais l'écriture est impossible" -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, c-format msgid "Problem closing the file %s" msgstr "Problème de fermeture du fichier %s" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problème de renommage du fichier %s en %s" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, c-format msgid "Problem unlinking the file %s" msgstr "Problème de suppression du lien %s" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "Problème de synchronisation du fichier" @@ -2899,7 +2917,7 @@ msgid "Type '%s' is not known on line %u in source list %s" msgstr "" "Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2909,12 +2927,12 @@ msgstr "" "consulter la page de manuel apt.conf(5) et notamment la section à propos de " "APT::Immediate-Configure, pour plus d'informations. (%d)" -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, c-format msgid "Could not configure '%s'. " msgstr "Impossible de configurer « %s »." -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2939,7 +2957,7 @@ msgstr "" "Le paquet %s doit être réinstallé, mais il est impossible de trouver son " "archive." -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2947,13 +2965,13 @@ msgstr "" "Erreur, pkgProblem::Resolve a généré des ruptures, ce qui a pu être causé " "par les paquets devant être gardés en l'état." -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Impossible de corriger les problèmes, des paquets défectueux sont en mode " "« garder en l'état »." -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3141,12 +3159,12 @@ msgstr "impossible de changer le nom, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "Somme de contrôle MD5 incohérente" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 msgid "Hash Sum mismatch" msgstr "Somme de contrôle de hachage incohérente" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3155,18 +3173,18 @@ msgstr "" "Impossible de trouver l'entrée « %s » attendue dans le fichier « Release » : " " ligne non valable dans sources.list ou fichier corrompu" -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "" "Impossible de trouver la comme de contrôle de « %s » dans le fichier Release" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Aucune clé publique n'est disponible pour la/les clé(s) suivante(s) :\n" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3175,12 +3193,12 @@ msgstr "" "Le fichier « Release » pour %s a expiré (plus valable depuis %s). Les mises " "à jour depuis ce dépôt ne s'effectueront pas." -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribution en conflit : %s (%s attendu, mais %s obtenu)" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3191,12 +3209,12 @@ msgstr "" "GPG : %s : %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "Erreur de GPG : %s : %s" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3205,7 +3223,7 @@ msgstr "" "Impossible de localiser un fichier du paquet %s. Cela signifie que vous " "devrez corriger ce paquet vous-même (absence d'architecture)." -#: apt-pkg/acquire-item.cc:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3214,7 +3232,7 @@ msgstr "" "Impossible de localiser un fichier du paquet %s. Cela signifie que vous " "devrez corriger ce paquet vous-même." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3222,7 +3240,7 @@ msgstr "" "Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » " "pour le paquet %s." -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "Taille incohérente" @@ -3346,22 +3364,22 @@ msgstr "Écriture de la nouvelle liste de sources\n" msgid "Source list entries for this disc are:\n" msgstr "Les entrées de listes de sources pour ce disque sont :\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "%i enregistrements écrits.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i enregistrements écrits avec %i fichiers manquants.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i enregistrements écrits avec %i fichiers qui ne correspondent pas\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3461,12 +3479,12 @@ msgstr "Exécu tion du solveur externe" msgid "Installing %s" msgstr "Installation de %s" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr "Configuration de %s" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr "Suppression de %s" @@ -3487,80 +3505,80 @@ msgid "Running post-installation trigger %s" msgstr "Exécution des actions différées (« trigger ») de %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, c-format msgid "Directory '%s' missing" msgstr "Répertoire %s inexistant" -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, c-format msgid "Could not open file '%s'" msgstr "Impossible d'ouvrir le fichier « %s »" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr "Préparation de %s" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr "Décompression de %s" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "Préparation de la configuration de %s" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr "%s installé" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "Préparation de la suppression de %s" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr "%s supprimé" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "Préparation de la suppression complète de %s" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr "%s complètement supprimé" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Impossible d'écrire le journal, échec d'openpty()\n" "(/dev/pts est-il monté ?)\n" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "Exécution de dpkg" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "L'opération a été interrompue avant de se terminer" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "Aucun rapport « apport » écrit car MaxReports a déjà été atteint" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "problème de dépendances : laissé non configuré" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3568,14 +3586,14 @@ msgstr "" "Aucun rapport « apport » n'a été créé car le message d'erreur indique une " "erreur consécutive à un échec précédent." -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" "Aucun rapport « apport » n'a été créé car un disque plein a été signalé" -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3583,7 +3601,7 @@ msgstr "" "Aucun « apport » n'a été créé car une erreur de dépassement de capacité " "mémoire a été signalée" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/gl.po b/po/gl.po index dc776f9e2..4676d06fa 100644 --- a/po/gl.po +++ b/po/gl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_gl\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2011-05-12 15:28+0100\n" "Last-Translator: Miguel Anxo Bouzada \n" "Language-Team: galician \n" @@ -95,79 +95,79 @@ msgstr "Espazo de reserva total: " msgid "Total space accounted for: " msgstr "Espazo total contabilizado: " -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "O ficheiro de paquete %s está sen sincronizar." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Non se atopou ningún paquete" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 msgid "You must give at least one search pattern" msgstr "Debe fornecer cando menos un patrón de busca" -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Non foi posíbel atopar o paquete %s" -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "Ficheiros de paquetes:" -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "A caché está sen sincronizar, non se pode facer referencia a un ficheiro de " "paquetes" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "Paquetes inmobilizados:" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(non se atopou)" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr " Instalado: " -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr " Candidato: " -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(ningún)" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr " Inmobilizado: " #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr " Táboa de versións:" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s para %s compilado en %s %s\n" -#: cmdline/apt-cache.cc:1730 +#: cmdline/apt-cache.cc:1760 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -299,83 +299,101 @@ msgstr "" " -o=? Estabelece unha opción de configuración, por exemplo: -o dir::cache=/" "tmp\n" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +msgid "[Y/n]" +msgstr "[S/n]" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "[s/N]" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" -msgstr "" +msgstr "N" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Produciuse un erro na compilación da expresión regular - %s" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "Os seguintes paquetes teñen dependencias sen cumprir:" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "mais %s está instalado" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "mais vaise instalar %s" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "mais non é instalábel" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "mais é un paquete virtual" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "mais non está instalado" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "mais non se vai a instalar" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr " ou" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "Os seguintes paquetes NOVOS hanse instalar:" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "Vanse RETIRAR os paquetes seguintes:" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 msgid "The following packages have been kept back:" msgstr "Consérvanse os seguintes paquetes:" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "Vanse anovar os paquetes seguintes:" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "Vanse REVERTER os seguintes paquetes :" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "Vanse modificar os paquetes retidos seguintes:" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s (por mor de %s) " -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -383,59 +401,59 @@ msgstr "" "AVISO: Retiraranse os seguintes paquetes esenciais.\n" "Isto NON se debe facer a menos que saiba exactamente o que está a facer!" -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu anovados, %lu instalados, " -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "%lu revertidos, " -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "Vanse retirar %lu e deixar %lu sen anovar.\n" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu non instalados ou retirados de todo.\n" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "Nota, seleccione «%s» para a tarefa «%s»\n" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "Nota, seleccione «%s» para a expresión regular «%s»\n" -#: cmdline/apt-get.cc:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "O paquete %s é un paquete virtual fornecido por:\n" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr " [Instalado]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 msgid " [Not candidate version]" msgstr " [Non hai unha versión candidata]" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "Debería escoller un para instalar." -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -446,134 +464,134 @@ msgstr "" "Isto pode significar que falta o paquete, está obsoleto ou só está\n" "dispoñíbel noutra fonte.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "Porén, os seguintes paquetes substitúeno:" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, c-format msgid "Package '%s' has no installation candidate" msgstr "O paquete «%s» non ten unha instalación candidata" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "Non se poden retirar os paquetes virtuais como «%s»\n" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "O paquete %s non está instalado, así que non foi retirado\n" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "O paquete %s non está instalado, así que non foi retirado\n" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "Nota, seleccione «%s» no canto de «%s»\n" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Omítese %s, xa está instalado e non se especificou a anovación.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "Omitindo %s, non está instalado e só se solicitaron as anovacións.\n" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "A reinstalación de %s non é posíbel, non se pode descargar.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "%s xa é a versión máis recente.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s cambiado a instalado manualmente.\n" -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:913 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "Versión seleccionada «%s» (%s) para «%s»\n" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "Versión seleccionada «%s» (%s) para «%s» xa que «%s»\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "Corrixindo as dependencias..." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr " fallou." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "Non foi posíbel corrixir as dependencias." -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "Non foi posíbel minimizar o conxunto de anovacións" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr " Feito" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Pode querer executar «apt-get -f install» para corrixilos." -#: cmdline/apt-get.cc:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "Dependencias incumpridas. Probe a empregar -f." -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVISO: Non se poden autenticar os seguintes paquetes!" -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "Ignórase o aviso de autenticación.\n" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " -msgstr "Instalar estes paquetes sen verificación [s/N]? " +#: cmdline/apt-get.cc:1108 +msgid "Install these packages without verification?" +msgstr "Instalar estes paquetes sen verificación?" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" msgstr "Non foi posíbel autenticar algúns paquetes" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "Xurdiron problemas e empregouse -y sen --force-yes" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "Produciuse un erro interno, chamouse a InstallPackages con paquetes " "estragados." -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 msgid "Packages need to be removed but remove is disabled." msgstr "Hai que retirar paquetes mais o retirado está desactivado." -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 msgid "Internal error, Ordering didn't finish" msgstr "Produciuse un erro interno; non rematou a ordenación" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Que estraño... Os tamaños non coinciden; envíe un correo-e a apt@packages." @@ -581,54 +599,54 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Ten que recibir %sB/%sB de arquivos.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Ten que recibir %sB de arquivos.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Despois desta operación ocuparanse %sB de disco adicionais.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Despois desta operación liberaranse %sB de espazo de disco.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Couldn't determine free space in %s" msgstr "Non foi posíbel determinar o espazo libre en %s" -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, c-format msgid "You don't have enough free space in %s." msgstr "Non hai espazo libre abondo en %s." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Especificouse «Só triviais» mais esta non é unha operación trivial." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "Si, fai o que digo!" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -639,28 +657,28 @@ msgstr "" "Para continuar escriba a frase «%s»\n" " ?] " -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "Interromper." -#: cmdline/apt-get.cc:1284 -msgid "Do you want to continue [Y/n]? " -msgstr "Quere continuar [S/n]? " +#: cmdline/apt-get.cc:1313 +msgid "Do you want to continue?" +msgstr "Quere continuar?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Non foi posíbel obter %s %s\n" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "Non foi posíbel descargar algúns ficheiros" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "Completouse a descarga no modo de só descargas" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -668,20 +686,20 @@ msgstr "" "Non foi posíbel obter algúns arquivos; probe con apt-get update ou --fix-" "missing." -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "" "O emprego conxunto de --fix-missing e intercambio de discos non está admitido" -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "Non é posíbel corrixir os paquetes non dispoñíbeis." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "Interrompendo a instalación." -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -695,37 +713,37 @@ msgstr[1] "" "Os seguintes paquetes desapareceron do seu sistema e todos os \n" "ficheiros serán sobrescritos por outros paquetes:" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Nota: Isto será feito automaticamente por dpkg." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Ignorase a versión de destino «%s» non dispoñíbel do paquete «%s»" -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Tome «%s» como paquete fonte no canto de «%s»\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Ignorar a versión non dispoñíbel «%s» do paquete «%s»" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr "A orde «update» non toma argumentos" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Non se agarda que eliminemos cousas, non se pode iniciar o Retirado " "automático" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -743,15 +761,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 msgid "The following information may help to resolve the situation:" msgstr "A seguinte información pode axudar a solucionar a situación:" -#: cmdline/apt-get.cc:1824 +#: cmdline/apt-get.cc:1853 msgid "Internal Error, AutoRemover broke stuff" msgstr "Produciuse un erro interno, o Retirado automático estragou cousas" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -763,7 +781,7 @@ msgstr[1] "" "Os seguintes paquetes foron instalados automaticamente e xa non son " "necesarios:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -772,22 +790,22 @@ msgstr[0] "%lu paquete foi instalado automaticamente e xa non é necesario.\n" msgstr[1] "" "%lu paquetes foron instalados automaticamente e xa non son necesarios.\n" -#: cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1866 #, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Empregue «apt-get autoremove» para eliminalos." msgstr[1] "Empregue «apt-get autoremove» para eliminalos." -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "Produciuse un erro interno, AllUpgrade estragou cousas" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1984 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Pode querer executar «apt-get -f install» para corrixir isto:" -#: cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -795,7 +813,7 @@ msgstr "" "Dependencias incumpridas. Probe «apt-get -f install» sen paquetes (ou " "especifique unha solución)." -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:2002 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" @@ -808,78 +826,78 @@ msgstr "" "algúns paquetes solicitados aínda non se creasen ou que se movesen da " "entrada." -#: cmdline/apt-get.cc:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "Paquetes estragados" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "Instalaranse os seguintes paquetes extra:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "Paquetes suxeridos:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "Paquetes recomendados:" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "Non foi posíbel atopar o paquete %s" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s está estabelecido para a súa instalación automática.\n" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "Calculando a anovación... " -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "Fallou" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "Feito" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 msgid "Internal error, problem resolver broke stuff" msgstr "Produciuse un erro interno, o solucionador interno estragou cousas" -#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "Non é posíbel bloquear o directorio de descargas" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "Descargando %s %s" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 msgid "Must specify at least one package to fetch source for" msgstr "Ten que especificar polo menos un paquete para obter o código fonte" -#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, c-format msgid "Unable to find a source package for %s" msgstr "Non sé posíbel atopar un paquete fonte para %s" -#: cmdline/apt-get.cc:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -888,7 +906,7 @@ msgstr "" "AVISO: o paquete «%s» mantense no sistema de control de versións «%s» en:\n" "%s\n" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, fuzzy, c-format msgid "" "Please use:\n" @@ -900,87 +918,87 @@ msgstr "" "para obter as últimas actualizacións (posibelmente non publicadas) do " "paquete.\n" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Omítese o ficheiro xa descargado «%s»\n" -#: cmdline/apt-get.cc:2604 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr "Non hai espazo libre abondo en %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2644 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Ten que recibir %sB/%sB de arquivos de fonte.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2649 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Ten que recibir %sB de arquivos de fonte.\n" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "Obter fonte %s\n" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "Non se puideron obter algúns arquivos." -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Omítese o desempaquetado do código fonte xa desempaquetado en %s\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Fallou a orde de desempaquetado «%s».\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, 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:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "Fallou a orde de construción de «%s».\n" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "O proceso fillo fallou" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 msgid "Must specify at least one package to check builddeps for" msgstr "" "Ten que especificar polo menos un paquete para comprobarlle as dependencias " "de compilación" -#: cmdline/apt-get.cc:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Non é posíbel obter a información de dependencias de compilación de %s" -#: cmdline/apt-get.cc:2839 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr "%s non ten dependencias de compilación.\n" -#: cmdline/apt-get.cc:3009 +#: cmdline/apt-get.cc:3040 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -989,7 +1007,7 @@ msgstr "" "A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o " "paquete %s" -#: cmdline/apt-get.cc:3027 +#: cmdline/apt-get.cc:3058 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -998,14 +1016,14 @@ msgstr "" "A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o " "paquete %s" -#: cmdline/apt-get.cc:3050 +#: cmdline/apt-get.cc:3081 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Non foi posíbel satisfacer a dependencia «%s» de %s: O paquete instalado %s " "é novo de máis" -#: cmdline/apt-get.cc:3089 +#: cmdline/apt-get.cc:3120 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1014,7 +1032,7 @@ msgstr "" "A dependencia «%s» de %s non se pode satisfacer porque ningunha versión " "dispoñíbel do paquete %s satisfai os requirimentos de versión" -#: cmdline/apt-get.cc:3095 +#: cmdline/apt-get.cc:3126 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1023,30 +1041,30 @@ msgstr "" "A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o " "paquete %s" -#: cmdline/apt-get.cc:3118 +#: cmdline/apt-get.cc:3149 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Non foi posíbel satisfacer a dependencia «%s» de %s: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3164 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Non se puideron satisfacer as dependencias de construción de %s." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "Non se puideron procesar as dependencias de construción" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, c-format msgid "Changelog for %s (%s)" msgstr "Rexistro de cambios de %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "Módulos admitidos:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1139,7 +1157,7 @@ msgstr "" "para obter mais información e opcións\n" " Este APT ten poderes da Super Vaca.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1215,8 +1233,8 @@ msgid "%s was already not hold.\n" msgstr "%s xa é a versión máis recente.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Agardouse por %s pero non estaba alí" @@ -1283,7 +1301,7 @@ msgstr "Non é posíbel desmontar o CD-ROM de %s, pode estarse empregando aínda msgid "Disk not found." msgstr "Non se atopou o disco" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "Non se atopou o ficheiro" @@ -1346,7 +1364,7 @@ msgstr "Fallou a orde do script de acceso «%s», o servidor dixo: %s" msgid "TYPE failed, server said: %s" msgstr "Fallou a orde TYPE, o servidor dixo: %s" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "Esgotouse o tempo para a conexión" @@ -1354,8 +1372,8 @@ msgstr "Esgotouse o tempo para a conexión" msgid "Server closed the connection" msgstr "O servidor pechou a conexión" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "Produciuse un erro de lectura" @@ -1367,87 +1385,87 @@ msgstr "Unha resposta desbordou o búfer." msgid "Protocol corruption" msgstr "Dano no protocolo" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "Produciuse un erro de escritura" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "Non é posíbel crear un socket" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "" "Non é posíbel conectar o socket de datos, o tempo esgotouse para a conexión" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "Non é posíbel conectar o socket pasivo." -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo non puido obter un socket no que atender" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "Non é posíbel ligar un socket" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "Non é posíbel escoitar no socket" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "Non é posíbel determinar o nome do socket" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "Non é posíbel enviar a orde PORT" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Familia de enderezos %u (AF_*) descoñecida" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "Produciuse un fallou na orde EPRT, o servidor dixo: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "A conexión do socket de datos esgotou o tempo" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "Non é posíbel aceptar a conexión" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "Xurdiu un problema ao calcular o hash do ficheiro" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Non é posíbel obter o ficheiro, o servidor dixo «%s»" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "O socket de datos esgotou o tempo" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Produciuse un fallou na transferencia de datos, o servidor dixo «%s»" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "Petición" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "Non é posíbel chamar a " @@ -1483,7 +1501,7 @@ msgstr "Non foi posíbel conectar a %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "Conectando a %s" @@ -1513,40 +1531,40 @@ msgstr "Aconteceu algo malo, buscando «%s:%s» (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Non é posíbel conectar %s:%s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:167 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Erro interno: Sinatura correcta, pero non foi posíbel determinar a pegada " "dixital da chave" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Atopouse polo menos unha sinatura incorrecta." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:173 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Non é posíbel executar «gpgv» para verificar a sinatura (Está instalado " "gpgv?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "Produciuse un erro descoñecido ao executar gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 msgid "The following signatures were invalid:\n" msgstr "As seguintes sinaturas non eran correctas:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1587,60 +1605,60 @@ msgstr "Este servidor HTTP ten a compatibilidade de rangos estragada" msgid "Unknown date format" msgstr "Formato de datos descoñecido" -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "Fallou a chamada a select" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "A conexión esgotou o tempo" -#: methods/http.cc:855 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "Produciuse un erro ao escribir no ficheiro de saída" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "Produciuse un erro ao escribir nun ficheiro" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "Produciuse un erro ao escribir no ficheiro" -#: methods/http.cc:928 +#: methods/http.cc:927 msgid "Error reading from server. Remote end closed connection" msgstr "" "Produciuse un erro ao ler do servidor. O extremo remoto pechou a conexión" -#: methods/http.cc:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "Produciuse un erro ao ler do servidor" -#: methods/http.cc:1198 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "Datos da cabeceira incorrectos" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "Produciuse un fallo na conexión" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "Produciuse un erro interno" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "Non é posíbel ler %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1693,7 +1711,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "Non foi posíbel crear a canle IPC ao subproceso" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "A conexión pechouse prematuramente" @@ -2178,11 +2196,11 @@ msgstr "Cabeceira do membro do arquivo incorrecta %s" msgid "Invalid archive member header" msgstr "Cabeceira do membro do arquivo incorrecta" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "O arquivo é curto de máis" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "Non foi posíbel ler as cabeceiras dos arquivos" @@ -2516,7 +2534,7 @@ msgstr "Operación incorrecta: %s" msgid "Unable to stat the mount point %s" msgstr "Non é posíbel analizar o punto de montaxe %s" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "Non foi posíbel analizar o CD-ROM" @@ -2535,33 +2553,33 @@ msgstr "Non se empregan bloqueos para o ficheiro de bloqueo de só lectura %s" msgid "Could not open lock file %s" msgstr "Non foi posíbel abrir o ficheiro de bloqueo %s" -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Non se empregan bloqueos para o ficheiro de bloqueo montado por NFS %s" -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "Non foi posíbel obter o bloqueo %s" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "A lista de ficheiros non pode ser creada como «%s» non é un directorio" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "Ignorando «%s» no directorio «%s» xa que non é un ficheiro regular" -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" "Ignorando o ficheiro «%s» no directorio «%s» xa que non ten extensión de nome" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" @@ -2569,70 +2587,70 @@ msgstr "" "Ignorando o ficheiro «%s» no directorio «%s» xa que ten unha extensión de " "nome incorrecta" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "O subproceso %s recibiu un fallo de segmento." -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, c-format msgid "Sub-process %s received signal %u." msgstr "O subproceso %s recibiu o sinal %u." -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "O subproceso %s devolveu un código de erro (%u)" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "O subproceso %s saíu de xeito inesperado" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "Non foi posíbel abrir o ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, c-format msgid "Could not open file descriptor %d" msgstr "Non foi posíbel abrir o descritor de ficheiro %d" -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "Non foi posíbel crear o IPC do subproceso" -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "Non foi posíbel executar o compresor " -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "lectura, aínda hai %lu para ler pero non queda ningún" -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "escritura, aínda hai %lu para escribir pero non se puido" -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, c-format msgid "Problem closing the file %s" msgstr "Produciuse un problema ao pechar o ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Produciuse un problema ao renomear o ficheiro %s a %s" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, c-format msgid "Problem unlinking the file %s" msgstr "Produciuse un problema ao desligar o ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "Produciuse un problema ao sincronizar o ficheiro" @@ -2834,7 +2852,7 @@ msgstr "Liña %u mal construída na lista de orixes %s (tipo)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "O tipo «%s» non se coñece na liña %u da lista de orixes %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2843,12 +2861,12 @@ msgstr "" "Non foi posíbel facer a configuración inmediata en «%s». Vexa man 5 apt.conf " "baixo APT::Immediate-Configure para obter máis detalles. (%d)" -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Non foi posíbel abrir o ficheiro «%s»" -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2872,7 +2890,7 @@ msgstr "" "O paquete %s ten que ser reinstalado, mais non é posíbel atopar o seu " "arquivo." -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2880,11 +2898,11 @@ msgstr "" "Erro, pkgProblemResolver::Resolve xerou interrupcións, isto pode estar " "causado por paquetes retidos." -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "Non é posíbel solucionar os problemas, ten retidos paquetes rotos." -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3060,12 +3078,12 @@ msgstr "non foi posíbel cambiar o nome, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "A MD5Sum non coincide" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 msgid "Hash Sum mismatch" msgstr "A sumas «hash» non coinciden" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3074,29 +3092,29 @@ msgstr "" "Non é posíbel atopar a entrada agardada «%s» no ficheiro de publicación " "(entrada sources.list incorrecta ou ficheiro con formato incorrecto)" -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "" "Non é posíbel ler a suma de comprobación para «%s» no ficheiro de publicación" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "Non hai unha chave pública dispoñíbel para os seguintes ID de chave:\n" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Conflito na distribución: %s (agardábase %s mais obtívose %s)" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3107,12 +3125,12 @@ msgstr "" "%s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "Produciuse un erro de GPG: %s %s" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3121,7 +3139,7 @@ msgstr "" "Non é posíbel atopar un ficheiro para o paquete %s. Isto pode significar que " "ten que arranxar este paquete a man. (Falta a arquitectura)" -#: apt-pkg/acquire-item.cc:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3130,7 +3148,7 @@ msgstr "" "Non é posíbel atopar un ficheiro para o paquete %s. Isto pode significar que " "ten que arranxar este paquete a man." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3138,7 +3156,7 @@ msgstr "" "Os ficheiros de índices de paquetes están danados. Non hai un campo " "Filename: para o paquete %s." -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "Os tamaños non coinciden" @@ -3262,22 +3280,22 @@ msgstr "Escribindo a nova lista de orixes\n" msgid "Source list entries for this disc are:\n" msgstr "As entradas da lista de orixes deste disco son:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "Escribíronse %i rexistros.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Escribíronse %i rexistros con %i ficheiros que faltan.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Escribíronse %i rexistros con %i ficheiros que non coinciden\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3376,12 +3394,12 @@ msgstr "" msgid "Installing %s" msgstr "Instalando %s" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr "Configurando %s" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr "Retirando %s" @@ -3402,82 +3420,82 @@ msgid "Running post-installation trigger %s" msgstr "Executando o disparador de post-instalación %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, c-format msgid "Directory '%s' missing" msgstr "Falta o directorio «%s»" -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, c-format msgid "Could not open file '%s'" msgstr "Non foi posíbel abrir o ficheiro «%s»" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr "Preparando %s" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr "Desempaquetando %s" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "Preparandose para configurar %s" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr "Instalouse %s" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "Preparándose para o retirado de %s" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr "Retirouse %s" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparándose para retirar %s completamente" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr "Retirouse %s completamente" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Non foi posíbel escribir no rexistro, a chamada a openpty() fallou (/dev/pts " "non estaba montado?)\n" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "Executando dpkg" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "" "Non se escribiu ningún informe de Apport porque xa se acadou o nivel " "MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "problemas de dependencias - déixase sen configurar" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3485,7 +3503,7 @@ msgstr "" "Non se escribiu ningún informe de Apport porque a mensaxe de erro indica que " "é un error provinte dun fallo anterior." -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3493,7 +3511,7 @@ msgstr "" "Non se escribiu ningún informe de Apport porque a mensaxe de erro indica un " "erro de disco cheo." -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3501,7 +3519,7 @@ msgstr "" "Non se escribiu un informe de contribución porque a mensaxe de erro indica " "un erro de falta de memoria" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/hu.po b/po/hu.po index 38c30018d..11c116e56 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt trunk\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2012-06-25 17:09+0200\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -94,78 +94,78 @@ msgstr "Slack terület összesen: " msgid "Total space accounted for: " msgstr "Nyilvántartott terület összesen: " -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "%s csomagfájl nincs szinkronban." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Nem találhatók csomagok" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 msgid "You must give at least one search pattern" msgstr "Legalább egy keresési mintát meg kell adnia" -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "Ez a parancs elavult. Használja helyette az „apt-mark showauto”-t." -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Ez a csomag nem található: %s" -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "Csomagfájlok:" -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "A gyorsítótár nincs szinkronban, nem lehet kereszthivatkozni a csomagfájlra" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "Rögzített csomagok:" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(nem található)" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr " Telepítve: " -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr " Jelölt: " -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(nincs)" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr " Csomagrögzítés: " #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr " Verziótáblázat:" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s erre: %s lefordítva ekkor: %s %s\n" -#: cmdline/apt-cache.cc:1730 +#: cmdline/apt-cache.cc:1760 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -292,83 +292,101 @@ msgstr "" " -c=? Ezt a konfigurációs fájlt olvassa be\n" " -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +msgid "[Y/n]" +msgstr "[I/n]" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "[i/N]" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" msgstr "I" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" msgstr "N" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Regex fordítási hiba - %s" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "Az alábbi csomagoknak teljesítetlen függőségei vannak:" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "de %s van telepítve" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "de csak %s telepíthető" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "de az nem telepíthető" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "de az egy virtuális csomag" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "de az nincs telepítve" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "de az nincs telepítésre megjelölve" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr " vagy" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "Az alábbi ÚJ csomagok lesznek telepítve:" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "Az alábbi csomagok el lesznek TÁVOLÍTVA:" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 msgid "The following packages have been kept back:" msgstr "Az alábbi csomagok vissza lesznek tartva:" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "Az alábbi csomagok frissítve lesznek:" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "Az alábbi csomagok VISSZAFEJLESZTÉSRE kerülnek:" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "Az alábbi visszafogott csomagokat cserélem:" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s (%s miatt) " -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -376,59 +394,59 @@ msgstr "" "FIGYELMEZTETÉS: Az alábbi alapvető csomagok el lesznek távolítva.\n" "NE tegye ezt, hacsak nem tudja pontosan, mit csinál!" -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu frissített, %lu újonnan telepített, " -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "%lu újratelepítendő, " -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "%lu visszafejlesztendő, " -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu eltávolítandó és %lu nem frissített.\n" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nincs teljesen telepítve/eltávolítva.\n" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "Megjegyzés: „%s” kijelölése „%s” feladathoz\n" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "Megjegyzés: „%s” kijelölése „%s” regexhez\n" -#: cmdline/apt-get.cc:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "%s egy virtuális csomag, melyet az alábbi csomagok biztosítanak:\n" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr " [Telepítve]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 msgid " [Not candidate version]" msgstr " [Nem jelölt verzió]" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "Egyet név szerint ki kell jelölni a telepítésre." -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -438,186 +456,186 @@ msgstr "" "%s csomag nem elérhető, de egy másik hivatkozik rá.\n" "A kért csomag hiányzik, elavult vagy csak más forrásból érhető el\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "De az alábbi csomagok helyettesítik:" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, c-format msgid "Package '%s' has no installation candidate" msgstr "„%s” csomagnak nincs telepítésre jelölt verziója" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "A virtuális csomagokat, mint a(z) „%s” nem lehet eltávolítani\n" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "" "A(z) „%s” csomag nincs telepítve, így nem lett törölve. Erre gondolt: „%s”?\n" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "A(z) „%s” csomag nincs telepítve, így nem lett törölve\n" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "Megjegyzés: „%s” kijelölése „%s” helyett\n" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "%s kihagyása, ez már telepítve van, és a frissítés nincs beállítva.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "„%s” kihagyása, nincs telepítve, és csak frissítések lettek kérve.\n" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "%s újratelepítése nem lehetséges, mert nem lehet letölteni.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "%s már a legújabb verzió.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s kézi telepítésűre állítva.\n" -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:913 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "„%s” (%s) verzió lett kijelölve ehhez: „%s”\n" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "„%s” (%s) verzió lett kijelölve ehhez: „%s”, a(z) „%s” miatt\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "Függőségek javítása..." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr " sikertelen." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "Nem lehet javítani a függőségeket" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "Nem lehet minimalizálni a frissítendő csomagok mennyiségét" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr " Kész" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Próbálja futtatni az „apt-get -f install” parancsot ezek javításához." -#: cmdline/apt-get.cc:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "Teljesítetlen függőségek. Próbálja a -f használatával." -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 msgid "WARNING: The following packages cannot be authenticated!" msgstr "FIGYELMEZTETÉS: Az alábbi csomagok nem hitelesíthetők!" -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "A hitelesítési figyelmeztetés felülbírálva.\n" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " -msgstr "Valóban ellenőrzés nélkül telepíti a csomagokat (i/N)? " +#: cmdline/apt-get.cc:1108 +msgid "Install these packages without verification?" +msgstr "Valóban ellenőrzés nélkül telepíti a csomagokat?" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" msgstr "Néhány csomag nem hitelesíthető" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "Problémák vannak, és a -y kapcsolót használta --force-yes nélkül" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Belső hiba, az InstallPackages törött csomagokkal lett meghívva!" -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 msgid "Packages need to be removed but remove is disabled." msgstr "Csomagokat kellene eltávolítani, de az eltávolítás nem engedélyezett." -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 msgid "Internal error, Ordering didn't finish" msgstr "Belső hiba, a rendezés nem fejeződött be" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "A méretek nem egyeznek, írjon az apt@packages.debian.org címre" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Letöltendő adatmennyiség: %sB/%sB.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Letöltendő adatmennyiség: %sB.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "A művelet után %sB lemezterület kerül felhasználásra.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "A művelet után %sB lemezterület szabadul fel.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nem határozható meg a szabad hely mennyisége itt: %s" -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, c-format msgid "You don't have enough free space in %s." msgstr "Nincs elég szabad hely itt: %s." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "A „Trivial Only” meg van adva, de ez nem egy triviális művelet." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "Igen, tedd amit mondok!" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -628,28 +646,28 @@ msgstr "" "A folytatáshoz írja be ezt a mondatot: „%s”\n" " ?] " -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "Megszakítva." -#: cmdline/apt-get.cc:1284 -msgid "Do you want to continue [Y/n]? " -msgstr "Folytatni akarja [I/n]? " +#: cmdline/apt-get.cc:1313 +msgid "Do you want to continue?" +msgstr "Folytatni akarja?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Sikertelen letöltés: %s %s\n" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "Néhány fájlt nem sikerült letölteni" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "A letöltés befejeződött a „csak letöltés” módban" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -657,19 +675,19 @@ msgstr "" "Nem lehet letölteni néhány archívumot. Próbálja futtatni az „apt-get update” " "parancsot, vagy használja a --fix-missing kapcsolót." -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "A --fix-missing és az adathordozó-csere jelenleg nem támogatott" -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "Nem lehet javítani a hiányzó csomagokat." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "Telepítés megszakítása." -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -683,38 +701,38 @@ msgstr[1] "" "A következő csomagok eltűntek a rendszerből, mivel\n" "az összes fájlt más csomagok fölülírták:" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Megjegyzés: ezt a dpkg automatikusan és szándékosan hajtja végre." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" "A(z) „%2$s” csomag el nem érhető „%1$s” cél kiadásának figyelmen kívül " "hagyása" -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "„%s” kiválasztása forráscsomagként „%s” helyett\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" "A(z) „%2$s” csomag el nem érhető „%1$s” verziójának figyelmen kívül hagyása" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr "Az update parancsnak nincsenek argumentumai" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Nem kellene semmit törölni, az AutoRemover nem indítható" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -732,15 +750,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 msgid "The following information may help to resolve the situation:" msgstr "Az alábbi információk segíthetnek megoldani a problémát:" -#: cmdline/apt-get.cc:1824 +#: cmdline/apt-get.cc:1853 msgid "Internal Error, AutoRemover broke stuff" msgstr "Belső hiba, az AutoRemover sérült" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -752,7 +770,7 @@ msgstr[1] "" "A következő csomagok automatikusan lettek telepítve, és már nincs rájuk " "szükség:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -761,22 +779,22 @@ msgstr[0] "%lu csomag automatikusan lett telepítve, és már nincs rá szüksé msgstr[1] "" "%lu csomag automatikusan lett telepítve, és már nincs rájuk szükség.\n" -#: cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1866 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Ezt az „apt-get autoremove” paranccsal törölheti." msgstr[1] "Ezeket az „apt-get autoremove” paranccsal törölheti." -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "Belső hiba, az AllUpgrade megsértett valamit" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1984 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "Próbálja futtatni az „apt-get -f install” parancsot az alábbiak javításához:" -#: cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -784,7 +802,7 @@ msgstr "" "Teljesítetlen függőségek. Próbálja kiadni az „apt-get -f install” parancsot " "csomagok nélkül (vagy telepítse a függőségeket is!)." -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:2002 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" @@ -796,33 +814,33 @@ msgstr "" "használja, 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:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "Törött csomagok" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "Az alábbi extra csomagok kerülnek telepítésre:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "Javasolt csomagok:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "Ajánlott csomagok:" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "Az alábbi csomag nem található: %s" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s megjelölve automatikusan telepítettként.\n" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -830,47 +848,47 @@ msgstr "" "Ez a parancs elavult. Használja helyette az „apt-mark auto” és az „apt-mark " "auto” parancsokat." -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "Frissítés kiszámítása... " -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "Sikertelen" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "Kész" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 msgid "Internal error, problem resolver broke stuff" msgstr "Belső hiba, a problémamegoldó hibát okozott" -#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "Nem lehet zárolni a letöltési könyvtárat" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Nem található forrás a(z) „%2$s” „%1$s” verziójának letöltéséhez" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "Letöltés: %s %s" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 msgid "Must specify at least one package to fetch source for" msgstr "" "Legalább egy csomagot meg kell adni, amelynek a forrását le kell tölteni" -#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, c-format msgid "Unable to find a source package for %s" msgstr "Nem található forráscsomag ehhez: %s" -#: cmdline/apt-get.cc:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -880,7 +898,7 @@ msgstr "" "karbantartva:\n" "%s\n" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, c-format msgid "" "Please use:\n" @@ -891,70 +909,70 @@ msgstr "" "bzr branch %s\n" "a csomag legújabb (esetleg kiadatlan) frissítéseinek letöltéséhez.\n" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, 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:2604 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr "Nincs elég szabad hely itt: %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2644 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Letöltendő forrásadat-mennyiség: %sB/%sB.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2649 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Letöltendő forrásadat-mennyiség: %sB.\n" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "Forrás letöltése: %s\n" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "Nem sikerült néhány archívumot letölteni." -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, 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:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "„%s” kibontási parancs nem sikerült.\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Ellenőrizze, hogy a „dpkg-dev” csomag telepítve van-e.\n" -#: cmdline/apt-get.cc:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "„%s” elkészítési parancs nem sikerült.\n" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "Hiba a gyermekfolyamatnál" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 msgid "Must specify at least one package to check builddeps for" msgstr "" "Legalább egy csomagot adjon meg, amelynek fordítási függőségeit ellenőrizni " "kell" -#: cmdline/apt-get.cc:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -963,17 +981,17 @@ msgstr "" "Nem érhetők el architektúrainformációk ehhez: %s. A beállításokkal " "kapcsolatban lásd az apt.conf(5) APT::Architectures részét." -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nem lehet %s fordítási függőségeinek információit letölteni" -#: cmdline/apt-get.cc:2839 +#: cmdline/apt-get.cc:2870 #, 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:3009 +#: cmdline/apt-get.cc:3040 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -982,7 +1000,7 @@ msgstr "" "%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s nem " "engedélyezett a(z) „%4$s” csomagokon" -#: cmdline/apt-get.cc:3027 +#: cmdline/apt-get.cc:3058 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -991,14 +1009,14 @@ msgstr "" "%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s csomag nem " "található" -#: cmdline/apt-get.cc:3050 +#: cmdline/apt-get.cc:3081 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%2$s csomag %1$s függősége nem elégíthető ki: a telepített %3$s csomag túl " "friss" -#: cmdline/apt-get.cc:3089 +#: cmdline/apt-get.cc:3120 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1007,7 +1025,7 @@ msgstr "" "%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s csomag elérhető " "verziója nem elégíti ki a verziókövetelményeket" -#: cmdline/apt-get.cc:3095 +#: cmdline/apt-get.cc:3126 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1016,30 +1034,30 @@ msgstr "" "%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s csomagnak nincs " "jelölt verziója" -#: cmdline/apt-get.cc:3118 +#: cmdline/apt-get.cc:3149 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s csomag %1$s függősége nem elégíthető ki: %3$s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3164 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s építési függőségei nem elégíthetők ki." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "Nem sikerült az építési függőségeket feldolgozni" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, c-format msgid "Changelog for %s (%s)" msgstr "Változási napló ehhez: %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "Támogatott modulok:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1128,7 +1146,7 @@ msgstr "" "információkért és opciókért.\n" " Ez az APT a SzuperTehén Hatalmával rendelkezik.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1203,8 +1221,8 @@ msgid "%s was already not hold.\n" msgstr "%s eddig sem volt visszafogva.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Nem található a(z) %s, a várakozás után sem" @@ -1292,7 +1310,7 @@ msgstr "" msgid "Disk not found." msgstr "A lemez nem található." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "A fájl nem található" @@ -1357,7 +1375,7 @@ msgstr "" msgid "TYPE failed, server said: %s" msgstr "Hibás TYPE, a kiszolgáló üzenete: %s" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "Időtúllépés a kapcsolatban" @@ -1365,8 +1383,8 @@ msgstr "Időtúllépés a kapcsolatban" msgid "Server closed the connection" msgstr "A kiszolgáló lezárta a kapcsolatot" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "Olvasási hiba" @@ -1378,87 +1396,87 @@ msgstr "A válasz túlcsordította a puffert." msgid "Protocol corruption" msgstr "Protokollhiba" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "Írási hiba" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "Nem lehet létrehozni a foglalatot" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "" "Nem lehet kapcsolódni az adatfoglalathoz, a kapcsolat túllépte az időkorlátot" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "Nem lehet kapcsolódni a passzív foglalathoz." -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "A getaddrinfo nem talált figyelőfoglalatot" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "Nem lehet összekapcsolódni a foglalattal" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "Nem lehet figyelni a foglalaton" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "Nem lehet megállapítani a foglalat nevét" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "Nem lehet PORT parancsot küldeni" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Ismeretlen címcsalád: %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "Hibás EPRT, a kiszolgáló üzenete: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "Az adatfoglalathoz kapcsolódás túllépte az időkorlátot" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "Nem lehet elfogadni a kapcsolatot" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "Probléma a fájl hash értékének meghatározásakor" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Nem lehet letölteni a fájlt, a kiszolgáló üzenete: „%s”" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "Az adatfoglalat túllépte az időkorlátot" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Az adatátvitel sikertelen, a kiszolgáló üzenete: „%s”" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "Lekérdezés" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "Nem lehet meghívni " @@ -1494,7 +1512,7 @@ msgstr "Nem lehet kapcsolódni ehhez: %s: %s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "Kapcsolódás: %s" @@ -1524,37 +1542,37 @@ msgstr "Hiba történt „%s:%s” feloldásakor (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Nem lehet csatlakozni ehhez: %s:%s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:167 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Belső hiba: Jó aláírás, de nem állapítható meg a kulcs ujjlenyomata." -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Legalább egy aláírás érvénytelen." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:173 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Nem indítható el a „gpgv” az aláírás ellenőrzéséhez (telepítve van a gpgv?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "Ismeretlen gpgv futtatási hiba" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 msgid "The following signatures were invalid:\n" msgstr "Az alábbi aláírások érvénytelenek voltak:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1594,59 +1612,59 @@ msgstr "A HTTP-kiszolgáló tartománytámogatása sérült" msgid "Unknown date format" msgstr "Ismeretlen dátumformátum" -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "A kiválasztás sikertelen" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "Időtúllépés a kapcsolatban" -#: methods/http.cc:855 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "Hiba a kimeneti fájl írásakor" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "Hiba a fájl írásakor" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "Hiba a fájl írásakor" -#: methods/http.cc:928 +#: methods/http.cc:927 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:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "Hiba a kiszolgálóról olvasáskor" -#: methods/http.cc:1198 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "Rossz fejlécadatok" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "Sikertelen kapcsolódás" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "Belső hiba" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "%s nem olvasható" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1699,7 +1717,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "Nem sikerült IPC-adatcsatornát létrehozni az alfolyamathoz" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "A kapcsolat idő előtt lezárult" @@ -2181,11 +2199,11 @@ msgstr "Érvénytelen archívumtag-fejléc: %s" msgid "Invalid archive member header" msgstr "Érvénytelen archívumtag-fejléc" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "Az archívum túl rövid" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "Nem sikerült olvasni az archívumfejléceket" @@ -2516,7 +2534,7 @@ msgstr "%s érvénytelen művelet" msgid "Unable to stat the mount point %s" msgstr "%s csatolási pont nem érhető el" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "Nem sikerült elérni a CD-ROM-ot." @@ -2535,35 +2553,35 @@ msgstr "Nem lesz zárolva a(z) „%s” csak olvasható zárolási fájl" msgid "Could not open lock file %s" msgstr "%s zárolási fájl nem nyitható meg" -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Nem lesz zárolva a(z) %s NFS-csatolású zárolási fájl" -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "Nem sikerült zárolni: %s" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "A fájlok listáját nem lehetett létrehozni, mert „%s” nem könyvtár" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" "„%s” figyelmen kívül hagyása a(z) „%s” könyvtárban, mert nem szabályos fájl" -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" "„%s” fájl figyelmen kívül hagyása a(z) „%s” könyvtárban, mert nincs " "fájlkiterjesztése" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" @@ -2571,70 +2589,70 @@ msgstr "" "„%s” fájl figyelmen kívül hagyása a(z) „%s” könyvtárban, mert érvénytelen " "fájlkiterjesztése van" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "%s alfolyamat szegmentálási hibát okozott." -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, c-format msgid "Sub-process %s received signal %u." msgstr "A(z) %s alfolyamat %u számú szignált kapott." -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "%s alfolyamat hibakóddal tért vissza (%u)" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "%s alfolyamat váratlanul kilépett" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "Nem lehet megnyitni a(z) %s fájlt" -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, c-format msgid "Could not open file descriptor %d" msgstr "Nem lehet megnyitni a(z) %d fájlleírót" -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "Nem sikerült az alfolyamat IPC-t létrehozni" -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "Nem sikerült elindítani a tömörítőt " -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, c-format msgid "read, still have %llu to read but none left" msgstr "olvasás, még kellene %llu, de már az összes elfogyott" -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "írás, még kiírandó %llu, de ez nem lehetséges" -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, c-format msgid "Problem closing the file %s" msgstr "Hiba a(z) %s fájl bezárásakor" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Hiba a(z) %s fájl átnevezésekor erre: %s" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, c-format msgid "Problem unlinking the file %s" msgstr "Hiba a(z) %s fájl törlésekor" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "Hiba a fájl szinkronizálásakor" @@ -2841,7 +2859,7 @@ msgstr "A(z) %u. sor hibás a(z) %s forráslistában (típus)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "„%1$s” típus nem ismert a(z) %3$s forráslista %2$u. sorában" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2850,12 +2868,12 @@ msgstr "" "Nem lehetett a(z) „%s” közvetlen beállítását végrehajtani. A részletekért " "lásd a man 5 apt.conf oldalt az APT::Immediate-Configure címszó alatt. (%d)" -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, c-format msgid "Could not configure '%s'. " msgstr "A(z) „%s” beállítása sikertelen" -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2878,7 +2896,7 @@ msgid "" msgstr "" "A(z) %s csomagot újra kell telepíteni, de nem található hozzá archívum." -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2886,11 +2904,11 @@ msgstr "" "Hiba, a pkgProblemResolver::Resolve töréseket generált, ezt visszafogott " "csomagok okozhatják." -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "A problémák nem javíthatók, sérült csomagokat fogott vissza." -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3067,12 +3085,12 @@ msgstr "sikertelen átnevezés, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "Az MD5Sum nem megfelelő" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 msgid "Hash Sum mismatch" msgstr "A Hash Sum nem megfelelő" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3081,16 +3099,16 @@ msgstr "" "A várt „%s” bejegyzés nem található a Release fájlban (Rossz sources.list " "bejegyzés vagy helytelenül formázott fájl)" -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nem található a(z) „%s” ellenőrzőösszege a Release fájlban" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "Nem érhető el nyilvános kulcs az alábbi kulcsazonosítókhoz:\n" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3099,12 +3117,12 @@ msgstr "" "A Release fájl elavult ehhez: %s (érvénytelen ez óta: %s). A tároló " "frissítései nem kerülnek alkalmazásra." -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Ütköző disztribúció: %s (a várt %s helyett %s érkezett)" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3114,12 +3132,12 @@ msgstr "" "előző indexfájl lesz használva. GPG hiba: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "GPG hiba: %s: %s" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3128,7 +3146,7 @@ msgstr "" "Egy fájl nem található a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel " "kell kijavítani a csomagot. (hiányzó arch. miatt)" -#: apt-pkg/acquire-item.cc:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3137,14 +3155,14 @@ msgstr "" "Egy fájl nem található a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel " "kell kijavítani a csomagot." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "A csomagindexfájlok megsérültek. Nincs Filename: mező a(z) %s csomaghoz." -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "A méret nem megfelelő" @@ -3268,22 +3286,22 @@ msgstr "Új forráslista írása\n" msgid "Source list entries for this disc are:\n" msgstr "A lemezhez tartozó forráslistabejegyzések a következők:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "%i rekord kiírva.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i rekord kiírva, %i hiányzó fájllal.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i rekord kiírva %i eltérő fájllal\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "%i rekord kiírva %i hiányzó és %i eltérő fájllal\n" @@ -3375,12 +3393,12 @@ msgstr "Külső solver végrehajtása" msgid "Installing %s" msgstr "%s telepítése" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr "%s konfigurálása" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr "%s eltávolítása" @@ -3401,79 +3419,79 @@ msgid "Running post-installation trigger %s" msgstr "A(z) %s telepítés utáni trigger futtatása" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, c-format msgid "Directory '%s' missing" msgstr "A(z) „%s” könyvtár hiányzik" -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, c-format msgid "Could not open file '%s'" msgstr "A(z) „%s” fájl megnyitása sikertelen" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr "%s előkészítése" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr "%s kicsomagolása" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "%s konfigurálásának előkészítése" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr "%s telepítve" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "%s eltávolításának előkészítése" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr "%s eltávolítva" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "%s teljes eltávolításának előkészítése" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr "%s teljesen eltávolítva" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Nem írható a napló, sikertelen openpty() (a /dev/pts nincs csatolva?)\n" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "A dpkg futtatása" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "A művelet megszakadt, mielőtt befejeződhetett volna" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "Nem került írásra apport jelentés, mivel a MaxReports már elérve" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "függőségi hibák - a csomag beállítatlan maradt" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3481,7 +3499,7 @@ msgstr "" "Nem került kiírásra apport jelentés, mivel a hibaüzenet szerint ez a hiba " "egy korábbi hiba következménye." -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3489,7 +3507,7 @@ msgstr "" "Nem került kiírásra apport jelentés, mivel a hibaüzenet szerint megtelt a " "lemez" -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3497,7 +3515,7 @@ msgstr "" "Nem került kiírásra apport jelentés, mivel a hibaüzenet memóriaelfogyási " "hibát jelez" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/it.po b/po/it.po index 216616a48..1b9d6db32 100644 --- a/po/it.po +++ b/po/it.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2012-06-25 21:54+0200\n" "Last-Translator: Milo Casagrande \n" "Language-Team: Italian \n" @@ -93,79 +93,79 @@ msgstr "Totale spazio inutilizzato: " msgid "Total space accounted for: " msgstr "Totale spazio occupato: " -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "Il file dei pacchetti %s non è sincronizzato." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Nessun pacchetto trovato" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 msgid "You must give at least one search pattern" msgstr "È necessario specificare almeno un modello per la ricerca" -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" "Questo comando è deprecato. Utilizzare \"apt-mark showauto\" al suo posto." -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Impossibile trovare il pacchetto %s" -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "File dei pacchetti:" -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "La cache non è sincronizzata, impossibile referenziare un file di pacchetti" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "Pacchetti con gancio:" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(non trovato)" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr " Installato: " -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr " Candidato: " -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(nessuno)" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr " Gancio del pacchetto: " #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr " Tabella versione:" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s per %s compilato il %s %s\n" -#: cmdline/apt-cache.cc:1730 +#: cmdline/apt-cache.cc:1760 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -295,83 +295,101 @@ msgstr "" " -c=? Legge come configurazione il file specificato\n" " -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +msgid "[Y/n]" +msgstr "[S/n]" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "[s/N]" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" msgstr "N" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Errore di compilazione dell'espressione regolare - %s" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "ma la versione %s è installata" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "ma la versione %s sta per essere installata" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "ma non è installabile" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "ma è un pacchetto virtuale" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "ma non è installato" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "ma non sta per essere installato" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr " oppure" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "I seguenti pacchetti NUOVI saranno installati:" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "I seguenti pacchetti saranno RIMOSSI:" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 msgid "The following packages have been kept back:" msgstr "I seguenti pacchetti sono stati mantenuti alla versione attuale:" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "I seguenti pacchetti saranno aggiornati:" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "I seguenti pacchetti saranno RETROCESSI:" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "I seguenti pacchetti bloccati saranno cambiati:" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s (a causa di %s) " -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -380,59 +398,59 @@ msgstr "" "Questo non dovrebbe essere fatto a meno che non si sappia esattamente cosa " "si sta facendo." -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aggiornati, %lu installati, " -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstallati, " -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "%lu retrocessi, " -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu da rimuovere e %lu non aggiornati.\n" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu non completamente installati o rimossi.\n" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "Nota, viene selezionato \"%s\" per il task \"%s\"\n" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "Nota, viene selezionato \"%s\" per l'espressione regolare \"%s\"\n" -#: cmdline/apt-get.cc:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Il pacchetto %s è un pacchetto virtuale fornito da:\n" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr " [Installato]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 msgid " [Not candidate version]" msgstr " [Versione non candidata]" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "È necessario sceglierne uno da installare." -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -443,184 +461,184 @@ msgstr "" "pacchetto. Questo potrebbe indicare che il pacchetto è mancante, obsoleto\n" "oppure è disponibile solo all'interno di un'altra sorgente\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "Tuttavia questi pacchetti lo sostituiscono:" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, c-format msgid "Package '%s' has no installation candidate" msgstr "Il pacchetto \"%s\" non ha candidati da installare" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "Pacchetti virtuali come \"%s\" non possono essere rimossi\n" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "" "Il pacchetto \"%s\" non è installato e quindi non è stato rimosso: si " "intendeva \"%s\"?\n" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "Il pacchetto \"%s\" non è installato e quindi non è stato rimosso\n" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "Nota, viene selezionato \"%s\" al posto di \"%s\"\n" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Viene saltato %s poiché è già installato e l'aggiornamento non è impostato.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "" "Viene saltato %s poiché non è installato e sono richiesti solo gli " "aggiornamenti.\n" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, 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" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "%s è già alla versione più recente.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "È stato impostato %s per l'installazione manuale.\n" -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:913 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "Versione \"%s\" (%s) selezionata per \"%s\"\n" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "Versione \"%s\" (%s) selezionata per \"%s\" per via di \"%s\"\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "Correzione delle dipendenze..." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr " non riuscita." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "Impossibile correggere le dipendenze" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "Impossibile minimizzare l'insieme da aggiornare" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr " Fatto" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "È utile eseguire \"apt-get -f install\" per correggere ciò." -#: cmdline/apt-get.cc:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "Dipendenze non trovate. Riprovare usando -f." -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ATTENZIONE: i seguenti pacchetti non possono essere autenticati." -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "Avviso di autenticazione disabilitato.\n" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " -msgstr "Installare questi pacchetti senza verificarli [s/N]? " +#: cmdline/apt-get.cc:1108 +msgid "Install these packages without verification?" +msgstr "Installare questi pacchetti senza verificarli?" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" msgstr "Alcuni pacchetti non possono essere autenticati" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "Si sono verificati dei problemi ed è stata usata -y senza --force-yes" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "Errore interno, InstallPackages è stato chiamato con un pacchetto " "danneggiato." -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 msgid "Packages need to be removed but remove is disabled." msgstr "" "I pacchetti devono essere rimossi, ma l'azione di rimozione è disabilitata." -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 msgid "Internal error, Ordering didn't finish" msgstr "Errore interno, l'ordinamento non è stato terminato" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Le dimensioni non corrispondono. Inviare un'email a: apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "È necessario scaricare %sB/%sB di archivi.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "È necessario scaricare %sB di archivi.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Dopo quest'operazione, verranno occupati %sB di spazio su disco.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Dopo quest'operazione, verranno liberati %sB di spazio su disco.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossibile determinare lo spazio libero in %s" -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, c-format msgid "You don't have enough free space in %s." msgstr "Spazio libero in %s insufficiente." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "È stata specificata la modalità \"Trivial Only\", ma questa non è " @@ -628,11 +646,11 @@ msgstr "" #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "Sì, esegui come da richiesta." -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -643,28 +661,28 @@ msgstr "" "Per continuare scrivere la frase \"%s\"\n" " ?] " -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "Interrotto." -#: cmdline/apt-get.cc:1284 -msgid "Do you want to continue [Y/n]? " -msgstr "Continuare [S/n]? " +#: cmdline/apt-get.cc:1313 +msgid "Do you want to continue?" +msgstr "Continuare?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossibile recuperare %s %s\n" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "Scaricamento di alcuni file non riuscito" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "Scaricamento completato e in modalità solo scaricamento" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -672,19 +690,19 @@ msgstr "" "Impossibile scaricare alcuni pacchetti. Potrebbe essere utile eseguire \"apt-" "get update\" o provare l'opzione \"--fix-missing\"." -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing su supporti estraibili non è ancora supportato" -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "Impossibile correggere i pacchetti mancanti." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "Interruzione dell'installazione." -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -698,36 +716,36 @@ msgstr[1] "" "I seguenti pacchetti sono spariti dal sistema poiché\n" "tutti i file sono stati sovrascritti da altri pacchetti:" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Nota: questo viene svolto automaticamente e volutamente da dpkg." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Ignorato il rilascio non disponibile \"%s\" del pacchetto \"%s\"" -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Scelto \"%s\" come pacchetto sorgente al posto di \"%s\"\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Ignorata la versione \"%s\" non disponibile del pacchetto \"%s\"" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr "Il comando update non accetta argomenti" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Non si è autorizzati a rimuovere nulla, impossibile avviare AutoRemover" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -745,15 +763,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 msgid "The following information may help to resolve the situation:" msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione:" -#: cmdline/apt-get.cc:1824 +#: cmdline/apt-get.cc:1853 msgid "Internal Error, AutoRemover broke stuff" msgstr "Errore interno, AutoRemover ha rovinato qualche cosa" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -766,7 +784,7 @@ msgstr[1] "" "I seguenti pacchetti sono stati installati automaticamente e non sono più " "richiesti:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -777,22 +795,22 @@ msgstr[1] "" "%lu pacchetti sono stati installati automaticamente e non sono più " "richiesti.\n" -#: cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1866 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Usare \"apt-get autoremove\" per rimuoverlo." msgstr[1] "Usare \"apt-get autoremove\" per rimuoverli." -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "Errore interno, AllUpgrade ha rovinato qualche cosa" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1984 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "È utile eseguire \"apt-get -f install\" per correggere questi problemi:" -#: cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -800,7 +818,7 @@ msgstr "" "Dipendenze non soddisfatte. Provare \"apt-get -f install\" senza pacchetti " "(o specificare una soluzione)." -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:2002 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" @@ -812,33 +830,33 @@ msgstr "" "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:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "Pacchetti danneggiati" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "I seguenti pacchetti saranno inoltre installati:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "Pacchetti suggeriti:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "Pacchetti raccomandati:" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "Impossibile trovare il pacchetto %s" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s impostato automaticamente come installato.\n" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -846,48 +864,48 @@ msgstr "" "Questo comando è deprecato. Utilizzare \"apt-mark auto\" e \"apt-mark manual" "\" al suo posto." -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "Calcolo dell'aggiornamento... " -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "Non riuscito" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "Eseguito" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 msgid "Internal error, problem resolver broke stuff" msgstr "Errore interno, \"problem resolver\" ha rovinato qualcosa" -#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "Impossibile bloccare la directory di scaricamento" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" "Impossibile trovare una sorgente per scaricare la versione \"%s\" di \"%s\"" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "Scaricamento di %s %s" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 msgid "Must specify at least one package to fetch source for" msgstr "" "È necessario specificare almeno un pacchetto di cui recuperare il sorgente" -#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossibile trovare un pacchetto sorgente per %s" -#: cmdline/apt-get.cc:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -897,7 +915,7 @@ msgstr "" "all'interno del sistema di controllo della versione \"%s\" presso:\n" "%s\n" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, c-format msgid "" "Please use:\n" @@ -909,89 +927,89 @@ msgstr "" "per recuperare gli ultimi (forse non rilasciati) aggiornamenti del " "pacchetto.\n" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Il pacchetto \"%s\" già scaricato viene saltato\n" -#: cmdline/apt-get.cc:2604 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr "Lo spazio libero in %s è insufficiente" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2644 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "È necessario recuperare %sB/%sB di sorgenti.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2649 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "È necessario scaricare %sB di sorgenti.\n" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "Recupero sorgente %s\n" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "Recupero di alcuni archivi non riuscito." -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Estrazione del pacchetto sorgente già estratto in %s saltata\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando di estrazione \"%s\" non riuscito.\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Verificare che il pacchetto \"dpkg-dev\" sia installato.\n" -#: cmdline/apt-get.cc:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando \"%s\" di generazione non riuscito.\n" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "Creazione processo figlio non riuscita" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 msgid "Must specify at least one package to check builddeps for" msgstr "" "È necessario specificare almeno un pacchetto di cui controllare le " "dipendenze di generazione" -#: cmdline/apt-get.cc:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -"Informazioni sull'architettura non disponibili per %s. Consultare apt.conf" -"(5) APT::Architectures per l'impostazione" +"Informazioni sull'architettura non disponibili per %s. Consultare apt." +"conf(5) APT::Architectures per l'impostazione" -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossibile ottenere informazioni di dipendenza di generazione per %s" -#: cmdline/apt-get.cc:2839 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr "%s non ha dipendenze di generazione.\n" -#: cmdline/apt-get.cc:3009 +#: cmdline/apt-get.cc:3040 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -1000,7 +1018,7 @@ msgstr "" "La dipendenza %s per %s non può essere soddisfatta perché %s non è " "consentito su pacchetti \"%s\"" -#: cmdline/apt-get.cc:3027 +#: cmdline/apt-get.cc:3058 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1009,14 +1027,14 @@ msgstr "" "%s dipendenze per %s non possono essere soddisfatte perché il pacchetto %s " "non può essere trovato" -#: cmdline/apt-get.cc:3050 +#: cmdline/apt-get.cc:3081 #, 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 recente" -#: cmdline/apt-get.cc:3089 +#: cmdline/apt-get.cc:3120 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1025,7 +1043,7 @@ msgstr "" "La dipendenza %s per %s non può essere soddisfatta perché la versione " "candidata del pacchetto %s non può soddisfare i requisiti di versione" -#: cmdline/apt-get.cc:3095 +#: cmdline/apt-get.cc:3126 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1034,30 +1052,30 @@ msgstr "" "La dipendenza %s per %s non può essere soddisfatta perché il pacchetto %s " "non ha una versione candidata" -#: cmdline/apt-get.cc:3118 +#: cmdline/apt-get.cc:3149 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "La dipendenza %s per %s non è stata soddisfatta: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3164 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Le dipendenze di generazione per %s non sono state soddisfatte." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "Elaborazione delle dipendenze di generazione non riuscita" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, c-format msgid "Changelog for %s (%s)" msgstr "Changelog per %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "Moduli supportati:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1147,7 +1165,7 @@ msgstr "" "apt-get(8), sources.list(5) e apt.conf(5).\n" " Questo APT ha i poteri della Super Mucca.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1223,8 +1241,8 @@ msgid "%s was already not hold.\n" msgstr "%s era già non bloccato.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr "In attesa di %s ma non era presente" @@ -1312,7 +1330,7 @@ msgstr "Impossibile smontare il CD-ROM in %s, potrebbe essere ancora in uso." msgid "Disk not found." msgstr "Disco non trovato" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "File non trovato" @@ -1376,7 +1394,7 @@ msgstr "" msgid "TYPE failed, server said: %s" msgstr "TYPE non riuscito, il server riporta: %s" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "Connessione scaduta" @@ -1384,8 +1402,8 @@ msgstr "Connessione scaduta" msgid "Server closed the connection" msgstr "Il server ha chiuso la connessione" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "Errore di lettura" @@ -1397,87 +1415,87 @@ msgstr "Una risposta ha superato le dimensioni del buffer." msgid "Protocol corruption" msgstr "Protocollo danneggiato" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "Errore di scrittura" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "Impossibile creare un socket" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "" "Impossibile connettersi al socket dati, tempo esaurito per la connessione" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "Impossibile connettersi alla socket passiva." -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "Impossibile ottenere un socket in ascolto con getaddrinfo()" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "Impossibile eseguire bind() su un socket" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "Impossibile eseguire listen() su un socket" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "Impossibile determinare il nome del socket" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "Impossibile inviare il comando PORT" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Famiglia di indirizzamento %u (AF_*) sconosciuta" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT non riuscito, il server riporta: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "Connessione al socket dati terminata" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "Impossibile accettare connessioni" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "Si è verificato un problema nel creare l'hash del file" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Impossibile recuperare il file, il server riporta: \"%s\"" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "Socket dati terminato" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Trasferimento dati non riuscito, il server riporta: \"%s\"" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "Interrogazione" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "Impossibile invocare " @@ -1513,7 +1531,7 @@ msgstr "Impossibile connettersi a %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "Connessione a %s" @@ -1545,40 +1563,40 @@ msgstr "" msgid "Unable to connect to %s:%s:" msgstr "Impossibile connettersi a %s:%s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:167 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Errore interno: firma corretta, ma non è possibile determinare l'impronta " "della chiave." -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "È stata trovata almeno una firma non valida." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:173 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Impossibile eseguire \"gpgv\" per verificare la firma (forse gpgv non è " "installato)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "Errore sconosciuto durante l'esecuzione di gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 msgid "The following signatures were invalid:\n" msgstr "Le seguenti firme non erano valide:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1618,59 +1636,59 @@ msgstr "Questo server HTTP ha un supporto del range non corretto" msgid "Unknown date format" msgstr "Formato della data sconosciuto" -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "Select non riuscita" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "Connessione terminata" -#: methods/http.cc:855 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "Errore nello scrivere sul file di output" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "Errore nello scrivere su file" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "Errore nello scrivere sul file" -#: methods/http.cc:928 +#: methods/http.cc:927 msgid "Error reading from server. Remote end closed connection" msgstr "Errore nel leggere dal server. Il lato remoto ha chiuso la connessione" -#: methods/http.cc:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "Errore nel leggere dal server" -#: methods/http.cc:1198 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "Header dati non corretto" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "Connessione non riuscita" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "Errore interno" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "Impossibile leggere %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1723,7 +1741,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "Creazione di una pipe IPC verso il sottoprocesso non riuscita" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "Connessione chiusa prematuramente" @@ -2209,11 +2227,11 @@ msgstr "Intestazione member dell'archivio %s non valida" msgid "Invalid archive member header" msgstr "Intestazione member dell'archivio non valida" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "L'archivio è troppo piccolo" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "Lettura delle intestazioni dell'archivio non riuscita" @@ -2551,7 +2569,7 @@ msgstr "Operazione %s non valida" msgid "Unable to stat the mount point %s" msgstr "Impossibile eseguire stat sul punto di mount %s" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "Esecuzione di stat sul CD-ROM non riuscita" @@ -2570,36 +2588,36 @@ msgstr "Blocco disabilitato per il file di blocco in sola lettura %s" msgid "Could not open lock file %s" msgstr "Impossibile aprire il file di blocco %s" -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Blocco disabilitato per il file di blocco %s montato via nfs" -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "Impossibile impostare il blocco %s" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" "L'elenco dei file non può essere creato poiché \"%s\" non è una directory" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" "Viene ignorato \"%s\" nella directory \"%s\" poiché non è un file regolare" -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" "Viene ignorato il file \"%s\" nella directory \"%s\" poiché non ha " "un'estensione" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" @@ -2607,70 +2625,70 @@ msgstr "" "Viene ignorato il file \"%s\" nella directory \"%s\" poiché ha un'estensione " "non valida" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Il sottoprocesso %s ha ricevuto un segmentation fault." -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, c-format msgid "Sub-process %s received signal %u." msgstr "Il sottoprocesso %s ha ricevuto il segnale %u." -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Il sottoprocesso %s ha restituito un codice d'errore (%u)" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Il sottoprocesso %s è uscito inaspettatamente" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "Impossibile aprire il file %s" -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, c-format msgid "Could not open file descriptor %d" msgstr "Impossibile aprire il descrittore del file %d" -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "Creazione di un sottoprocesso IPC non riuscita" -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "Esecuzione non riuscita del compressore " -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, c-format msgid "read, still have %llu to read but none left" msgstr "lettura, ancora %llu da leggere, ma non è stato trovato nulla" -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "scrittura, ancora %llu da scrivere, ma non è possibile" -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, c-format msgid "Problem closing the file %s" msgstr "Si è verificato un problema nel chiudere il file %s" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Si è verificato un problema nel rinominare il file %s in %s" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, c-format msgid "Problem unlinking the file %s" msgstr "Si è verificato un problema nell'eseguire l'unlink del file %s" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "Si è verificato un problema nel sincronizzare il file" @@ -2878,7 +2896,7 @@ msgstr "La riga %u nel file %s non è corretta (type)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipo \"%s\" non riconosciuto alla riga %u nel file %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2888,12 +2906,12 @@ msgstr "" "maggiori informazioni, consultare \"man 5 apt.conf\" alla sezione \"APT::" "Immediate-Configure\" (%d)." -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, c-format msgid "Could not configure '%s'. " msgstr "Impossibile configurare \"%s\". " -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2918,7 +2936,7 @@ msgstr "" "Il pacchetto %s deve essere reinstallato, ma non è possibile trovarne un " "archivio." -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2926,12 +2944,12 @@ msgstr "" "Errore, pkgProblemResolver::Resolve ha generato delle interruzioni. Questo " "potrebbe essere causato da pacchetti bloccati." -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Impossibile correggere i problemi, ci sono pacchetti danneggiati bloccati." -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3112,12 +3130,12 @@ msgstr "rename() non riuscita: %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "MD5sum non corrispondente" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 msgid "Hash Sum mismatch" msgstr "Somma hash non corrispondente" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3126,17 +3144,17 @@ msgstr "" "Impossibile trovare la voce \"%s\" nel file Release (voce in sources.list " "errata o file danneggiato)" -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Impossibile trovare la somma hash per \"%s\" nel file Release" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Non è disponibile alcuna chiave pubblica per i seguenti ID di chiavi:\n" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3145,12 +3163,12 @@ msgstr "" "Il file Release per %s è scaduto (non valido dal %s). Gli aggiornamenti per " "questo repository non verranno applicati." -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribuzione in conflitto: %s (atteso %s ma ottenuto %s)" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3160,12 +3178,12 @@ msgstr "" "aggiornato e verranno usati i file indice precedenti. Errore GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "Errore GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3174,7 +3192,7 @@ msgstr "" "Impossibile trovare un file per il pacchetto %s. Potrebbe essere necessario " "sistemare manualmente questo pacchetto (a causa dell'architettura mancante)." -#: apt-pkg/acquire-item.cc:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3184,7 +3202,7 @@ msgstr "" "correggere manualmente questo pacchetto." # (ndt) sarebbe da controllare se veramente possono esistere più file indice -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3192,7 +3210,7 @@ msgstr "" "I file indice del pacchetto sono danneggiati. Manca il campo \"Filename:\" " "per il pacchetto %s." -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "Le dimensioni non corrispondono" @@ -3316,22 +3334,22 @@ msgstr "Scrittura nuovo elenco sorgenti\n" msgid "Source list entries for this disc are:\n" msgstr "Le voci dell'elenco sorgenti per questo disco sono:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "Scritti %i record.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Scritti %i record con %i file mancanti.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Scritti %i record con %i file senza corrispondenze\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3431,12 +3449,12 @@ msgstr "Esecuzione solver esterno" msgid "Installing %s" msgstr "Installazione di %s" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr "Configurazione di %s" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr "Rimozione di %s" @@ -3457,82 +3475,82 @@ msgid "Running post-installation trigger %s" msgstr "Esecuzione comando di post installazione %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, c-format msgid "Directory '%s' missing" msgstr "Directory \"%s\" mancante" -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, c-format msgid "Could not open file '%s'" msgstr "Impossibile aprire il file \"%s\"" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr "Preparazione di %s" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr "Estrazione di %s" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "Preparazione alla configurazione di %s" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr "Pacchetto %s installato" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "Preparazione alla rimozione di %s" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr "Pacchetto %s rimosso" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparazione alla rimozione completa di %s" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr "Pacchetto %s rimosso completamente" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Impossibile scrivere il registro, openpty() non riuscita (forse /dev/pts non " "è montato)\n" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "Esecuzione di dpkg" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "L'operazione è stata interrotta prima di essere completata" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "" "Segnalazione apport non scritta poiché è stato raggiunto il valore massimo " "di MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "Problemi con le dipendenze - Viene lasciato non configurato" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3540,7 +3558,7 @@ msgstr "" "Segnalazione apport non scritta poiché il messaggio di errore indica la " "presenza di un fallimento precedente." -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3548,7 +3566,7 @@ msgstr "" "Segnalazione apport non scritta poiché il messaggio di errore indica un " "errore per disco pieno." -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3556,7 +3574,7 @@ msgstr "" "Segnalazione apport non scritta poiché il messaggio di errore indica un " "errore di memoria esaurita" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/ja.po b/po/ja.po index 20a1162bc..724dd3000 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.1\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2012-07-01 00:14+0900\n" "Last-Translator: Kenshi Muto \n" "Language-Team: Debian Japanese List \n" @@ -91,78 +91,78 @@ msgstr "総空き容量: " msgid "Total space accounted for: " msgstr "総占有容量: " -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "Package ファイル %s が同期していません。" -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "パッケージが見つかりません" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 msgid "You must give at least one search pattern" msgstr "検索パターンはちょうど 1 つだけ指定してください" -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" "このコマンドは時代遅れです。'apt-mark showauto' を代わりに使用してください。" -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "パッケージ %s が見つかりません" -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "パッケージファイル:" -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 msgid "Cache is out of sync, can't x-ref a package file" msgstr "キャッシュが同期しておらず、パッケージファイルを相互参照できません" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "Pin されたパッケージ:" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(見つかりません)" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr " インストールされているバージョン: " -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr " 候補: " -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(なし)" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr " パッケージ Pin: " #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr " バージョンテーブル:" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s for %s コンパイル日時: %s %s\n" -#: cmdline/apt-cache.cc:1730 +#: cmdline/apt-cache.cc:1760 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -290,83 +290,101 @@ msgstr "" " -c=? 指定した設定ファイルを読み込む\n" " -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +msgid "[Y/n]" +msgstr "[Y/n]" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "[y/N]" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" msgstr "N" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "正規表現の展開エラー - %s" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "以下のパッケージには満たせない依存関係があります:" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "しかし、%s はインストールされています" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "しかし、%s はインストールされようとしています" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "しかし、インストールすることができません" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "しかし、これは仮想パッケージです" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "しかし、インストールされていません" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "しかし、インストールされようとしていません" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr " または" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "以下のパッケージが新たにインストールされます:" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "以下のパッケージは「削除」されます:" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 msgid "The following packages have been kept back:" msgstr "以下のパッケージは保留されます:" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "以下のパッケージはアップグレードされます:" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "以下のパッケージは「ダウングレード」されます:" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "以下の変更禁止パッケージは変更されます:" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s (%s のため) " -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -374,59 +392,59 @@ msgstr "" "警告: 以下の不可欠パッケージが削除されます。\n" "何をしようとしているか本当にわかっていない場合は、実行してはいけません!" -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "アップグレード: %lu 個、新規インストール: %lu 個、" -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "再インストール: %lu 個、" -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "ダウングレード: %lu 個、" -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "削除: %lu 個、保留: %lu 個。\n" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu 個のパッケージが完全にインストールまたは削除されていません。\n" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "注意: タスク '%2$s' に対して '%1$s' を選択しています\n" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "注意: 正規表現 '%2$s' に対して '%1$s' を選択しています\n" -#: cmdline/apt-get.cc:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "%s は以下のパッケージで提供されている仮想パッケージです:\n" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr " [インストール済み]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 msgid " [Not candidate version]" msgstr "[候補バージョンなし]" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "インストールするパッケージを明示的に選択する必要があります。" -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -437,194 +455,194 @@ msgstr "" "おそらく、そのパッケージが見つからないか、もう古くなっているか、\n" "あるいは別のソースからのみしか利用できないという状況が考えられます\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "しかし、以下のパッケージで置き換えられています:" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, c-format msgid "Package '%s' has no installation candidate" msgstr "パッケージ '%s' にはインストール候補がありません" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "'%s' のような仮想パッケージは削除できません\n" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "" "パッケージ %s はインストールされていないため、削除はできません。'%s' のことで" "しょうか?\n" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "パッケージ '%s' はインストールされていないため、削除はできません\n" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "注意、'%2$s' の代わりに '%1$s' を選択しています\n" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "すでにインストールされておりアップグレードも設定されていないため、%s をスキッ" "プします。\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "" "%s はインストールされていないのにアップグレードだけが要求されているので、ス" "キップします。\n" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "ダウンロードできないため、%s の再インストールは不可能です。\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "%s はすでに最新バージョンです。\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s は手動でインストールしたと設定されました。\n" -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:913 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "'%3$s' にはバージョン '%1$s' (%2$s) を選択しました\n" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "'%4$s' のため、'%3$s' にはバージョン '%1$s' (%2$s) を選択しました\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "依存関係を解決しています ..." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr " 失敗しました。" -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "依存関係を訂正できません" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "アップグレードセットを最小化できません" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr " 完了" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" "これらを直すためには 'apt-get -f install' を実行する必要があるかもしれませ" "ん。" -#: cmdline/apt-get.cc:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "未解決の依存関係があります。-f オプションを試してください。" -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 msgid "WARNING: The following packages cannot be authenticated!" msgstr "警告: 以下のパッケージは認証されていません!" -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "認証の警告は上書きされました。\n" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " -msgstr "検証なしにこれらのパッケージをインストールしますか [y/N]? " +#: cmdline/apt-get.cc:1108 +msgid "Install these packages without verification?" +msgstr "検証なしにこれらのパッケージをインストールしますか?" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" -msgstr "いくつかのパッケージを認証できませんでした" +msgstr "いくつかのパッケージを認証できませんでした?" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "問題が発生し、-y オプションが --force-yes なしで使用されました" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "内部エラー、InstallPackages が壊れたパッケージで呼び出されました!" -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 msgid "Packages need to be removed but remove is disabled." msgstr "パッケージを削除しなければなりませんが、削除が無効になっています。" -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 msgid "Internal error, Ordering didn't finish" msgstr "内部エラー、調整が終わっていません" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "おっと、サイズがマッチしません。apt@packages.debian.org にメールしてください" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "%2$sB 中 %1$sB のアーカイブを取得する必要があります。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "%sB のアーカイブを取得する必要があります。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "この操作後に追加で %sB のディスク容量が消費されます。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "この操作後に %sB のディスク容量が解放されます。\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s の空き領域を測定できません" -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, c-format msgid "You don't have enough free space in %s." msgstr "%s に充分な空きスペースがありません。" -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Trivial Only が指定されましたが、これは簡単な操作ではありません。" #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -635,28 +653,28 @@ msgstr "" "続行するには、'%s' というフレーズをタイプしてください。\n" " ?] " -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "中断しました。" -#: cmdline/apt-get.cc:1284 -msgid "Do you want to continue [Y/n]? " -msgstr "続行しますか [Y/n]? " +#: cmdline/apt-get.cc:1313 +msgid "Do you want to continue?" +msgstr "続行しますか" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s の取得に失敗しました %s\n" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "いくつかのファイルの取得に失敗しました" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "ダウンロードオンリーモードでパッケージのダウンロードが完了しました" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -664,19 +682,19 @@ msgstr "" "いくつかのアーカイブを取得できません。apt-get update を実行するか --fix-" "missing オプションを付けて試してみてください。" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing とメディア交換は現在同時にはサポートされていません" -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "足りないパッケージを直すことができません。" -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "インストールを中断します。" -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -687,36 +705,36 @@ msgstr[0] "" "以下のパッケージは、全ファイルが別のパッケージで上書きされたため、\n" "システムから消えました:" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "注意: これは dpkg により自動でわざと行われれます。" -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "パッケージ '%2$s' の利用できないターゲットリリース '%1$s' を無視" -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "'%2$s' の代わりに '%1$s' をソースパッケージとして選出しています\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "パッケージ '%2$s' の利用できないバージョン '%1$s' を無視" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr "update コマンドは引数をとりません" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "一連のものを削除するようになっていないので、AutoRemover を開始できません" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -734,15 +752,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 msgid "The following information may help to resolve the situation:" msgstr "以下の情報がこの問題を解決するために役立つかもしれません:" -#: cmdline/apt-get.cc:1824 +#: cmdline/apt-get.cc:1853 msgid "Internal Error, AutoRemover broke stuff" msgstr "内部エラー、AutoRemover が何かを破壊しました" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -751,7 +769,7 @@ msgid_plural "" msgstr[0] "" "以下のパッケージが自動でインストールされましたが、もう必要とされていません:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -760,22 +778,22 @@ msgstr[0] "" "%lu つのパッケージが自動でインストールされましたが、もう必要とされていませ" "ん:\n" -#: cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1866 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "これを削除するには 'apt-get autoremove' を利用してください。" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "内部エラー、AllUpgrade が何かを破壊しました" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1984 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "以下の問題を解決するために 'apt-get -f install' を実行する必要があるかもしれ" "ません:" -#: cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -783,7 +801,7 @@ msgstr "" "未解決の依存関係です。'apt-get -f install' を実行してみてください (または解法" "を明示してください)。" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:2002 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" @@ -795,33 +813,33 @@ msgstr "" "であれば) 必要なパッケージがまだ作成されていなかったり Incoming から移\n" "動されていないことが考えられます。" -#: cmdline/apt-get.cc:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "壊れたパッケージ" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "以下の特別パッケージがインストールされます:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "提案パッケージ:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "推奨パッケージ:" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "パッケージ %s が見つかりません" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s は自動でインストールしたと設定されました。\n" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -829,47 +847,47 @@ msgstr "" "このコマンドは時代遅れです。'apt-mark auto' および 'apt-mark manual' を代わり" "に使用してください。" -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "アップグレードパッケージを検出しています ... " -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "失敗" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "完了" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 msgid "Internal error, problem resolver broke stuff" msgstr "内部エラー、問題リゾルバが何かを破壊しました" -#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "ダウンロードディレクトリをロックできません" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "'%2$s' のバージョン '%1$s' をダウンロードするソースが見つかりません" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "%s %s をダウンロードしています" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 msgid "Must specify at least one package to fetch source for" msgstr "" "ソースを取得するには少なくとも 1 つのパッケージ名を指定する必要があります" -#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, c-format msgid "Unable to find a source package for %s" msgstr "%s のソースパッケージが見つかりません" -#: cmdline/apt-get.cc:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -879,7 +897,7 @@ msgstr "" "ます:\n" "%s\n" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, c-format msgid "" "Please use:\n" @@ -891,89 +909,89 @@ msgstr "" "bzr branch %s\n" "を使用してください。\n" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "すでにダウンロードされたファイル '%s' をスキップします\n" -#: cmdline/apt-get.cc:2604 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr "%s に充分な空きスペースがありません" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2644 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%2$sB 中 %1$sB のソースアーカイブを取得する必要があります。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2649 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB のソースアーカイブを取得する必要があります。\n" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "ソース %s を取得\n" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "いくつかのアーカイブの取得に失敗しました。" -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "すでに %s に展開されたソースがあるため、展開をスキップします\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "展開コマンド '%s' が失敗しました。\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" "'dpkg-dev' パッケージがインストールされていることを確認してください。\n" -#: cmdline/apt-get.cc:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "ビルドコマンド '%s' が失敗しました。\n" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "子プロセスが失敗しました" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 msgid "Must specify at least one package to check builddeps for" msgstr "" "ビルド依存関係をチェックするパッケージを少なくとも 1 つ指定する必要があります" -#: cmdline/apt-get.cc:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -"%s に利用可能なアーキテクチャ情報がありません。セットアップのために apt.conf" -"(5) の APT::Architectures を参照してください。" +"%s に利用可能なアーキテクチャ情報がありません。セットアップのために apt." +"conf(5) の APT::Architectures を参照してください。" -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s のビルド依存情報を取得できません" -#: cmdline/apt-get.cc:2839 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr "%s にはビルド依存情報が指定されていません。\n" -#: cmdline/apt-get.cc:3009 +#: cmdline/apt-get.cc:3040 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -982,7 +1000,7 @@ msgstr "" "パッケージ %3$s が '%4$s' パッケージで許されていないため、%2$s に対する %1$s " "の依存関係を満たすことができません" -#: cmdline/apt-get.cc:3027 +#: cmdline/apt-get.cc:3058 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -991,14 +1009,14 @@ msgstr "" "パッケージ %3$s が見つからないため、%2$s に対する %1$s の依存関係を満たすこと" "ができません" -#: cmdline/apt-get.cc:3050 +#: cmdline/apt-get.cc:3081 #, 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:3089 +#: cmdline/apt-get.cc:3120 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1007,7 +1025,7 @@ msgstr "" "パッケージ %3$s の候補バージョンはバージョンについての要求を満たせないた" "め、%2$s に対する %1$s の依存関係を満たすことができません" -#: cmdline/apt-get.cc:3095 +#: cmdline/apt-get.cc:3126 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1016,30 +1034,30 @@ msgstr "" "パッケージ %3$s の候補バージョンが存在しないため、%2$s に対する %1$s の依存関" "係を満たすことができません" -#: cmdline/apt-get.cc:3118 +#: cmdline/apt-get.cc:3149 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s の依存関係 %1$s を満たすことができません: %3$s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3164 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s のビルド依存関係を満たすことができませんでした。" -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "ビルド依存関係の処理に失敗しました" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, c-format msgid "Changelog for %s (%s)" msgstr "%s (%s) の変更履歴" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "サポートされているモジュール:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1131,7 +1149,7 @@ msgstr "" "apt-get(8)、sources.list(5)、apt.conf(5) を参照してください。\n" " この APT は Super Cow Powers 化されています。\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1206,8 +1224,8 @@ msgid "%s was already not hold.\n" msgstr "%s はすでに保留されていません。\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s を待ちましたが、そこにはありませんでした" @@ -1293,7 +1311,7 @@ msgstr "%s の CD-ROM は使用中のためアンマウントすることがで msgid "Disk not found." msgstr "ディスクが見つかりません。" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "ファイルが見つかりません" @@ -1356,7 +1374,7 @@ msgstr "ログインスクリプトのコマンド '%s' 失敗、サーバ応答 msgid "TYPE failed, server said: %s" msgstr "TYPE 失敗、サーバ応答: %s" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "接続タイムアウト" @@ -1364,8 +1382,8 @@ msgstr "接続タイムアウト" msgid "Server closed the connection" msgstr "サーバが接続を切断しました" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "読み込みエラー" @@ -1377,86 +1395,86 @@ msgstr "レスポンスがバッファをオーバフローさせました。" msgid "Protocol corruption" msgstr "プロトコルが壊れています" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "書き込みエラー" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "ソケットを作成できません" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "データソケットへ接続できませんでした。接続がタイムアウトしました" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "パッシブソケットに接続できません。" -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo はリスニングソケットを取得できませんでした" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "ソケットをバインドできませんでした" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "ソケットをリスンできませんでした" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "ソケットの名前を特定できませんでした" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "PORT コマンドを送信できません" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "未知のアドレスファミリ %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT に失敗しました。サーバ応答: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "データソケット接続タイムアウト" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "接続を accept できません" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "ファイルのハッシュでの問題" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "ファイルを取得できません。サーバ応答 '%s'" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "データソケットタイムアウト" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "データ転送に失敗しました。サーバ応答 '%s'" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "問い合わせ" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "呼び出せません" @@ -1492,7 +1510,7 @@ msgstr "%s:%s (%s) へ接続できませんでした。" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "%s へ接続しています" @@ -1522,38 +1540,38 @@ msgstr "'%s:%s' (%i - %s) の解決中に何か問題が起こりました" msgid "Unable to connect to %s:%s:" msgstr "%s:%s へ接続できません:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:167 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "内部エラー: 正しい署名ですが、鍵指紋を確定できません?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "少なくとも 1 つの不正な署名が発見されました。" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:173 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "署名を検証するための 'gpgv' の実行ができませんでした (gpgv はインストールされ" "ていますか?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "gpgv の実行中に未知のエラーが発生" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 msgid "The following signatures were invalid:\n" msgstr "以下の署名が無効です:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1591,59 +1609,59 @@ msgstr "HTTP サーバのレンジサポートが壊れています" msgid "Unknown date format" msgstr "不明な日付フォーマットです" -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "select に失敗しました" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "接続タイムアウト" -#: methods/http.cc:855 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "出力ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:928 +#: methods/http.cc:927 msgid "Error reading from server. Remote end closed connection" msgstr "リモート側で接続がクローズされてサーバからの読み込みに失敗しました" -#: methods/http.cc:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "サーバからの読み込みに失敗しました" -#: methods/http.cc:1198 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "不正なヘッダです" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "接続失敗" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "内部エラー" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "%s を読み込むことができません" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1696,7 +1714,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "子プロセスへの IPC パイプの作成に失敗しました" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "途中で接続がクローズされました" @@ -2173,11 +2191,11 @@ msgstr "不正なアーカイブメンバーヘッダ %s" msgid "Invalid archive member header" msgstr "不正なアーカイブメンバーヘッダ" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "アーカイブが不足しています" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "アーカイブヘッダの読み込みに失敗しました" @@ -2507,7 +2525,7 @@ msgstr "不正な操作 %s" msgid "Unable to stat the mount point %s" msgstr "マウントポイント %s の状態を取得できません" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "CD-ROM の状態を取得するのに失敗しました" @@ -2526,33 +2544,33 @@ msgstr "読み込み専用のロックファイル %s にロックは使用し msgid "Could not open lock file %s" msgstr "ロックファイル %s をオープンできません" -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "nfs マウントされたロックファイル %s にはロックを使用しません" -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "ロック %s が取得できませんでした" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "'%s' がディレクトリではないため、ファイルの一覧を作成できません" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "ディレクトリ '%2$s' の '%1$s' が通常ファイルではないため、無視します" -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" "ディレクトリ '%2$s' の '%1$s' がファイル名拡張子を持たないため、無視します" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" @@ -2560,70 +2578,70 @@ msgstr "" "ディレクトリ '%2$s' の '%1$s' が無効なファイル名拡張子を持っているため、無視" "します" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "子プロセス %s がセグメンテーション違反を受け取りました。" -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, c-format msgid "Sub-process %s received signal %u." msgstr "子プロセス %s がシグナル %u を受け取りました。" -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "子プロセス %s がエラーコード (%u) を返しました" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "子プロセス %s が予期せず終了しました" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "ファイル %s をオープンできませんでした" -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, c-format msgid "Could not open file descriptor %d" msgstr "ファイルデスクリプタ %d を開けませんでした" -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "子プロセス IPC の生成に失敗しました" -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "以下の圧縮ツールの実行に失敗しました: " -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, c-format msgid "read, still have %llu to read but none left" msgstr "読み込みが %llu 残っているはずですが、何も残っていません" -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "あと %llu 書き込む必要がありますが、書き込むことができませんでした" -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, c-format msgid "Problem closing the file %s" msgstr "ファイル %s のクローズ中に問題が発生しました" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, c-format msgid "Problem renaming the file %s to %s" msgstr "%s から %s へのファイル名変更中に問題が発生しました" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, c-format msgid "Problem unlinking the file %s" msgstr "ファイル %s の削除中に問題が発生しました" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "ファイルの同期中に問題が発生しました" @@ -2824,7 +2842,7 @@ msgstr "ソースリスト %2$s の %1$u 行目が不正です (type)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "ソースリスト %3$s の %2$u 行にあるタイプ '%1$s' は不明です" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2833,12 +2851,12 @@ msgstr "" "'%s' の即時設定は動作しません。詳細については man 5 apt.conf の APT::" "Immediate-Configure の項を参照してください。(%d)" -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, c-format msgid "Could not configure '%s'. " msgstr "'%s' を設定できませんでした。" -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2862,7 +2880,7 @@ msgstr "" "パッケージ %s を再インストールする必要がありますが、そのためのアーカイブを見" "つけることができませんでした。" -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2870,11 +2888,11 @@ msgstr "" "エラー、pkgProblemResolver::Resolve は停止しました。おそらく変更禁止パッケー" "ジが原因です。" -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "問題を解決することができません。壊れた変更禁止パッケージがあります。" -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3052,12 +3070,12 @@ msgstr "名前の変更に失敗しました。%s (%s -> %s)" msgid "MD5Sum mismatch" msgstr "MD5Sum が適合しません" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 msgid "Hash Sum mismatch" msgstr "ハッシュサムが適合しません" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3066,16 +3084,16 @@ msgstr "" "期待されるエントリ '%s' が Release ファイル内に見つかりません (誤った " "sources.list エントリか、壊れたファイル)" -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Release ファイル中の '%s' のハッシュサムを見つけられません" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "以下の鍵 ID に対して利用可能な公開鍵がありません:\n" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3084,14 +3102,14 @@ msgstr "" "%s の Release ファイルは期限切れ (%s 以来無効) です。このリポジトリからの更新" "物は適用されません。" -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" "ディストリビューションが競合しています: %s (%s を期待していたのに %s を取得し" "ました)" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3101,12 +3119,12 @@ msgstr "" "ファイルが使われます。GPG エラー: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "GPG エラー: %s: %s" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3115,7 +3133,7 @@ msgstr "" "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動" "で修正する必要があります (存在しないアーキテクチャのため)。" -#: apt-pkg/acquire-item.cc:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3124,7 +3142,7 @@ msgstr "" "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動" "で修正する必要があります。" -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3132,7 +3150,7 @@ msgstr "" "パッケージインデックスファイルが壊れています。パッケージ %s に Filename: " "フィールドがありません。" -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "サイズが適合しません" @@ -3256,22 +3274,22 @@ msgstr "新しいソースリストを書き込んでいます\n" msgid "Source list entries for this disc are:\n" msgstr "このディスクのソースリストのエントリ:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "%i レコードを書き込みました。\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i レコードを書き込みました。%i 個のファイルが存在しません。\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i レコードを書き込みました。%i 個の適合しないファイルがあります。\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3365,12 +3383,12 @@ msgstr "外部ソルバを実行" msgid "Installing %s" msgstr "%s をインストールしています" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr "%s を設定しています" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr "%s を削除しています" @@ -3391,80 +3409,80 @@ msgid "Running post-installation trigger %s" msgstr "インストール後トリガ %s を実行しています" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, c-format msgid "Directory '%s' missing" msgstr "ディレクトリ '%s' が見つかりません" -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, c-format msgid "Could not open file '%s'" msgstr "ファイル '%s' をオープンできませんでした" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr "%s を準備しています" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr "%s を展開しています" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "%s の設定を準備しています" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr "%s をインストールしました" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "%s の削除を準備しています" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr "%s を削除しました" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "%s を完全に削除する準備をしています" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr "%s を完全に削除しました" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "ログに書き込めません。openpty() に失敗しました (/dev/pts がマウントされていな" "い?)\n" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "dpkg を実行しています" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "操作はそれが完了する前に中断されました" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "MaxReports にすでに達しているため、レポートは書き込まれません" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "依存関係の問題 - 未設定のままにしています" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3472,7 +3490,7 @@ msgstr "" "エラーメッセージは前の失敗から続くエラーであることを示しているので、レポート" "は書き込まれません。" -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3480,7 +3498,7 @@ msgstr "" "エラーメッセージはディスクフルエラーであることを示しているので、レポートは書" "き込まれません。" -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3488,7 +3506,7 @@ msgstr "" "エラーメッセージはメモリ超過エラーであることを示しているので、レポートは書き" "込まれません。" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/km.po b/po/km.po index 7dbd640b6..47812dac2 100644 --- a/po/km.po +++ b/po/km.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_km\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2006-10-10 09:48+0700\n" "Last-Translator: Khoem Sokhem \n" "Language-Team: Khmer \n" @@ -96,78 +96,78 @@ msgstr "ទំហំ slack សរុប ៖" msgid "Total space accounted for: " msgstr "ទំហំ​សរុប​ដែល​ទុក​សម្រាប់ ៖ " -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "ឯកសារ​កញ្ចប់ %s នៅ​ខាងក្រៅ​ការ​ធ្វើសមកាលកម្ម ។" -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "រក​កញ្ចប់​មិន​ឃើញ" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 #, fuzzy msgid "You must give at least one search pattern" msgstr "អ្នក​ត្រូវ​តែ​ផ្ដល់​លំនាំ​មួយ​ដែល​ពិត​ប្រាកដ" -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "មិន​អាច​កំណត់​ទីតាំង​កញ្ចប់ %s បានឡើយ" -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "ឯកសារ​កញ្ចប់ ៖" -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 msgid "Cache is out of sync, can't x-ref a package file" msgstr "ឃ្លាំង​សម្ងាត់​ឋិតនៅ​ក្រៅ​ការ​ធ្វើ​សមកាល​កម្ម ដែលមិន​អាច x-ref ឯកសារ​កញ្ចប់​បាន​ទេ" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "កញ្ចប់​ដែល​បាន​ខ្ទាស់ ៖" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(រក​មិន​ឃើញ)" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr " បាន​ដំឡើង ៖ " -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr " សាកល្បង ៖ " -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(គ្មាន)" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr " ខ្ទាស់​កញ្ចប់ ៖ " #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr " តារាង​កំណែ ៖" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s សម្រាប់ %s %s បាន​ចងក្រងនៅលើ​%s %s\n" -#: cmdline/apt-cache.cc:1730 +#: cmdline/apt-cache.cc:1760 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -298,83 +298,101 @@ msgstr "" " -c=? អាន​ឯកសារ​ការកំណត់​រចនាសម្ព័ន្ធ​នេះ \n" " -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +msgid "[Y/n]" +msgstr "" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" msgstr "" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Regex កំហុស​ការចងក្រង​ - %s" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "កញ្ចប់​ខាងក្រោម​មាន​ភាពអាស្រ័យ​ដែល​ខុស​គ្នា ៖" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "ប៉ុន្តែ​ %s ត្រូវ​បាន​ដំឡើង​" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "ប៉ុន្តែ​​វា​មិន​អាច​ដំឡើង​បាន​ទេ​" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "ប៉ុន្តែ​​វា​ជា​កញ្ចប់​និម្មិត​" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "ប៉ុន្តែ​វា​មិន​បាន​ដំឡើង​ទេ​" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "ប៉ុន្តែ វា​នឹង​មិន​ត្រូវ​បាន​ដំឡើង​ទេ" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr " ឬ" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "កញ្ចប់​ខាងក្រោម​នឹងត្រូវ​បាន​យកចេញ ៖" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 msgid "The following packages have been kept back:" msgstr "​កញ្ចប់​ខាង​ក្រោម​ត្រូវ​បាន​យក​ត្រឡប់​មក​វិញ ៖" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​​ធ្វើ​ឲ្យប្រសើ​ឡើង ៖" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​បន្ទាប ៖" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "កញ្ចប់​រង់ចាំ​ខាងក្រោម​នឹង​ត្រូវ​​បានផ្លាស់​​ប្តូរ​ ៖" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s (ដោយ​សារតែ​ %s) " -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -382,60 +400,60 @@ msgstr "" "ព្រមាន​ ៖ កញ្ចប់ដែល​ចាំបាច់​ខាងក្រោម​នឹង​ត្រូវ​បាន​យកចេញ ។\n" "ការយកចេញ​នេះ​មិន​ត្រូវ​បានធ្វើ​ទេ​លុះត្រា​តែ​អ្នកដឹង​ថា​​អ្នក​កំពុង​ធ្វើ​អ្វីឲ្យប្រាកដ !" -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu ត្រូវ​បាន​ធ្វើ​ឲ្យ​ប្រសើរ %lu ត្រូវ​បានដំឡើង​ថ្មី " -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "%lu ត្រូវ​បាន​ដំឡើង​ឡើង​វិញ " -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "%lu ​ត្រូវបានបន្ទាប់ " -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu ដែលត្រូវ​យក​ចេញ​ ហើយ​ %lu មិន​​បាន​ធ្វើ​ឲ្យ​ប្រសើរឡើយ ។\n" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu មិន​បាន​ដំឡើង​ ឬ យក​ចេញបានគ្រប់ជ្រុងជ្រោយ​ឡើយ​ ។\n" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, fuzzy, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "ចំណាំ កំពុង​ជ្រើស​ %s សម្រាប់ regex '%s'\n" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, fuzzy, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "ចំណាំ កំពុង​ជ្រើស​ %s សម្រាប់ regex '%s'\n" -#: cmdline/apt-get.cc:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "កញ្ចប់​ %s ជា​កញ្ចប់​និម្មិត​ដែល​បាន​ផ្តល់​ដោយ​ ៖\n" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr " [បានដំឡើង​]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 #, fuzzy msgid " [Not candidate version]" msgstr "កំណែ​សាកល្បង​" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "អ្នក​គួរតែ​ជ្រើស​យក​មួយ​​ឲ្យ​ច្បាស់​ដើម្បី​ដំឡើង​ ។" -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -446,185 +464,186 @@ msgstr "" "វា​មានន័យ​ថា​បាត់កញ្ចប់ ​គេ​លែង​ប្រើ ឬ\n" "អាច​រក​បាន​ពី​ប្រភព​ផ្សេង​ទៀត\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "ទោះ​យ៉ាងណា​ក៏ដោយ កញ្ចប់​ខាងក្រោម​ជំនួស​វា ៖" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, fuzzy, c-format msgid "Package '%s' has no installation candidate" msgstr "កញ្ចប់​ %s មិនមាន​ការដំឡើងសាកល្បងឡើយ" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "មិនទាន់បានដំឡើង​កញ្ចប់​ %s ទេ​ ដូច្នេះ មិន​បាន​យកចេញឡើយ \n" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "មិនទាន់បានដំឡើង​កញ្ចប់​ %s ទេ​ ដូច្នេះ មិន​បាន​យកចេញឡើយ \n" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, fuzzy, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "ចំណាំ កំពុង​ជ្រើស​ %s ជំនួស​ %s\n" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "កំពុង​រំលង​ %s វា​បាន​ដំឡើង​រួចរាល់​ ហើយ​ភាព​ធ្វើឲ្យ​ប្រសើរ​​មិន​ទាន់​កំណត់​​ ។\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, fuzzy, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "កំពុង​រំលង​ %s វា​បាន​ដំឡើង​រួចរាល់​ ហើយ​ភាព​ធ្វើឲ្យ​ប្រសើរ​​មិន​ទាន់​កំណត់​​ ។\n" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "មិនអាចធ្វើការដំឡើង %s ឡើងវិញបានទេ វា​មិនអាចត្រូវបាន​ទាញយកបានឡើយ ។\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទៅហើយ ។\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង" -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:913 #, fuzzy, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "បានជ្រើស​កំណែ​ %s (%s) សម្រាប់ %s\n" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, fuzzy, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "បានជ្រើស​កំណែ​ %s (%s) សម្រាប់ %s\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "កំពុង​កែ​ភាពអាស្រ័យ​..." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr " បាន​បរាជ័យ ។" -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "មិន​អាច​កែ​ភាព​អាស្រ័យ​បានឡើយ​" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "មិនអាច​បង្រួម​ការ​កំណត់​ភាព​ប្រសើរ​​បាន​ឡើយ​" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr " ធ្វើ​រួច" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "អ្នក​ប្រហែល​ជា​ចង់រត់ 'apt-get -f install' ដើម្បី​កែ​វា​​ទាំងនេះ​ហើយ ។" -#: cmdline/apt-get.cc:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "ភាព​អាស្រ័យ​ដែល​ខុស​គ្នា ។ ព្យាយាម​ការ​ប្រើ -f ។" -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ព្រមាន​ ៖ មិនអាច​ធ្វើការផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវកញ្ចប់ខាងក្រោមបានឡើយ !" -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "បានបដិសេធ​ការព្រមាន​ការផ្ទៀងផ្ទាត់ភាព​ត្រឹមត្រូវ ។\n" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " +#: cmdline/apt-get.cc:1108 +#, fuzzy +msgid "Install these packages without verification?" msgstr "ដំឡើង​កញ្ចប់​ទាំងនេះ ​ដោយគ្មានការពិនិត្យ​បញ្ជាក់ [y/N] ? " -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" msgstr "មិនអាច​ផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវកញ្ចប់​មួយចំនួន​បានឡើយ​" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "មាន​បញ្ហា​ ហើយ -y ត្រូវ​បាន​ប្រើ​ដោយគ្មាន​​ --force​-yes" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "កំហុស​ខាងក្នុង កញ្ចប់​ដំឡើង​ត្រូវ​បាន​ហៅ​​ជាមួយ​កញ្ចប់​ដែល​ខូច !" -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 msgid "Packages need to be removed but remove is disabled." msgstr "កញ្ចប់ ​ត្រូវការឲ្យ​យក​ចេញ​​ ប៉ុន្តែមិនអនុញ្ញាត​ឲ្យយកចេញឡើយ ។" -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 msgid "Internal error, Ordering didn't finish" msgstr "កំហុស​ខាងក្នុង​ ការ​រៀប​តាម​លំដាប់​មិន​បាន​បញ្ចប់ឡើយ" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "យី អី​ក៏​ចម្លែង​ម្លេះ.. ទំហំ​មិន​ដូច​គ្នា​ឡើយ ។ សូម​ផ្ញើ​អ៊ីមែល​ទៅ apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "ត្រូវការ​​យក​ %sB/%sB នៃ​ប័ណ្ណសារ ។​\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "ត្រូវ​ការយក​ %sB នៃ​ប័ណ្ណសារ ។\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, fuzzy, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "បន្ទាប់​ពី​ពន្លា​ %sB នៃ​ការ​បន្ថែម​​ទំហំ​ថាស​ត្រូវ​បាន​ប្រើ ។\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, fuzzy, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "បន្ទាប់​ពី​ពន្លា​ %sB ទំហំ​ថាសនឹង​​ទំនេរ ។ \n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Couldn't determine free space in %s" msgstr "មិន​អាច​កំណត់​ទំហំ​ទំនេរ​ក្នុង​ %s បានឡើយ" -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, c-format msgid "You don't have enough free space in %s." msgstr "អ្នក​គ្មាន​ទំហំ​​ទំនេរ​គ្រប់គ្រាន់​ក្នុង​​ %s ឡើយ ។" -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "បានបញ្ជាក់​តែប្រតិបត្តិការដែលមិនសំខាន់ប៉ុណ្ណោះ ប៉ុន្តែ​នេះមិនមែនជាប្រតិបត្តិការមិនសំខាន់នោះទេ ។" #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "បាទ/ចាស ធ្វើ​ដូច​ដែល​ខ្ញុំ​និយាយ !" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -635,28 +654,29 @@ msgstr "" "ដើម្បី​បន្ត ​​វាយ​ក្នុង​ឃ្លា​ '%s'\n" " ?] " -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "បោះបង់ ។" -#: cmdline/apt-get.cc:1284 -msgid "Do you want to continue [Y/n]? " +#: cmdline/apt-get.cc:1313 +#, fuzzy +msgid "Do you want to continue?" msgstr "តើ​អ្នក​ចង់​បន្តឬ​ [បាទ ចាស/ទេ​] ? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ %s %s\n" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "ឯកសារ​មួយ​ចំនួន​បាន​បរាជ័យ​ក្នុង​ការ​ទាញ​យក​" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "បានបញ្ចប់ការទាញ​យក​ ហើយ​តែ​ក្នុង​របៀប​​ទាញ​យក​ប៉ុណ្ណោះ" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -664,19 +684,19 @@ msgstr "" "អនុញ្ញាត​ឲ្យ​ទៅ​ប្រមូល​យក​ប័ណ្ណសារ​មួយ​ចំនួន​ ប្រហែល​ជា​រត់​ភាព​ទាន់​សម័យ apt-get ឬ ព្យាយាមប្រើ​ជាមួយ --" "fix- ដែលបាត់ឬ់ ?" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix- ដែលបាត់​ និង ​ស្វប​មេឌៀ​ដែល​មិនបាន​​គាំទ្រនៅពេល​បច្ចុប្បន្ន​" -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "មិន​អាច​កែ​កញ្ចប់​ដែលបាត់បង់​បានឡើយ ។" -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "កំពុង​បោះបង់​ការ​ដំឡើង​ ។" -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -686,35 +706,35 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "មិនអាចថ្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr "ពាក្យ​បញ្ជា​ដែលធ្វើ​ឲ្យ​ទាន់​សម័យ​គ្មាន​អាគុយម៉ង់​ទេ" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -730,16 +750,16 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 msgid "The following information may help to resolve the situation:" msgstr "ព័ត៌មាន​ដូចតទៅនេះ អាចជួយ​ដោះស្រាយ​ស្ថានភាព​បាន ៖" -#: cmdline/apt-get.cc:1824 +#: cmdline/apt-get.cc:1853 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យខូច​ឧបករណ៍" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -749,7 +769,7 @@ msgid_plural "" msgstr[0] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖" msgstr[1] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -757,28 +777,28 @@ msgid_plural "" msgstr[0] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖" msgstr[1] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖" -#: cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1866 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "កំហុស​ខាងក្នុង ការធ្វើឲ្យប្រសើរ​ទាំងអស់បានធ្វើឲ្យ​ឧបករណ៍​ខូច" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1984 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "អ្នក​ប្រហែល​ជា​ចង់​រត់ 'apt-get -f install' ដើម្បី​កែ​ពួក​វា​ទាំង​នេះ ៖" -#: cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" "ភាពអស្រ័យ​ដែល​ខុស​គ្នា ។ ព្យាយាម​ 'apt-get -f install' ដោយ​គ្មាន​កញ្ចប់ (ឬ បញ្ជាក់​ដំណោះស្រាយ) ។" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:2002 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" @@ -790,85 +810,85 @@ msgstr "" "ដែលបាន​ទាមទារនឹងមិនទាន់បានបង្កើត​ឡើយ​\n" " ឬ ​បានយក​ចេញ​ពីការមកដល់ ។" -#: cmdline/apt-get.cc:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "កញ្ចប់​ដែល​បាន​ខូច​" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "កញ្ចប់​បន្ថែម​ដូចតទៅនេះ នឹងត្រូវបាន​ដំឡើង ៖" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​យោបល់ ៖" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​អនុសាសន៍ ៖" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "កំពុង​គណនា​ការ​ធ្វើ​ឲ្យ​ប្រសើរ... " -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "បាន​បរាជ័យ" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "ធ្វើរួច​" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 msgid "Internal error, problem resolver broke stuff" msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យខូច​ឧបករណ៍" -#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "មិន​អាច​ចាក់​សោ​ថត​ទាញ​យក​បាន​ឡើយ" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 msgid "Must specify at least one package to fetch source for" msgstr "យ៉ាងហោចណាស់​ត្រូវ​​បញ្ជាក់​​កញ្ចប់​មួយ ​ដើម្បី​ទៅ​​ប្រមូល​យក​ប្រភព​សម្រាប់" -#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, c-format msgid "Unable to find a source package for %s" msgstr "មិន​អាច​រក​កញ្ចប់ប្រភព​​សម្រាប់ %s បានឡើយ" -#: cmdline/apt-get.cc:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, c-format msgid "" "Please use:\n" @@ -876,104 +896,104 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "កំពុង​រំលង​ឯកសារ​ដែល​បាន​ទាញយក​រួច​ '%s'\n" -#: cmdline/apt-get.cc:2604 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr "អ្នក​ពុំ​មាន​ទំហំ​ទំនេរ​គ្រប់គ្រាន់​ទេ​នៅក្នុង​ %s ឡើយ" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2644 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "ត្រូវការ​យក​ %sB/%sB នៃ​ប័ណ្ណសារ​ប្រភព ។\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2649 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "ត្រូវការ​យក​ %sB នៃ​ប័ណ្ណសារ​ប្រភព​ ។\n" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "ទៅប្រមូល​ប្រភព​ %s\n" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "បរាជ័យ​ក្នុងការទៅប្រមូលយក​ប័ណ្ណសារ​មួយចំនួន ។" -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "កំពុង​រំលង​ការស្រាយ​នៃប្រភព​ដែលបានស្រាយរួច​នៅក្នុង %s\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "ពាក្យ​បញ្ជា​ស្រាយ '%s' បាន​បរាជ័យ​ ។\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "ពិនិត្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n" -#: cmdline/apt-get.cc:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "សាងសង​ពាក្យ​បញ្ជា​ '%s' បានបរាជ័យ​ ។\n" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "ដំណើរ​ការ​កូន​បាន​បរាជ័យ​" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 msgid "Must specify at least one package to check builddeps for" msgstr "ត្រូវតែ​បញ្ជាក់​យ៉ាងហោចណាស់​មួយកញ្ចប់ដើម្បីពិនិត្យ builddeps សម្រាប់" -#: cmdline/apt-get.cc:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "មិន​អាច​សាងសង់​​ព័ត៌មាន​ភាពអស្រ័យ​សម្រាប់ %s" -#: cmdline/apt-get.cc:2839 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr "%s មិនមានភាពអាស្រ័យ​ស្ថាបនាឡើយ​ ។\n" -#: cmdline/apt-get.cc:3009 +#: cmdline/apt-get.cc:3040 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "%s ភាពអស្រ័យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ពេញចិត្ត​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ " -#: cmdline/apt-get.cc:3027 +#: cmdline/apt-get.cc:3058 #, 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:3050 +#: cmdline/apt-get.cc:3081 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s ៖ កញ្ចប់ %s ដែលបានដំឡើង គឺថ្មីពេក" -#: cmdline/apt-get.cc:3089 +#: cmdline/apt-get.cc:3120 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -982,37 +1002,37 @@ msgstr "" "ភាពអាស្រ័យ %s សម្រាប់ %s មិនអាច​តម្រូវចិត្តបានទេ ព្រោះ មិនមាន​កំណែ​នៃកញ្ចប់ %s ដែលអាច​តម្រូវចិត្ត​" "តម្រូវការ​កំណែបានឡើយ" -#: cmdline/apt-get.cc:3095 +#: cmdline/apt-get.cc:3126 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "%s ភាពអស្រ័យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ពេញចិត្ត​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ " -#: cmdline/apt-get.cc:3118 +#: cmdline/apt-get.cc:3149 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3164 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "ភាពអាស្រ័យ​ដែល​បង្កើត​ %s មិន​អាច​បំពេញ​សេចក្ដី​ត្រូវការ​បាន​ទេ ។" -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ដំណើរ​​ការ​បង្កើត​ភាព​អាស្រ័យ" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "កំពុង​តភ្ជាប់​ទៅ​កាន់​ %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "ម៉ូឌុល​ដែល​គាំទ្រ ៖ " -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1097,7 +1117,7 @@ msgstr "" "pages for more information and options.\n" " This APT has Super Cow Powers.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1168,8 +1188,8 @@ msgid "%s was already not hold.\n" msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទៅហើយ ។\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr "រង់ចាំប់​ %s ប៉ុន្តែ ​វា​មិន​នៅទីនោះ" @@ -1236,7 +1256,7 @@ msgstr "មិនអាចអាន់ម៉ោន ស៊ីឌី​-រ៉ូ msgid "Disk not found." msgstr "រក​ថាសមិ​ន​ឃើញ​ ។" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "រកឯកសារ​មិន​ឃើញ​" @@ -1298,7 +1318,7 @@ msgstr "ពាក្យ​បញ្ជា​ស្គ្រីប​ចូល​ msgid "TYPE failed, server said: %s" msgstr "TYPE បានបរាជ័យ​ ម៉ាស៊ីន​បម្រើ​បាននិយាយ​ ៖ %s" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "អស់ពេល​ក្នុងការតភ្ជាប់​" @@ -1306,8 +1326,8 @@ msgstr "អស់ពេល​ក្នុងការតភ្ជាប់​" msgid "Server closed the connection" msgstr "ម៉ាស៊ីន​បម្រើ​បាន​បិទ​ការតភ្ជាប់​" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "ការអាន​មានកំហុស" @@ -1319,86 +1339,86 @@ msgstr "ឆ្លើយតប​សតិ​បណ្តោះអាសន្ន msgid "Protocol corruption" msgstr "ការបង្ខូច​ពិធីការ​" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "ការសរសេរ​មានកំហុស" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "មិន​អាច​បង្កើត​រន្ធបានឡើយ" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "មិន​អាច​តភ្ជាប់​​រន្ធទិន្នន័យ​បានឡើយ អស់​ពេល​ក្នុងការតភ្ជាប់​" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "មិនអាចតភ្ជាប់​​រន្ធអកម្ម​​បានឡើយ ។" -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo មិន​អាច​​ទទួល​យក​រន្ធ​សម្រាប់​ស្តាប់​​បានឡើយ" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "មិន​អាច​ចងរន្ធ​បានបានឡើយ​" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "មិនអាច​ស្ដាប់នៅលើរន្ធ​បានឡើយ" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "មិន​អាច​កំណត់​ឈ្មោះរបស់​រន្ធ​បានឡើយ" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "មិនអាច​ផ្ញើពាក្យ​បញ្ជា​ PORT បានឡើយ" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "មិន​ស្គាល់​អាសយដ្ឋាន​គ្រួសារ​ %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT បរាជ័យ​ ម៉ាស៊ីន​បម្រើ​បាន​និយាយ ៖ %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "ការតភ្ជាប់​រន្ធ​​ទិន្នន័បានអស់ពេល​" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "មិនអាច​ទទួលយក​ការតភ្ជាប់​បានឡើយ" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "បញ្ហា​ធ្វើឲ្យខូច​ឯកសារ" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "មិន​អាច​ទៅ​ប្រមូល​យក​ឯកសារ​បានឡើយ ម៉ាស៊ីន​បម្រើ​បាន​និយាយ​ '%s'" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "រន្ធ​ទិន្នន័យ​បាន​អស់​ពេល​" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "បរាជ័យក្នុងការ​ផ្ទេរ​ទិន្នន័យ ម៉ាស៊ីន​បម្រើ​បាន​និយាយ​ '%s'" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "សំណួរ​" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "មិន​អាច​ហៅ​ " @@ -1434,7 +1454,7 @@ msgstr "មិន​អាច​តភ្ជាប់​ទៅកាន់​ %s #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "កំពុង​តភ្ជាប់​ទៅកាន់ %s" @@ -1464,37 +1484,37 @@ msgstr "ការ​ដោះស្រាយ​អ្វី​អាក្រក msgid "Unable to connect to %s:%s:" msgstr "មិន​អាច​តភ្ជាប់​ទៅកាន់​​ %s %s ៖" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:167 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "កំហុស​ខាងក្នុង​ ៖ ហត្ថលេខា​​ល្អ ប៉ុន្តែ ​មិន​អាច​កំណត់​កូនសោ​ស្នាម​ម្រាមដៃ ?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "​បានជួប​ប្រទះ​​​​ហត្ថលេខា​យ៉ាងហោចណាស់មួយ ដែ​លត្រឹមត្រូវ​ ។" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:173 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "មិន​អាច​ប្រតិបត្តិ '%s' ដើម្បី​ផ្ទៀងផ្ទាត់​ហត្ថលេខា (តើ gpgv ត្រូវ​បាន​ដំឡើង​ឬនៅ ?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "មិនស្គាល់កំហុស ក្នុងការប្រតិបត្តិ gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 msgid "The following signatures were invalid:\n" msgstr "ហត្ថលេខា​ខាង​ក្រោម​មិន​ត្រឹមត្រូវ ៖\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1532,59 +1552,59 @@ msgstr "ម៉ាស៊ីន​បម្រើ HTTP នេះបាន​ខូ msgid "Unknown date format" msgstr "មិនស្គាល់​ទ្រង់ទ្រាយ​កាលបរិច្ឆេទ" -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "ជ្រើស​បាន​បរាជ័យ​" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "ការតភ្ជាប់​បាន​អស់ពេល​" -#: methods/http.cc:855 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារលទ្ធផល" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារ" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "កំហុសក្នុងការ​សរសេរ​ទៅកាន់​ឯកសារ" -#: methods/http.cc:928 +#: methods/http.cc:927 msgid "Error reading from server. Remote end closed connection" msgstr "កំហុស​ក្នុងការ​អាន​ពី​ម៉ាស៊ីនបម្រើ ។ ការបញ្ចប់​ពីចម្ងាយ​បានបិទការតភ្ជាប់" -#: methods/http.cc:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "កំហុស​ក្នុងការអាន​ពី​ម៉ាស៊ីន​បម្រើ" -#: methods/http.cc:1198 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "ទិន្នន័យ​បឋមកថា​ខូច" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "ការតភ្ជាប់​បាន​បរាជ័យ​" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "កំហុស​ខាង​ក្នុង​" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "មិន​អាច​អាន​ %s បានឡើយ" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1633,7 +1653,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​បំពង់​ IPC សម្រាប់​ដំណើរ​ការ​រង​" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "បាន​បិទ​ការ​តភ្ជាប់​មុន​ពេល" @@ -2113,11 +2133,11 @@ msgstr "បឋមកថា​សមាជិក​ប័ណ្ណសារ" msgid "Invalid archive member header" msgstr "បឋមកថា​សមាជិក​ប័ណ្ណសារ" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "ប័ណ្ណសារ ខ្លីពេក" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "បរាជ័យ​ក្នុងការ​អាន​បឋមកថា​ប័ណ្ណសារ" @@ -2442,7 +2462,7 @@ msgstr "ប្រតិបត្តិការ​មិន​ត្រឹមត msgid "Unable to stat the mount point %s" msgstr "មិនអាច​ថ្លែង ចំណុចម៉ោន %s បានឡើយ" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "បរាជ័យក្នុងការ​ថ្លែង ស៊ីឌីរ៉ូម" @@ -2461,101 +2481,101 @@ msgstr "មិន​ប្រើប្រាស់​ការចាក់សោ msgid "Could not open lock file %s" msgstr "មិន​អាច​បើក​ឯកសារ​ចាក់សោ​ %s បានឡើយ" -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "មិនប្រើ​ការចាក់សោ សម្រាប់ nfs ឯកសារ​ចាក់សោដែលបានម៉ោន%s" -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "មិន​អាច​ចាក់សោ %s បានឡើយ" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "ដំណើរការ​រង​ %s បាន​ទទួល​កំហុស​ការ​ចែកជាចម្រៀក​ ។" -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "ដំណើរការ​រង​ %s បាន​ទទួល​កំហុស​ការ​ចែកជាចម្រៀក​ ។" -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "ដំណើរការ​រង​ %s បានត្រឡប់​ទៅកាន់​កូដ​មាន​កំហុស​ (%u)" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "ដំណើរការ​រង​ %s បានចេញ ដោយ​មិន​រំពឹង​ទុក​ " -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ" -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "មិន​អាច​បើក​បំពុង​សម្រាប់​ %s បានឡើយ" -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​ដំណើរការ​រង​ IPC" -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "បរាជ័យ​ក្នុង​ការ​ប្រតិបត្តិ​កម្មវិធី​បង្ហាប់ " -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "អាន​, នៅតែ​មាន %lu ដើម្បី​អាន​ ប៉ុន្តែ​គ្មាន​អ្វី​នៅសល់" -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "សរសេរ​, នៅតែមាន​ %lu ដើម្បី​សរសេរ​ ប៉ុន្តែ​មិន​អាច​" -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "មាន​បញ្ហា​ក្នុងការ​បិទ​ឯកសារ" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់តំណ​ឯកសារ" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​" @@ -2754,19 +2774,19 @@ msgstr "បន្ទាត់​ Malformed %u ក្នុង​បញ្ជី msgid "Type '%s' is not known on line %u in source list %s" msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ" -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2788,7 +2808,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "កញ្ចប់ %s ត្រូវការឲ្យដំឡើង ប៉ុន្តែ​ ខ្ញុំ​មិន​អាច​រក​ប័ណ្ណសារ​សម្រាប់​វា​បាន​ទេ​ ។" -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2796,11 +2816,11 @@ msgstr "" "កំហុស pkgProblemResolver::ដោះស្រាយ​សញ្ញាបញ្ឈប់​ដែលបានបង្កើត នេះ​ប្រហែលជា បង្កដោយកញ្ចប់​" "ដែលបាន​ទុក ។" -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "មិន​អាច​កែ​បញ្ហាបានទេេ អ្កបានទុក​កញ្ចប់​ដែល​ខូច ។។" -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2969,41 +2989,41 @@ msgstr "ប្តូរ​ឈ្មោះ​បានបរាជ័យ​, %s ( msgid "MD5Sum mismatch" msgstr "MD5Sum មិន​ផ្គួផ្គង​" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 #, fuzzy msgid "Hash Sum mismatch" msgstr "MD5Sum មិន​ផ្គួផ្គង​" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "គ្មាន​កូនសោ​សាធារណៈ​អាច​រក​បាន​ក្នុងកូនសោ IDs ខាងក្រោម​នេះទេ ៖\n" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3011,12 +3031,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3025,7 +3045,7 @@ msgstr "" "ខ្ញុំ​មិន​អាច​រកទីតាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បាន​ទេ ។ ​មាន​ន័យ​ថា​អ្នក​ត្រូវការ​ជួសជុល​កញ្ចប់​នេះ​ដោយ​ដៃ ។ " "(ដោយសារ​​បាត់​ស្ថាបត្យកម្ម)" -#: apt-pkg/acquire-item.cc:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3033,13 +3053,13 @@ msgid "" msgstr "" "ខ្ញុំ​មិន​អាច​រកទីតាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បានទេ ។ ​មាន​ន័យ​ថា​អ្នក​ត្រូវការ​ជួសជុល​កញ្ចប់​នេះ​ដោយ​ដៃ ។" -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "កញ្ចប់​ឯកសារ​លិបិក្រម​ត្រូវ​បាន​ខូច ។ គ្មាន​ឈ្មោះ​ឯកសារ ៖ វាល​សម្រាប់​កញ្ចប់នេះ​ទេ​ %s ។" -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "ទំហំ​មិនបាន​ផ្គួផ្គង​" @@ -3160,22 +3180,22 @@ msgstr "កំពុងសរសេរ​បញ្ជី​ប្រភព​ថ msgid "Source list entries for this disc are:\n" msgstr "ធាតុបញ្ចូល​បញ្ជីប្រភព​សម្រាប់​ឌីស​នេះគឺ ៖\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "បានសរសេរ %i កំណត់ត្រា ។\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "បានសរសេរ %i កំណត់ត្រា​ជាមួយ​ %i ឯកសារ​ដែល​បាត់បង់ ។\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "បានសរសេរ​ %i កំណត់ត្រា​ជាមួយួយ​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "បានសរសេរ %i កំណត់ត្រា​ជាមួយ​ %i ឯកសារ​ដែល​បាត់បង់​ និង​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​ ​\n" @@ -3262,12 +3282,12 @@ msgstr "" msgid "Installing %s" msgstr "បាន​ដំឡើង %s" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr "កំពុង​កំណត់​រចនា​សម្ព័ន្ធ %s" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr "កំពុង​យក %s ចេញ" @@ -3288,96 +3308,96 @@ msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "រាយបញ្ជី​ថត​ %spartial គឺ​បាត់បង់​ ។" -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr "កំពុងរៀបចំ​ %s" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr "កំពុង​ស្រាយ %s" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "កំពុងរៀបចំ​កំណត់រចនាសម្ព័ន្ធ %s" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr "បាន​ដំឡើង %s" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "កំពុងរៀបចំដើម្បី​ការយក​ចេញ​នៃ %s" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr "បាន​យក %s ចេញ" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "កំពុង​រៀបចំ​យក %s ចេញ​ទាំង​ស្រុង" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr "បាន​យក %s ចេញ​ទាំង​ស្រុង" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/ko.po b/po/ko.po index 5f5332b20..638c741d7 100644 --- a/po/ko.po +++ b/po/ko.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2010-08-30 02:31+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" @@ -88,77 +88,77 @@ msgstr "전체 빈 용량: " msgid "Total space accounted for: " msgstr "차지하는 전체 용량: " -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "패키지 파일 %s 파일이 동기화되지 않았습니다." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "패키지가 없습니다" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 msgid "You must give at least one search pattern" msgstr "최소 한 개의 검색어를 지정해야 합니다" -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "%s 패키지를 찾을 수 없습니다" -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "패키지 파일:" -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 msgid "Cache is out of sync, can't x-ref a package file" msgstr "캐시가 동기화되지 않았습니다. 패키지 파일을 상호 참조할 수 없습니다" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "핀 패키지:" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(없음)" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr " 설치: " -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr " 후보: " -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(없음)" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr " 패키지 핀: " #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr " 버전 테이블:" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s(%s), 컴파일 시각 %s %s\n" -#: cmdline/apt-cache.cc:1730 +#: cmdline/apt-cache.cc:1760 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -289,83 +289,101 @@ msgstr "" " -c=? 해당 설정 파일을 읽습니다\n" " -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +msgid "[Y/n]" +msgstr "[Y/n]" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "[y/N]" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" msgstr "" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "정규식 컴파일 오류 - %s" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "다음 패키지의 의존성이 맞지 않습니다:" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "하지만 %s 패키지를 설치했습니다" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "하지만 %s 패키지를 설치할 것입니다" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "하지만 설치할 수 없습니다" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "하지만 가상 패키지입니다" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "하지만 설치하지 않았습니다" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "하지만 %s 패키지를 설치하지 않을 것입니다" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr " 혹은" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "다음 새 패키지를 설치할 것입니다:" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "다음 패키지를 지울 것입니다:" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 msgid "The following packages have been kept back:" msgstr "다음 패키지를 과거 버전으로 유지합니다:" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "다음 패키지를 업그레이드할 것입니다:" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "다음 패키지를 다운그레이드할 것입니다:" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "고정되었던 다음 패키지를 바꿀 것입니다:" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s (%s때문에) " -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -373,59 +391,59 @@ msgstr "" "경고: 꼭 필요한 다음 패키지를 지우게 됩니다.\n" "무슨 일을 하고 있는 지 정확히 알지 못한다면 지우지 마십시오!" -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu개 업그레이드, %lu개 새로 설치, " -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "%lu개 다시 설치, " -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "%lu개 업그레이드, " -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu개 제거 및 %lu개 업그레이드 안 함.\n" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "주의, 작업 '%2$s'에 대해 '%1$s'을(를) 선택합니다\n" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "주의, 정규식 '%2$s'에 대해 '%1$s'을(를) 선택합니다\n" -#: cmdline/apt-get.cc:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "%s 패키지는 다음이 제공하는 가상 패키지입니다:\n" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr " [설치함]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 msgid " [Not candidate version]" msgstr "[후보 버전 아님]" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "설치할 패키지를 하나 분명히 지정해야 합니다." -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -436,134 +454,134 @@ msgstr "" "해당 패키지가 누락되었거나 지워졌다는 뜻입니다. 아니면 또 다른 곳에서\n" "패키지를 받아와야 하는 경우일 수도 있습니다.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "하지만 다음 패키지가 대체합니다:" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, c-format msgid "Package '%s' has no installation candidate" msgstr "'%s' 패키지는 설치할 수 있는 후보가 없습니다" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "'%s' 패키지와 같은 가상 패키지는 제거할 수 없습니다\n" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "%s 패키지를 설치하지 않았으므로, 지우지 않습니다\n" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "%s 패키지를 설치하지 않았으므로, 지우지 않습니다\n" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "주의, '%2$s' 대신에 '%1$s' 패키지를 선택합니다\n" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "%s 패키지를 건너 뜁니다. 이미 설치되어 있고 업그레이드를 하지 않습니다.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "%s 패키지를 건너 뜁니다. 설치되지 않았고 업그레이드만 요청합니다.\n" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "%s 패키지를 다시 설치하는 건 불가능합니다. 다운로드할 수 없습니다.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "%s 패키지는 이미 최신 버전입니다.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s 패키지 수동설치로 지정합니다.\n" -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:913 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "'%3$s' 패키지의 '%1$s' (%2$s) 버전을 선택합니다\n" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, fuzzy, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "'%3$s' 패키지의 '%1$s' (%2$s) 버전을 선택합니다\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "의존성을 바로잡는 중입니다..." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr " 실패." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "의존성을 바로잡을 수 없습니다" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "업그레이드 집합을 최소화할 수 없습니다" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr " 완료" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" "이 상황을 바로잡으려면 'apt-get -f install'을 실행해야 할 수도 있습니다." -#: cmdline/apt-get.cc:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "의존성이 맞지 않습니다. -f 옵션을 사용해 보십시오." -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 msgid "WARNING: The following packages cannot be authenticated!" msgstr "경고: 다음 패키지를 인증할 수 없습니다!" -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "인증 경고를 무시합니다.\n" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " -msgstr "확인하지 않고 패키지를 설치하시겠습니까 [y/N]? " +#: cmdline/apt-get.cc:1108 +msgid "Install these packages without verification?" +msgstr "확인하지 않고 패키지를 설치하시겠습니까?" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" msgstr "인증할 수 없는 패키지가 있습니다" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "문제가 발생했고 -y 옵션이 --force-yes 옵션 없이 사용되었습니다" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "내부 오류. 망가진 패키지에서 InstallPackages를 호출했습니다!" -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 msgid "Packages need to be removed but remove is disabled." msgstr "패키지를 제거해야 하지만 제거가 금지되어 있습니다." -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 msgid "Internal error, Ordering didn't finish" msgstr "내부 오류. 순서변경작업이 끝나지 않았습니다" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "이상하게도 크기가 서로 다릅니다. apt@packages.debian.org로 이메일을 보내주십" @@ -571,44 +589,44 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "%s바이트/%s바이트 아카이브를 받아야 합니다.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "%s바이트 아카이브를 받아야 합니다.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "이 작업 후 %s바이트의 디스크 공간을 더 사용하게 됩니다.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "이 작업 후 %s바이트의 디스크 공간이 비워집니다.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s의 여유 공간의 크기를 파악할 수 없습니다" -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, c-format msgid "You don't have enough free space in %s." msgstr "%s 안에 충분한 여유 공간이 없습니다." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "사소한 작업만 가능하도록(Trivial Only) 지정되었지만 이 작업은 사소한 작업이 " @@ -617,11 +635,11 @@ msgstr "" # 입력을 받아야 한다. 한글 입력을 못 할 수 있으므로 원문 그대로 사용. #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -632,28 +650,28 @@ msgstr "" "계속하시려면 다음 문구를 입력하십시오: '%s'\n" " ?] " -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "중단." -#: cmdline/apt-get.cc:1284 -msgid "Do you want to continue [Y/n]? " -msgstr "계속 하시겠습니까 [Y/n]? " +#: cmdline/apt-get.cc:1313 +msgid "Do you want to continue?" +msgstr "계속 하시겠습니까?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s 파일을 받는데 실패했습니다 %s\n" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "일부 파일을 받는데 실패했습니다" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "다운로드를 마쳤고 다운로드 전용 모드입니다" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -661,19 +679,19 @@ msgstr "" "아카이브를 받을 수 없습니다. 아마도 apt-get update를 실행해야 하거나 --fix-" "missing 옵션을 줘서 실행해야 할 것입니다." -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing 옵션과 동시에 미디어 바꾸기는 현재 지원하지 않습니다" -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "빠진 패키지를 바로잡을 수 없습니다." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "설치를 중단합니다." -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -684,35 +702,35 @@ msgstr[0] "" "다음 패키지는 패키지의 파일을 모두 다른 패키지가\n" "덮어썼기 때문에 사라졌습니다:" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "주의: dpkg에서 자동으로 의도적으로 수행했습니다." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "'%2$s' 패키지의 '%1$s' 대상 릴리스는 없으므로 무시합니다." -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "소스 패키지로 '%s'을(를) '%s' 대신 선택합니다\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "'%2$s' 패키지의 '%1$s' 버전은 없으므로 무시합니다." -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr "update 명령은 인수를 받지 않습니다" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "삭제를 할 수 없으므로 AutoRemover를 실행하지 못합니다" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -730,15 +748,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 msgid "The following information may help to resolve the situation:" msgstr "이 상황을 해결하는데 다음 정보가 도움이 될 수도 있습니다:" -#: cmdline/apt-get.cc:1824 +#: cmdline/apt-get.cc:1853 msgid "Internal Error, AutoRemover broke stuff" msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸습니다" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -746,29 +764,29 @@ msgid_plural "" "required:" msgstr[0] "다음 패키지가 자동으로 설치되었지만 더 이상 필요하지 않습니다:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" "%lu packages were automatically installed and are no longer required.\n" msgstr[0] "패키지 %lu개가 자동으로 설치되었지만 더 이상 필요하지 않습니다.\n" -#: cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1866 #, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "이들을 지우려면 'apt-get autoremove'를 사용하십시오." -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "내부 오류, AllUpgrade 프로그램이 무언가를 망가뜨렸습니다" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1984 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:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -776,7 +794,7 @@ msgstr "" "의존성이 맞지 않습니다. 패키지 없이 'apt-get -f install'을 시도해 보십시오 " "(아니면 해결 방법을 지정하십시오)." -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:2002 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" @@ -787,78 +805,78 @@ msgstr "" "불안정 배포판을 사용해서 일부 필요한 패키지를 아직 만들지 않았거나,\n" "아직 Incoming에서 나오지 않은 경우일 수도 있습니다." -#: cmdline/apt-get.cc:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "망가진 패키지" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "다음 패키지를 더 설치할 것입니다:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "제안하는 패키지:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "추천하는 패키지:" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "%s 패키지를 찾을 수 없습니다" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s 패키지는 수동설치로 지정합니다.\n" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "업그레이드를 계산하는 중입니다... " -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "실패" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "완료" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 msgid "Internal error, problem resolver broke stuff" msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸습니다" -#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "다운로드 디렉터리를 잠글 수 없습니다" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 msgid "Must specify at least one package to fetch source for" msgstr "해당되는 소스 패키지를 가져올 패키지를 최소한 하나 지정해야 합니다" -#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, c-format msgid "Unable to find a source package for %s" msgstr "%s의 소스 패키지를 찾을 수 없습니다" -#: cmdline/apt-get.cc:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -867,7 +885,7 @@ msgstr "" "알림: '%s' 패키징은 다음 '%s' 버전 컨트롤 시스템에서 관리합니다:\n" "%s\n" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, fuzzy, c-format msgid "" "Please use:\n" @@ -878,85 +896,85 @@ msgstr "" "다음과 같이 하십시오:\n" "bzr get %s\n" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "이미 다운로드 받은 파일 '%s'은(는) 다시 받지 않고 건너 뜁니다.\n" -#: cmdline/apt-get.cc:2604 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr "%s에 충분한 공간이 없습니다" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2644 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "소스 아카이브를 %s바이트/%s바이트 받아야 합니다.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2649 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "%s 소스를 가져옵니다\n" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "일부 아카이브를 가져오는데 실패했습니다." -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "압축 풀기 명령 '%s' 실패.\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev' 패키지가 설치되었는지를 확인하십시오.\n" -#: cmdline/apt-get.cc:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "빌드 명령 '%s' 실패.\n" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "하위 프로세스가 실패했습니다" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 msgid "Must specify at least one package to check builddeps for" msgstr "해당되는 빌드 의존성을 검사할 패키지를 최소한 하나 지정해야 합니다" -#: cmdline/apt-get.cc:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다" -#: cmdline/apt-get.cc:2839 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr "%s 패키지에 빌드 의존성이 없습니다.\n" -#: cmdline/apt-get.cc:3009 +#: cmdline/apt-get.cc:3040 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -965,7 +983,7 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니" "다" -#: cmdline/apt-get.cc:3027 +#: cmdline/apt-get.cc:3058 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -974,14 +992,14 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니" "다" -#: cmdline/apt-get.cc:3050 +#: cmdline/apt-get.cc:3081 #, 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:3089 +#: cmdline/apt-get.cc:3120 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -990,7 +1008,7 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지의 사용 가능한 버" "전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다" -#: cmdline/apt-get.cc:3095 +#: cmdline/apt-get.cc:3126 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -999,30 +1017,30 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니" "다" -#: cmdline/apt-get.cc:3118 +#: cmdline/apt-get.cc:3149 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s에 대한 %1$s 의존성을 만족시키는데 실패했습니다: %3$s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3164 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s의 빌드 의존성을 만족시키지 못했습니다." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "빌드 의존성을 처리하는데 실패했습니다" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "%s(%s)에 연결하는 중입니다" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "지원하는 모듈:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1110,7 +1128,7 @@ msgstr "" "apt.conf(5) 매뉴얼 페이지를 보십시오.\n" " 이 APT는 Super Cow Powers로 무장했습니다.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1185,8 +1203,8 @@ msgid "%s was already not hold.\n" msgstr "%s 패키지는 이미 최신 버전입니다.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s 프로세스를 기다렸지만 해당 프로세스가 없습니다" @@ -1253,7 +1271,7 @@ msgstr "%s 안의 CD-ROM을 마운트 해제할 수 없습니다. 사용 중일 msgid "Disk not found." msgstr "디스크가 없습니다." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "파일이 없습니다" @@ -1316,7 +1334,7 @@ msgstr "로그인 스크립트 명령 '%s' 실패, 서버에서는: %s" msgid "TYPE failed, server said: %s" msgstr "TYPE 실패, 서버에서는: %s" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "연결 시간 초과" @@ -1324,8 +1342,8 @@ msgstr "연결 시간 초과" msgid "Server closed the connection" msgstr "서버에서 연결을 닫았습니다" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "읽기 오류" @@ -1337,86 +1355,86 @@ msgstr "응답이 버퍼 크기를 넘어갔습니다." msgid "Protocol corruption" msgstr "프로토콜이 틀렸습니다" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "쓰기 오류" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "소켓을 만들 수 없습니다" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "데이터 소켓을 연결할 수 없습니다. 연결 시간이 초과되었습니다" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "수동(passive) 소켓을 연결할 수 없습니다." -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo에서 소켓에 listen할 수 없습니다" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "소켓을 bind할 수 없습니다" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "소켓에 listen할 수 없습니다" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "소켓의 이름을 알아낼 수 없습니다" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "PORT 명령을 보낼 수 없습니다" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "주소 %u의 종류(AF_*)를 알 수 없습니다" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT 실패, 서버에서는: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "데이터 소켓 연결 시간 초과" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "연결을 받을 수 없습니다" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "파일 해싱에 문제가 있습니다" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "파일을 가져올 수 없습니다. 서버 왈, '%s'" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "데이터 소켓에 제한 시간이 초과했습니다" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "데이터 전송 실패, 서버에서는: %s" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "질의" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "다음을 실행할 수 없습니다: " @@ -1452,7 +1470,7 @@ msgstr "%s:%s에 연결할 수 없습니다 (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "%s에 연결하는 중입니다" @@ -1482,37 +1500,37 @@ msgstr "'%s:%s'의 주소를 알아내는데 무언가 이상한 일이 발생 msgid "Unable to connect to %s:%s:" msgstr "%s:%s에 연결할 수 없습니다:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:167 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "내부 오류: 서명은 올바르지만 키 핑거프린트를 확인할 수 없습니다?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "최소한 하나 이상의 서명이 잘못되었습니다." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:173 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "서명을 확인하는 'gpgv' 프로그램을 실행할 수 없습니다. (gpgv를 설치했습니까?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "gpgv 실행 도중 알 수 없는 오류 발생" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 msgid "The following signatures were invalid:\n" msgstr "다음 서명이 올바르지 않습니다:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1550,59 +1568,59 @@ msgstr "HTTP 서버에 범위 지원 기능이 잘못되어 있습니다" msgid "Unknown date format" msgstr "데이터 형식을 알 수 없습니다" -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "select가 실패했습니다" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "연결 시간이 초과했습니다" -#: methods/http.cc:855 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "출력 파일에 쓰는데 오류가 발생했습니다" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "파일에 쓰는데 오류가 발생했습니다" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "해당 파일에 쓰는데 오류가 발생했습니다" -#: methods/http.cc:928 +#: methods/http.cc:927 msgid "Error reading from server. Remote end closed connection" msgstr "서버에서 읽고 연결을 닫는데 오류가 발생했습니다" -#: methods/http.cc:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "서버에서 읽는데 오류가 발생했습니다" -#: methods/http.cc:1198 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "헤더 데이터가 잘못되었습니다" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "연결이 실패했습니다" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "내부 오류" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "%s을(를) 읽을 수 없습니다" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1655,7 +1673,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "하위 프로세스에 대한 IPC 파이프를 만드는데 실패했습니다" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "연결이 너무 빨리 끊어졌습니다" @@ -2136,11 +2154,11 @@ msgstr "아카이브 멤버 헤더 %s이(가) 잘못되었습니다" msgid "Invalid archive member header" msgstr "아카이브 멤버 헤더가 잘못되었습니다" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "아카이브 길이가 너무 짧습니다" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "아카이브 헤더를 읽는데 실패했습니다" @@ -2465,7 +2483,7 @@ msgstr "잘못된 작업 %s" msgid "Unable to stat the mount point %s" msgstr "마운트 위치 %s의 정보를 읽을 수 없습니다" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "CD-ROM의 정보를 읽을 수 없습니다" @@ -2484,101 +2502,101 @@ msgstr "읽기 전용 잠금 파일 %s에 대해 잠금을 사용하지 않습 msgid "Could not open lock file %s" msgstr "잠금 파일 %s 파일을 열 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "NFS로 마운트된 잠금 파일 %s에 대해 잠금을 사용하지 않습니다" -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "%s 잠금 파일을 얻을 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "하위 프로세스 %s 프로세스가 세그멘테이션 오류를 받았습니다." -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, c-format msgid "Sub-process %s received signal %u." msgstr "하위 프로세스 %s 프로세스가 %u번 시그널을 받았습니다." -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "하위 프로세스 %s 프로세스가 오류 코드(%u)를 리턴했습니다" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "하위 프로세스 %s 프로세스가 예상치 못하게 끝났습니다" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "%s 파일을 열 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, c-format msgid "Could not open file descriptor %d" msgstr "%d 파일 디스크립터를 열 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "하위 프로세스 IPC를 만드는데 실패했습니다" -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "다음 압축 프로그램을 실행하는데 실패했습니다: " -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "%lu만큼 더 읽어야 하지만 더 이상 읽을 데이터가 없습니다" -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "%lu만큼 더 써야 하지만 더 이상 쓸 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, c-format msgid "Problem closing the file %s" msgstr "%s 파일을 닫는데 문제가 있습니다" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, c-format msgid "Problem renaming the file %s to %s" msgstr "%s 파일을 %s(으)로 이름을 바꾸는데 문제가 있습니다" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, c-format msgid "Problem unlinking the file %s" msgstr "%s 파일을 삭제하는데 문제가 있습니다" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "파일을 동기화하는데 문제가 있습니다" @@ -2777,7 +2795,7 @@ msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (타입)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "소스 목록 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2786,12 +2804,12 @@ msgstr "" "'%s'에 대해 즉시 설정을 할 수 없습니다. 자세한 설명은 man 5 apt.conf 페이지에" "서 APT::Immediate-Configure 항목을 보십시오. (%d)" -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "'%s' 파일을 열 수 없습니다" -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2814,7 +2832,7 @@ msgid "" msgstr "" "%s 패키지를 다시 설치해야 하지만, 이 패키지의 아카이브를 찾을 수 없습니다." -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2822,11 +2840,11 @@ msgstr "" "오류, pkgProblemResolver::Resolve가 망가졌습니다. 고정 패키지때문에 발생할 수" "도 있습니다." -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "문제를 바로잡을 수 없습니다. 망가진 고정 패키지가 있습니다." -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2996,40 +3014,40 @@ msgstr "이름 바꾸기가 실패했습니다. %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "MD5Sum이 맞지 않습니다" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 msgid "Hash Sum mismatch" msgstr "해시 합이 맞지 않습니다" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Release 파일 %s 파일을 파싱할 수 없습니다" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "다음 키 ID의 공개키가 없습니다:\n" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "배포판 충돌: %s (예상값 %s, 실제값 %s)" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3039,12 +3057,12 @@ msgstr "" "예전의 인덱스 파일을 사용합니다. GPG 오류: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "GPG 오류: %s: %s" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3053,7 +3071,7 @@ msgstr "" "%s 패키지의 파일을 찾을 수 없습니다. 수동으로 이 패키지를 고쳐야 할 수도 있습" "니다. (아키텍쳐가 빠졌기 때문입니다)" -#: apt-pkg/acquire-item.cc:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3062,14 +3080,14 @@ msgstr "" "%s 패키지의 파일을 찾을 수 없습니다. 수동으로 이 패키지를 고쳐야 할 수도 있습" "니다." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "패키지 인덱스 파일이 손상되었습니다. %s 패키지에 Filename: 필드가 없습니다." -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "크기가 맞지 않습니다" @@ -3191,22 +3209,22 @@ msgstr "새 소스 리스트를 쓰는 중입니다\n" msgid "Source list entries for this disc are:\n" msgstr "이 디스크의 소스 리스트 항목은 다음과 같습니다:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "레코드 %i개를 썼습니다.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "레코드 %i개를 파일 %i개가 빠진 상태로 썼습니다.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "레코드 %i개를 파일 %i개가 맞지 않은 상태로 썼습니다\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "레코드 %i개를 파일 %i개가 빠지고 %i개가 맞지 않은 상태로 썼습니다\n" @@ -3295,12 +3313,12 @@ msgstr "" msgid "Installing %s" msgstr "%s 설치하는 중입니다" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr "%s 설정 중입니다" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr "%s 패키지를 지우는 중입니다" @@ -3321,79 +3339,79 @@ msgid "Running post-installation trigger %s" msgstr "설치 후 트리거 %s 실행하는 중입니다" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, c-format msgid "Directory '%s' missing" msgstr "디렉터리 '%s' 없습니다." -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, c-format msgid "Could not open file '%s'" msgstr "'%s' 파일을 열 수 없습니다" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr "%s 준비 중입니다" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr "%s 푸는 중입니다" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "%s 패키지를 설정할 준비하는 중입니다" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr "%s 설치" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "%s 패키지를 지울 준비하는 중입니다" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr "%s 지움" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "%s 패키지를 완전히 지울 준비를 하는 중입니다" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr "%s 패키지를 완전히 지웠습니다" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "로그에 쓰는데 실패. openpty() 실패(/dev/pts가 마운트되어있지 않습니까?)\n" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "dpkg 실행하는 중입니다" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "보고서를 작성하지 않습니다. 이미 MaxReports 값에 도달했습니다." #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "의존성 문제 - 설정하지 않은 상태로 남겨둡니다" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3401,20 +3419,20 @@ msgstr "" "보고서를 작성하지 않습니다. 오류 메시지에 따르면 예전의 실패 때문에 생긴 부수" "적인 오류입니다." -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" "보고서를 작성하지 않습니다. 오류 메시지에 따르면 디스크가 가득 찼습니다." -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "보고서를 작성하지 않습니다. 오류 메시지에 따르면 메모리가 부족합니다." -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/ku.po b/po/ku.po index 73b08a30e..521c291fc 100644 --- a/po/ku.po +++ b/po/ku.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-ku\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2008-05-08 12:48+0200\n" "Last-Translator: Erdal Ronahi \n" "Language-Team: ku \n" @@ -95,78 +95,78 @@ msgstr "Cihê giştî yê sist:" msgid "Total space accounted for: " msgstr "Cihê giştî yê veqetandî: " -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "Pakêta dosya %s li derveyî demê ye." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Pakêt nayên dîtin" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 #, fuzzy msgid "You must give at least one search pattern" msgstr "Pêwist e tu mînakekê bidî" -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Pakêt nehate dîtin %s" -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "Pelgehên Pakêt:" -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(nehate dîtin)" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr " Sazkirî: " -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr " Berendam: " -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(ne tiştek)" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr " Destika pakêtê:" #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr " Tabloya guhertoyan:" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s ji bo %s %s komkirî di %s %s de\n" -#: cmdline/apt-cache.cc:1730 +#: cmdline/apt-cache.cc:1760 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -261,142 +261,161 @@ msgstr "" " -o=? Rê li ber vedike ku tu karibe li gorî dilê xwe vebijarkan diyar bike. " "mînak -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +#, fuzzy +msgid "[Y/n]" +msgstr "[E/n]" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" msgstr "E" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" msgstr "" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "lê %s sazkirî ye" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "lê %s dê were sazkirin" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "lê sazkirina wê ne gengaz e" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "lê paketeke farazî ye" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "lê ne sazkirî ye" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "lê dê neyê sazkirin" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr " û" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "Ev pakêtên NÛ dê werine sazkirin:" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "Ev pakêt dê werine RAKIRIN:" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 msgid "The following packages have been kept back:" msgstr "" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "Ev paket dê werine bilindkirin:" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s (ji ber %s)" -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu hatine bilindkirin, %lu nû hatine sazkirin." -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "%lu ji nû ve sazkirî," -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "%lu hatine nizmkirin." -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu werin rakirin û %lu neyên bilindkirin. \n" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr " [Sazkirî]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 #, fuzzy msgid " [Not candidate version]" msgstr "Guhartoyên berendam" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "" -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -404,185 +423,185 @@ msgid "" "is only available from another source\n" msgstr "" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, c-format msgid "Package '%s' has no installation candidate" msgstr "" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "%s jixwe guhertoya nûtirîn e.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "lê %s dê were sazkirin" -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:913 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "Bindestî tên serrastkirin..." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr " neserketî." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "Nikare bindestiyan rast kirin" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr " Temam" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" -#: cmdline/apt-get.cc:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "" -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " +#: cmdline/apt-get.cc:1108 +msgid "Install these packages without verification?" msgstr "" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" msgstr "" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 msgid "Packages need to be removed but remove is disabled." msgstr "" -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Anîna %sB/%sB ji arşîvan pêwist e.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Anîna %sB ji arşîvan pêwist e.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nikarî cihê vala li %s tesbît bike" -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, c-format msgid "You don't have enough free space in %s." msgstr "Cihê vala li %s têre nake." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "Erê, wusa bike!" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -590,46 +609,46 @@ msgid "" " ?] " msgstr "" -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "Betal." -#: cmdline/apt-get.cc:1284 -msgid "Do you want to continue [Y/n]? " -msgstr "Dixwazî bidomînî [E/n]?" +#: cmdline/apt-get.cc:1313 +msgid "Do you want to continue?" +msgstr "Dixwazî bidomînî?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Anîna %s %s biserneket\n" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "Daxistina çend pelan biserneket" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "" -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "Sazkirin tê betalkirin." -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -639,35 +658,35 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -683,15 +702,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1824 +#: cmdline/apt-get.cc:1853 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -701,7 +720,7 @@ msgid_plural "" msgstr[0] "Ev pakêtên NÛ dê werine sazkirin:" msgstr[1] "Ev pakêtên NÛ dê werine sazkirin:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -709,27 +728,27 @@ msgid_plural "" msgstr[0] "Ev pakêtên NÛ dê werine sazkirin:" msgstr[1] "Ev pakêtên NÛ dê werine sazkirin:" -#: cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1866 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1984 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:2002 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" @@ -737,85 +756,85 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "Paketên şikestî" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "Paketên tên pêşniyaz kirin:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "Paketên tên tawsiyê kirin:" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "Nikarî pakêta %s bibîne" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "lê %s dê were sazkirin" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "Bilindkirin tê hesibandin..." -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "Serneket" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "Temam" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "Pelrêça daxistinê nayê quflekirin" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, c-format msgid "" "Please use:\n" @@ -823,141 +842,141 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2604 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr "Cihê vala li %s têre nake" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2644 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2649 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "Çavkanîna %s bîne\n" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "Anîna çend arşîvan biserneket." -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2839 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:3009 +#: cmdline/apt-get.cc:3040 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "" -#: cmdline/apt-get.cc:3027 +#: cmdline/apt-get.cc:3058 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:3050 +#: cmdline/apt-get.cc:3081 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:3089 +#: cmdline/apt-get.cc:3120 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:3095 +#: cmdline/apt-get.cc:3126 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "" -#: cmdline/apt-get.cc:3118 +#: cmdline/apt-get.cc:3149 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3164 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Girêdan bi %s (%s) re pêk tê" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1003,7 +1022,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1071,8 +1090,8 @@ msgid "%s was already not hold.\n" msgstr "%s jixwe guhertoya nûtirîn e.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" @@ -1137,7 +1156,7 @@ msgstr "" msgid "Disk not found." msgstr "Dîsk nehate dîtin." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "Pel nehate dîtin" @@ -1199,7 +1218,7 @@ msgstr "" msgid "TYPE failed, server said: %s" msgstr "" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "" @@ -1207,8 +1226,8 @@ msgstr "" msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "Çewiya xwendinê" @@ -1220,86 +1239,86 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "Çewtiya nivîsînê" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "" -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, fuzzy, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Danegira %s nehate vekirin: %s" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "Lêpirsîn" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 #, fuzzy msgid "Unable to invoke " msgstr "%s venebû" @@ -1336,7 +1355,7 @@ msgstr "" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "Bi %s re tê girêdan" @@ -1366,37 +1385,37 @@ msgstr "" msgid "Unable to connect to %s:%s:" msgstr "Nikare bi %s re girêdan pêk bîne %s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:167 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:173 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "Di xebitandina gpgv de çewtiya nenas" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Ev pakêtên NÛ dê werine sazkirin:" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1434,60 +1453,60 @@ msgstr "" msgid "Unknown date format" msgstr "" -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "Hilbijartin neserketî" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "" -#: methods/http.cc:855 +#: methods/http.cc:854 #, fuzzy msgid "Error writing to output file" msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "Dema li pelî dihate nivîsîn çewtî" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "Dema li pelî dihate nivîsîn çewtî" -#: methods/http.cc:928 +#: methods/http.cc:927 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1198 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "Girêdan pêk nehatiye" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "Çewtiya hundirîn" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "Nikare %s bixwîne" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1536,7 +1555,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "Girêdan zû hatiye girtin" @@ -1955,11 +1974,11 @@ msgstr "" msgid "Invalid archive member header" msgstr "" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "Arşîv zêde kin e" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "" @@ -2286,7 +2305,7 @@ msgstr "" msgid "Unable to stat the mount point %s" msgstr "Nivîsandin ji bo %s ne pêkane" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "" @@ -2305,101 +2324,101 @@ msgstr "" msgid "Could not open lock file %s" msgstr "Nikarî qufila pelê %s veke" -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, c-format msgid "Sub-process %s received signal %u." msgstr "" -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "Nikarî pelê %s veke" -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "Nikarî pelê %s veke" -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "" -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, c-format msgid "read, still have %llu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Di girtina pelî de pirsgirêkek derket" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Di girtina pelî de pirsgirêkek derket" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Di girtina pelî de pirsgirêkek derket" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "" @@ -2596,19 +2615,19 @@ msgstr "" msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Nikarî pelê %s veke" -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2627,17 +2646,17 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2803,40 +2822,40 @@ msgstr "nav guherandin biserneket, %s (%s -> %s)" msgid "MD5Sum mismatch" msgstr "MD5Sum li hev nayên" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 msgid "Hash Sum mismatch" msgstr "Hash Sum li hev nayên" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Pakêt nehate dîtin %s" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2844,32 +2863,32 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, 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:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "Mezinahî li hev nayên" @@ -2987,22 +3006,22 @@ msgstr "" msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "%i tomar hatin nivîsîn.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3089,12 +3108,12 @@ msgstr "" msgid "Installing %s" msgstr "%s hatine sazkirin" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr "%s tê mîhengkirin" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr "%s tê rakirin" @@ -3115,96 +3134,96 @@ msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, c-format msgid "Directory '%s' missing" msgstr "Peldanka '%s' kêm e" -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Nikarî pelê %s veke" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr "%s tê amadekirin" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr "%s tê derxistin" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "Mîhengkirina %s tê amadekirin" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr "%s hatine sazkirin" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "Rakirina %s tê amadekirin" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr "%s hatine rakirin" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "Bi tevahî rakirina %s tê amadekirin" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr "%s bi tevahî hatine rakirin" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/lt.po b/po/lt.po index a7ed0d578..ee86c0c97 100644 --- a/po/lt.po +++ b/po/lt.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2008-08-02 01:47-0400\n" "Last-Translator: Gintautas Miliauskas \n" "Language-Team: Lithuanian \n" @@ -94,77 +94,77 @@ msgstr "" msgid "Total space accounted for: " msgstr "" -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "" -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Paketų nerasta" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 msgid "You must give at least one search pattern" msgstr "" -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Nepavyko rasti paketo %s" -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "Paketų failai:" -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "Surišti paketai:" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(nerasta)" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr " Įdiegta: " -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr " Kandidatas: " -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(nėra)" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr " Paketo susiejimai: " #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr " Versijų lentelė:" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "" -#: cmdline/apt-cache.cc:1730 +#: cmdline/apt-cache.cc:1760 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -258,83 +258,101 @@ msgstr "" " -c=? Nuskaityti pateiktą konfigūracijos failą\n" " -o=? Nurodyti tam tikrą konfigūracijos parametrą, pvz -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +msgid "[Y/n]" +msgstr "[T/n]" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "[t/N]" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" msgstr "T" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" msgstr "" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "Šie paketai turi neįdiegtų priklausomybių:" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "bet %s yra įdiegtas" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "bet %s bus įdiegtas" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "tačiau jis negali būti įdiegtas" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "bet tai yra virtualus paketas" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "bet jis nėra įdiegtas" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "bet jis nebus įdiegtas" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr " arba" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "Bus įdiegti šie NAUJI paketai:" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "Bus PAŠALINTI šie paketai:" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 msgid "The following packages have been kept back:" msgstr "Šių paketų atnaujinimas sulaikomas:" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "Bus atnaujinti šie paketai:" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "Bus PAKEISTI SENESNIAIS šie paketai:" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "Bus pakeisti šie sulaikyti paketai:" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s (dėl %s) " -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -342,60 +360,60 @@ msgstr "" "Įspėjimas: Šie būtini paketai bus pašalinti.\n" "Tai NETURĖTŲ būti daroma, kol tiksliai nežinote ką darote!" -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu atnaujinti, %lu naujai įdiegti, " -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "%lu įdiegti iš naujo, " -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "%lu pasendinti, " -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu bus pašalinta ir %lu neatnaujinta.\n" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nepilnai įdiegti ar pašalinti.\n" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, fuzzy, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "Pastaba, žymima %s regex atitikimų formoje '%s'\n" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, fuzzy, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "Pastaba, žymima %s regex atitikimų formoje '%s'\n" -#: cmdline/apt-get.cc:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Paketas %s yra virtualus, pateiktas:\n" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr " [Įdiegtas]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 #, fuzzy msgid " [Not candidate version]" msgstr "Galimos versijos" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "Reikia pažymėti įdiegimui bent vieną." -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -406,188 +424,188 @@ msgstr "" "Tai gali reikšti, kad paketas dingęs, nebenaudojamas \n" "arba prieinamas tik iš kitų šaltinių.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "Tačiau šie paketai jį pakeičia:" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, fuzzy, c-format msgid "Package '%s' has no installation candidate" msgstr "Paketas %s neturi diegimo kandidatų" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "Paketas %s nėra įdiegtas, todėl nebuvo pašalintas\n" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "Paketas %s nėra įdiegtas, todėl nebuvo pašalintas\n" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, fuzzy, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "Pastaba: pažymimas %s vietoje %s\n" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Praleidžiamas %s, nes jis jau yra įdiegtas ir atnaujinimas nėra nurodytas.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, fuzzy, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "" "Praleidžiamas %s, nes jis jau yra įdiegtas ir atnaujinimas nėra nurodytas.\n" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Pakartotinas %s įdiegimas neįmanomas, jo nepavyksta parsiųsti.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ir taip jau yra naujausias.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n" -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:913 #, fuzzy, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "Pažymėta versija %s (%s) paketui %s\n" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, fuzzy, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "Pažymėta versija %s (%s) paketui %s\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "Taisomos priklausomybės..." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr " nepavyko." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "Nepavyko patenkinti priklausomybių" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 #, fuzzy msgid "Unable to minimize the upgrade set" msgstr "Nepavyko minimizuoti atnaujinimo rinkinio" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr " Įvykdyta" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Įvykdykite „apt-get -f install“, jei norite ištaisyti šias klaidas." -#: cmdline/apt-get.cc:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "Nepatenkintos priklausomybės. Bandykit naudoti -f." -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 msgid "WARNING: The following packages cannot be authenticated!" msgstr "DĖMESIO: Šie paketai negali būti autentifikuoti!" -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " -msgstr "Įdiegti šiuos paketus be patvirtinimo [t/N]? " +#: cmdline/apt-get.cc:1108 +msgid "Install these packages without verification?" +msgstr "Įdiegti šiuos paketus be patvirtinimo?" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" msgstr "Nepavyko autentikuoti kai kurių paketų" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "Atsirado problemų ir -y buvo panaudotas be --force-yes" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 msgid "Packages need to be removed but remove is disabled." msgstr "Reikia pašalinti paketus, tačiau šalinimas išjungtas." -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "Keista.. Dydis neatitinka, Parašykite laišką apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Reikia parsiųsti %sB/%sB archyvų.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Reikia parsiųsti %sB archyvų.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Po šios operacijos bus naudojama %sB papildomos disko vietos.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Po šios operacijos bus atlaisvinta %sB disko vietos.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nepavyko nustatyti %s laisvos vietos" -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, c-format msgid "You don't have enough free space in %s." msgstr "%s nėra pakankamai laisvos vietos." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "Taip, daryk kaip liepiu!" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -598,28 +616,28 @@ msgstr "" "Jei norite tęsti, įveskite frazę „%s“\n" " ?] " -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "Nutraukti." -#: cmdline/apt-get.cc:1284 -msgid "Do you want to continue [Y/n]? " -msgstr "Ar norite tęsti [T/n]? " +#: cmdline/apt-get.cc:1313 +msgid "Do you want to continue?" +msgstr "Ar norite tęsti?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Nepavyko parsiųsti %s %s\n" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "Nepavyko parsiųsti kai kurių failų" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "Pavyko parsiųsti tik parsiuntimo režime" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -627,19 +645,19 @@ msgstr "" "Nepavyko parsiųsti kai kurių archyvų, pabandykite paleisti „apt-get update“ " "arba pabandykite su parametru --fix-missing?" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing bei laikmenų apkeitimas nepalaikomas" -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "Nepavyko pataisyti dingusių paketų." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "Diegimas nutraukiamas." -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -649,35 +667,35 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr "Atnaujinimo komandai argumentų nereikia" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -693,15 +711,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 msgid "The following information may help to resolve the situation:" msgstr "Ši informacija gali padėti išspręsti šią situaciją:" -#: cmdline/apt-get.cc:1824 +#: cmdline/apt-get.cc:1853 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -711,7 +729,7 @@ msgid_plural "" msgstr[0] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:" msgstr[1] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -719,22 +737,22 @@ msgid_plural "" msgstr[0] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:" msgstr[1] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:" -#: cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1866 #, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Norėdami juos pašalinti, paleiskite „apt-get autoremove“" msgstr[1] "Norėdami juos pašalinti, paleiskite „apt-get autoremove“" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1984 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Jūs galite norėti paleisti 'apt-get -f install\" klaidų taisymui:" -#: cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -742,7 +760,7 @@ msgstr "" "Nepatenkintos priklausomybės. Pabandykite įvykdyti 'apt-get -f install' be " "nurodytų paketų (arba nurodykite išeitį)." -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:2002 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" @@ -754,85 +772,85 @@ msgstr "" "leidimą, kuomet kai kurie paketai dar nebuvo sukurti arba buvo\n" "pašalinti iš \"Incoming\" aplanko." -#: cmdline/apt-get.cc:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "Sugadinti paketai" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "Bus įdiegti šie papildomi paketai:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "Siūlomi paketai:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "Rekomenduojami paketai:" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "Nepavyko rasti paketo %s" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "Skaičiuojami atnaujinimai... " -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "Nepavyko" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "Įvykdyta" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 msgid "Internal error, problem resolver broke stuff" msgstr "Vidinė klaida, problemos sprendimas kažką sugadino" -#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "Nepavyko užrakinti parsiuntimų aplanko" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 msgid "Must specify at least one package to fetch source for" msgstr "Būtina nurodyti bent vieną paketą, kad parsiųsti jo išeities tekstą" -#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, c-format msgid "Unable to find a source package for %s" msgstr "Nepavyko surasti išeities teksto paketo, skirto %s" -#: cmdline/apt-get.cc:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, c-format msgid "" "Please use:\n" @@ -840,85 +858,85 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Praleidžiama jau parsiųsta byla „%s“\n" -#: cmdline/apt-get.cc:2604 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr "Neturite pakankamai laisvos vietos %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2644 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Reikia parsiųsti %sB/%sB išeities archyvų.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2649 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Reikia parsiųsti %sB išeities archyvų.\n" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "Parsiunčiamas archyvas %s\n" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "Nepavyko gauti kai kurių arhcyvų." -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Jau išpakuotas archyvas %s praleidžiama\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Nepavyko įvykdyti išpakavimo komandos „%s“\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n" -#: cmdline/apt-get.cc:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "Nepavyko įvykdyti paketo kompiliavimo komandos „%s“\n" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "Klaida procese-palikuonyje" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 msgid "Must specify at least one package to check builddeps for" msgstr "Būtina nurodyti bent vieną paketą, kuriam norite įvykdyti builddeps" -#: cmdline/apt-get.cc:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nepavyko gauti kūrimo-priklausomybių informacijos paketui %s" -#: cmdline/apt-get.cc:2839 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:3009 +#: cmdline/apt-get.cc:3040 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -926,7 +944,7 @@ msgid "" msgstr "" "%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas" -#: cmdline/apt-get.cc:3027 +#: cmdline/apt-get.cc:3058 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -934,14 +952,14 @@ msgid "" msgstr "" "%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas" -#: cmdline/apt-get.cc:3050 +#: cmdline/apt-get.cc:3081 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Nepavyko patenkinti %s priklausomybės %s paketui: Įdiegtas paketas %s yra " "per naujas" -#: cmdline/apt-get.cc:3089 +#: cmdline/apt-get.cc:3120 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -950,7 +968,7 @@ msgstr "" "%s priklausomybė %s paketui negali būti patenkinama, nes nėra tinkamos " "versijos %s paketo" -#: cmdline/apt-get.cc:3095 +#: cmdline/apt-get.cc:3126 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -958,30 +976,30 @@ msgid "" msgstr "" "%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas" -#: cmdline/apt-get.cc:3118 +#: cmdline/apt-get.cc:3149 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Nepavyko patenkinti %s priklausomybės %s: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3164 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Jungiamasi prie %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "Palaikomi moduliai:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1027,7 +1045,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1098,8 +1116,8 @@ msgid "%s was already not hold.\n" msgstr "%s ir taip jau yra naujausias.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" @@ -1164,7 +1182,7 @@ msgstr "Nepavyko atjungti CD-ROM įrenginyje %s, galbūt jis vis dar naudojamas. msgid "Disk not found." msgstr "Diskas nerastas." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "Failas nerastas" @@ -1225,7 +1243,7 @@ msgstr "" msgid "TYPE failed, server said: %s" msgstr "" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "Jungiamasi per ilgai" @@ -1233,8 +1251,8 @@ msgstr "Jungiamasi per ilgai" msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "Skaitymo klaida" @@ -1246,86 +1264,86 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "Rašymo klaida" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "" -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Nepavyko atsiųsti failo, serveris atsakė „%s“" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "Užklausti" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "" @@ -1361,7 +1379,7 @@ msgstr "Nepavyko prisijungti prie %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "Jungiamasi prie %s" @@ -1391,36 +1409,36 @@ msgstr "" msgid "Unable to connect to %s:%s:" msgstr "Nepavyko prisijungti prie %s %s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:167 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:173 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "Nežinoma klaida kviečiant gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 msgid "The following signatures were invalid:\n" msgstr "Šie parašai buvo nevalidūs:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1458,59 +1476,59 @@ msgstr "" msgid "Unknown date format" msgstr "" -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "Prisijungimo laiko limitas baigėsi" -#: methods/http.cc:855 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "Klaida bandant rašyti į failą" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:928 +#: methods/http.cc:927 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1198 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "Prisijungti nepavyko" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "Vidinė klaida" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "Nepavyko perskaityti %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1559,7 +1577,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "Nepavyko subprocesui sukurti IPC gijos" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "" @@ -2051,11 +2069,11 @@ msgstr "" msgid "Invalid archive member header" msgstr "" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "Archyvas per trumpas" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "Nepavyko perskaityti archyvo antraščių" @@ -2380,7 +2398,7 @@ msgstr "Klaidingas veiksmas %s" msgid "Unable to stat the mount point %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "" @@ -2399,101 +2417,101 @@ msgstr "" msgid "Could not open lock file %s" msgstr "Nepavyko atverti rakinimo failo %s" -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "Nepavyko rezervuoti rakinimo failo %s" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Procesas %s gavo segmentavimo klaidą" -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Procesas %s gavo segmentavimo klaidą" -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Procesas %s grąžino klaidos kodą (%u)" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Procesas %s netikėtai išėjo" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "Nepavyko atverti failo %s" -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "Nepavyko atverti failo %s" -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "Nepavyko sukurti subproceso IPC" -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "Nepavyko paleisti suspaudėjo " -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, c-format msgid "read, still have %llu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Klaida užveriant failą" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Klaida sinchronizuojant failą" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Klaida užveriant failą" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "Klaida sinchronizuojant failą" @@ -2690,19 +2708,19 @@ msgstr "" msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Nepavyko atverti failo %s" -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2721,17 +2739,17 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2902,40 +2920,40 @@ msgstr "" msgid "MD5Sum mismatch" msgstr "MD5 sumos neatitikimas" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 msgid "Hash Sum mismatch" msgstr "Maišos sumos nesutapimas" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nepavyko atverti DB failo %s: %s" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2943,32 +2961,32 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "GPG klaida: %s: %s" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, 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:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "Neatitinka dydžiai" @@ -3086,22 +3104,22 @@ msgstr "Rašomas naujas šaltinių sąrašas\n" msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3188,12 +3206,12 @@ msgstr "" msgid "Installing %s" msgstr "Įdiegta %s" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr "Konfigūruojamas %s" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr "Šalinamas %s" @@ -3214,96 +3232,96 @@ msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, c-format msgid "Directory '%s' missing" msgstr "Trūksta aplanko „%s“" -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Nepavyko atverti failo %s" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr "Ruošiamas %s" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr "Išpakuojamas %s" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "Ruošiamasi konfigūruoti %s" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr "Įdiegta %s" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "Ruošiamasi %s pašalinimui" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr "Pašalintas %s" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "Ruošiamasi visiškai pašalinti %s" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr "Visiškai pašalintas %s" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/mr.po b/po/mr.po index ae9fd15fa..cb4c35bd6 100644 --- a/po/mr.po +++ b/po/mr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2008-11-20 23:27+0530\n" "Last-Translator: Sampada \n" "Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India " @@ -90,78 +90,78 @@ msgstr "एकूण दुर्लक्षित अवकाश:" msgid "Total space accounted for: " msgstr "हिशेबात घेतलेली एकूण अवकाश(जागा):" -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "पॅकेज संचिका %s सिंक्रोनाइज नाहीत" -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "पॅकेजेस सापडले नाहीत" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 #, fuzzy msgid "You must give at least one search pattern" msgstr "तुम्हाला फक्त एकच नमुना द्यावा लागेल" -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "पॅकेज %s शोधण्यास असमर्थ आहे" -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "पॅकेज संचिका:" -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 msgid "Cache is out of sync, can't x-ref a package file" msgstr "दृतिका सिंक नाही,पॅकेज संचिका क्ष-संदर्भ करता येत नाही" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "एकत्रित पॅकेजेस:" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(मिळाले नाही)" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr "अधिष्ठापित केले:" -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr "उमेदवार:" -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(कोणताच नाही)" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr "पॅकेज (पिन):" #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr "आवृत्ती कोष्टक:" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s हे %s करिता %s %s वर संग्रहित\n" -#: cmdline/apt-cache.cc:1730 +#: cmdline/apt-cache.cc:1760 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -292,83 +292,101 @@ msgstr "" " -c= ? ही संरचना संचिका वाचा \n" " -o=? एखदा अहेतुक संरचना पर्याय निर्धारित करा, उदा।eg -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +msgid "[Y/n]" +msgstr "" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" msgstr "होय" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" msgstr "" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "रिजेक्स कंपायलेशन त्रुटी -%s " -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "खालील पॅकेजेस मध्ये नमिळणाऱ्या निर्भरता/ डिपेन्डन्सीज आहेत:" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "पण %s संस्थापित झाले" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "पण %s संस्थापित करायचे आहे" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "पण ते संस्थापित करण्याजोगे नाही" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "पण ते आभासी पॅकेज आहे" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "पण ते संस्थापित केले नाही" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "पण ते संस्थापित होणार नाही" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr "किंवा" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "खालील नविन पॅकेजेस संस्थापित होतील:" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "खालील नविन पॅकेजेस कायमची काढून टाकली जातील:" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 msgid "The following packages have been kept back:" msgstr "खालील पॅकेजेस परत ठेवली गेली:" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "खालील पॅकेजेस पुढिल आवृत्तीकृत होतील:" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "खालील पॅकेजेस पुढच्या आवृत्तीकृत होणार नाहीत:" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "पुढिल ठेवलेली पॅकेजेस बदलतील:" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s (च्या मुळे %s)" -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -376,60 +394,60 @@ msgstr "" "धोक्याची सूचना:खालील जरूरीची पॅकेजेस कायमची काढून टाकली जातील।\n" "तुम्हाला तुम्ही काय करत आहात हे कळेपर्यंत असं करता येणार नाही!" -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu पुढे आवृत्तीकृत केले, %lu नव्याने संस्थापित केले," -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "%lu पुनर्संस्थापित केले," -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "%lu मागील आवृत्तीकृत केले," -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu कायमचे काढून टाकण्यासाठी आणि %lu पुढच्या आवृत्तीकृत झालेली नाही.\n" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu संपूर्ण संस्थापित किंवा कायमची काढून टाकलेली नाही.\n" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, fuzzy, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "सूचना, '%s' रिजेक्स साठी %s ची निवड करत आहे\n" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, fuzzy, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "सूचना, '%s' रिजेक्स साठी %s ची निवड करत आहे\n" -#: cmdline/apt-get.cc:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "%s हे आभासी पॅकेज ह्यांच्याकडून तरतूद केले आहे,:\n" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr "[संस्थापित केले]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 #, fuzzy msgid " [Not candidate version]" msgstr "कंॅडिडेट आवृत्त्या" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "तुम्ही संस्थापित करण्यासाठी एक निश्चित स्पष्टपणे निवडले पाहिजे." -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -440,185 +458,186 @@ msgstr "" "याचा अर्थ असाही आहे की पॅकेज सापडत नाही,ते कालबाह्य किंवा \n" " म्हणजे ते दुसऱ्या उगमातून उपलब्ध\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "तथापि खालील पॅकेजेस मध्ये बदल झाला:" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, fuzzy, c-format msgid "Package '%s' has no installation candidate" msgstr "%s पॅकेजला संस्थापित कॅन्डिडेट नाही" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "%s पॅकेज संस्थापित केलेले नाही,म्हणून काढले नाही\n" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "%s पॅकेज संस्थापित केलेले नाही,म्हणून काढले नाही\n" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, fuzzy, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "लक्षात घ्या,%s ऐवजी %s ची निवड करत आहे \n" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "%s सोडून देत आहे, ते आधिच संस्थापित केले आहे आणि पुढिल आवृत्ती निश्चित केलेली नाही.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, fuzzy, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "%s सोडून देत आहे, ते आधिच संस्थापित केले आहे आणि पुढिल आवृत्ती निश्चित केलेली नाही.\n" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "%s चे पुनर्संस्थापन शक्य नाही, हे डाऊनलोड करता येत नाही.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ही आधीच नविन आवृत्ती आहे.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s स्वहस्ते संस्थापित करायचे आहे.\n" -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:913 #, fuzzy, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "%s साठी %s (%s) निवडलेली आवृत्ती.\n" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, fuzzy, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "%s साठी %s (%s) निवडलेली आवृत्ती.\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "डिपेन्डन्सीज बरोबर/दुरूस्त करत आहे..." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr "अयशस्वी/चूकीचे झाले." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "डिपेन्डन्सीज बरोबर करण्यास असमर्थ आहे " -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "आवृत्तीकृत संच कमीतकमी करण्यास असमर्थ" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr "झाले" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "हे बरोबर करण्यासाठी तुम्हाला `apt-get -f संस्थापना' प्रोग्राम चालू करावा लागेल." -#: cmdline/apt-get.cc:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "अनमेट डिपेंडन्सीज.-f.वापरून प्रयत्न करा " -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 msgid "WARNING: The following packages cannot be authenticated!" msgstr "धोक्याची सूचना:खालील पॅकेजेस् प्रमाणित करु शकत नाही! " -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "प्रमाणीकरणाची धोक्याची सूचना दुर्लक्षित करा.\n" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " +#: cmdline/apt-get.cc:1108 +#, fuzzy +msgid "Install these packages without verification?" msgstr "पडताळून पाहिल्याशिवाय ही पॅकेजेस संस्थापित करायची का [हो/नाही]?" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" msgstr "काही पॅकेजेसचे प्रमाणिकरण होऊ शकत नाही" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "काही अडचणी आहेत आणि --force-yes शिवाय -y वापरला गेला" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "अंतर्गत त्रुटी, तुटलेल्या पॅकेजेस बरोबर संस्थापित पॅकेजला आवाहन केले गेले/बोलावले गेले!" -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 msgid "Packages need to be removed but remove is disabled." msgstr "पॅकेजेस कायमची काढायची आहेत पण रिमूव्ह अकार्यक्षम केले आहे" -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 msgid "Internal error, Ordering didn't finish" msgstr "अंतर्गत त्रुटी,क्रम अजून संपला नाही" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "किती विचित्र...आकार जुळत नाहीत, ईमेल apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "अर्काईव्हजच्या %sB/%sB घेण्याची गरज आहे\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "अर्काईव्हज%sB घेण्याची गरज आहे.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "या क्रियेनंतर, %sB एवढी अधिक डिस्क जागा वापरली जाईल.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "या क्रियेनंतर, %sB डिस्क जागा मोकळी होईल.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s मध्ये रिकामी जागा सांगू शकत नाही" -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, c-format msgid "You don't have enough free space in %s." msgstr "%s मध्ये तुमच्याकडे पुरेशी जागा नाही." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "क्षुल्लक फक्त निर्देशित केले आहे पण हे क्षुल्लक कृति/ऑपरेशन नाही." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "हो, मी म्ह्टल्याप्रमाणे करा!" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -629,28 +648,29 @@ msgstr "" "पुढे '%s' उक्ती मध्ये लिहिणार \n" " ?] " -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "व्यत्यय/बंद करा." -#: cmdline/apt-get.cc:1284 -msgid "Do you want to continue [Y/n]? " +#: cmdline/apt-get.cc:1313 +#, fuzzy +msgid "Do you want to continue?" msgstr "तुम्हाला पुढे जायचे आहे [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s %s आणणे असफल\n" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "काही संचिका डाऊनलोड करण्यास असमर्थ" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "डाऊनलोड संपूर्ण आणि डाऊनलोड मध्ये फक्त पद्धती" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -658,20 +678,20 @@ msgstr "" "काही आर्काइव्हज आणण्यास असमर्थ, कदाचित apt-get रन करुन अद्ययावत करा किंवा --fix- " "बरोबर प्रयत्न कराहरवलेले/गहाळ?" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "" "--fix- सापडत नाही आणि माध्यम/मिडिया अदलाबदल हे सध्या तांत्रिक मदत देऊ शकत नाही" -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "न सापडणारी पॅकेजेस नीट करण्यास असमर्थ." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "संस्थापन खंडित करत आहे." -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -681,35 +701,35 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "%s उगम पॅकेज यादी सुरू करता येत नाही" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr "सुधारित आवृत्तीचा विधान आर्ग्युमेंटस घेऊ शकत नाही." -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "आपण या गोष्टी काढून टाकता नये, ऑटोरिमूव्हर सुरू करता येत नाही" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -727,15 +747,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 msgid "The following information may help to resolve the situation:" msgstr "खालील माहिती परिस्थिती निवळण्यासाठी मदत ठरू शकेल:" -#: cmdline/apt-get.cc:1824 +#: cmdline/apt-get.cc:1853 msgid "Internal Error, AutoRemover broke stuff" msgstr "अंतर्गत त्रुटी, AutoRemoverने स्टफला तोडले" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -745,7 +765,7 @@ msgid_plural "" msgstr[0] "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:" msgstr[1] "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -753,24 +773,24 @@ msgid_plural "" msgstr[0] "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:" msgstr[1] "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:" -#: cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1866 #, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "ती काढून टाकण्यासाठी 'apt-get autoremove' वापरा." msgstr[1] "ती काढून टाकण्यासाठी 'apt-get autoremove' वापरा." -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "अंतर्गत त्रुटी,ऑलअपग्रेडने स्टफला तोडले" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1984 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "तुम्हाला कदाचित 'apt-get -f install'(एपीटी-गेट -एफ संस्थापन') प्रोग्राम चालू करावा " "लागेल'यात बदल करण्यासाठी:" -#: cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -778,7 +798,7 @@ msgstr "" "अनमेट डिपेंडन्सीज.एपीटी-गेट -एफ संस्थापन ('apt-get -f install') पॅकेजशिवाय प्रयत्न करा " "(किंवा पर्याय सांगा)." -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:2002 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" @@ -790,85 +810,85 @@ msgstr "" "विभागणी असणारी पण हवी असणारी, तयार केली नसलेली पॅकेजेस वापरत असाल \n" "किंवा ती येणाऱ्यांपैकी बाहेर हलविली असतील." -#: cmdline/apt-get.cc:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "तुटलेली पॅकेजेस" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "खालील अतिरिक्त पॅकेजेस संस्थापित होतील:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "सुचवलेली पॅकेजेस:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "शिफारस केलेली पॅकेजेस:" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "%s पॅकेज सापडू शकले नाही" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "%s स्वहस्ते संस्थापित करायचे आहे.\n" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "पुढिल आवृत्तीची गणती करीत आहे..." -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "असमर्थ" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "झाले" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 msgid "Internal error, problem resolver broke stuff" msgstr "अंतर्गत त्रुटी, अडचण निवारकाने स्टफला तोडले" -#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "डाऊनलोड डिरेक्टरी कुलूपबंद करण्यास असमर्थ" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 msgid "Must specify at least one package to fetch source for" msgstr "उगम शोधण्यासाठी किमान एक पॅकेज देणे/सांगणे गरजेचे आहे" -#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, c-format msgid "Unable to find a source package for %s" msgstr "%s उगम पॅकेज शोधणे शक्य नाही/शोधण्यास असमर्थ आहे" -#: cmdline/apt-get.cc:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, c-format msgid "" "Please use:\n" @@ -876,104 +896,104 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "आधीच डाऊनलोड केलेली '%s' फाईल सोडून द्या\n" -#: cmdline/apt-get.cc:2604 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr "%s मध्ये पुरेशी जागा नाही" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2644 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "उगम अर्काईव्हज चा %sB/%sB घेण्याची गरज आहे.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2649 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "उगम अर्काईव्हजचा %sB घेण्याची गरज आहे.\n" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "%s उगम घ्या\n" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "काही अर्काईव्हज आणण्यास असमर्थ." -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s मध्ये आधीच उघडलेल्या उगमातील उघडलेल्याला सोडून द्या किंवा वगळा\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s' आज्ञा सुट्या करण्यास असमर्थ.\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n" -#: cmdline/apt-get.cc:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "बांधणी करणाऱ्या आज्ञा '%s' अयशस्वी.\n" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "चाईल्ड प्रक्रिया अयशस्वी" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 msgid "Must specify at least one package to check builddeps for" msgstr "बिल्डेपस् कशासाठी ते पडताळण्यासाठी किमान एक पॅकेज सांगणे गरजेचे आहे" -#: cmdline/apt-get.cc:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s साठी बांधणी डिपेंडन्सी माहिती मिळवण्यास असमर्थ" -#: cmdline/apt-get.cc:2839 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr "%s ला बांधणी डिपेंडन्स नाहीत.\n" -#: cmdline/apt-get.cc:3009 +#: cmdline/apt-get.cc:3040 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "%s पॅकेज न सापडल्याने %s साठी %s डिपेंडन्सी पूर्ण होऊ शकत नाही" -#: cmdline/apt-get.cc:3027 +#: cmdline/apt-get.cc:3058 #, 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:3050 +#: cmdline/apt-get.cc:3081 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "%s अवलंबित्व %s साठी पूर्ण होण्यास असमर्थ: संस्थापित पॅकेज %s खूपच नवीन आहे" -#: cmdline/apt-get.cc:3089 +#: cmdline/apt-get.cc:3120 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -982,37 +1002,37 @@ msgstr "" "आवृतीची मागणी पूर्ण करण्यासाठी %s पॅकेजची आवृत्ती उपलब्ध नाही,त्यामुळे %s साठी %s " "डिपेंडन्सी पूर्ण होऊ शकत नाही" -#: cmdline/apt-get.cc:3095 +#: cmdline/apt-get.cc:3126 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "%s पॅकेज न सापडल्याने %s साठी %s डिपेंडन्सी पूर्ण होऊ शकत नाही" -#: cmdline/apt-get.cc:3118 +#: cmdline/apt-get.cc:3149 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s साठी %s डिपेंडन्सी पूर्ण होण्यास असमर्थ: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3164 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s साठी बांधणी-डिपेंडन्सीज पूर्ण होऊ शकत नाही." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "बांधणी-डिपेंडन्सीज क्रिया पूर्ण करण्यास असमर्थ " -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "%s (%s) ला जोडत आहे" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "प्रोग्राम गटाला तांत्रिक मदत दिली:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1099,7 +1119,7 @@ msgstr "" " apt.conf(5) पुस्तिका पाने पहा.\n" " ह्या APT ला सुपर काऊ पॉवर्स आहेत\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1170,8 +1190,8 @@ msgid "%s was already not hold.\n" msgstr "%s ही आधीच नविन आवृत्ती आहे.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s साठी थांबलो पण ते तेथे नव्हते" @@ -1238,7 +1258,7 @@ msgstr "%s मधील सीडी-रॉम अनमाऊंट करण msgid "Disk not found." msgstr "डिस्क सापडत नाही" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "फाईल सापडली नाही" @@ -1301,7 +1321,7 @@ msgstr "सर्व्हरने %s सांगितले, '%s' लॉग msgid "TYPE failed, server said: %s" msgstr "सर्व्हरने %s सांगितले: टाईप असमर्थ:" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "वेळेअभावी संबंध जोडता येत नाही" @@ -1309,8 +1329,8 @@ msgstr "वेळेअभावी संबंध जोडता येत msgid "Server closed the connection" msgstr "सर्व्हरने संबंध जोडणी बंद केली" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "त्रुटी वाचा" @@ -1322,86 +1342,86 @@ msgstr "प्रतिसाधाने बफर भरुन गेले." msgid "Protocol corruption" msgstr "प्रोटोकॉल खराब झाले" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "लिहिण्यात त्रुटी" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "सॉकेट तयार करू शकत नाही" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "डेटा सॉकेट जोडू शकत नाही,जोडणी वेळेअभावी बंद केली" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "पॅसिव्ह सॉकेट जोडता येत नाही" -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "गेटऍड्रेसइनफो लिसनिंग सॉकेट घेण्यास असमर्थ होते" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "सॉकेट चिकटवता येत नाही" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "सॉकेट वर ऐकता येत नाही" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "सॉकेटचे नाव सांगता येत नाही" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "पोर्ट आज्ञा पाठवता येत नाही/पोर्ट आज्ञा पाठविण्यास असमर्थ" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "माहित नसलेला पत्ता फॅमिली %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "ई.पी.आर.टी. चुकले,सर्व्हरने %s सांगितले" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "डेटा सॉकेट जोडणी वेळेअभावी तुटली" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "जोडणी स्विकारण्यास असमर्थ" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "फाईल हॅश करण्यात त्रुटी" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "सर्व्हरने %s सांगितले, फाईल मिळवण्यास असमर्थ" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "डेटा सॉकेट वेळेअभावी तुटले" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "सर्व्हरने %s सांगितले, डेटा स्थानांतरण चुकले" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "प्रश्न" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "जारी करण्यास करण्यास असमर्थ" @@ -1437,7 +1457,7 @@ msgstr "%s:%s (%s) ला जोडू शकत नाही" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "%s ला जोडत आहे" @@ -1467,38 +1487,38 @@ msgstr "%s:%s' (%i) रिझॉल्व्ह होत असताना क msgid "Unable to connect to %s:%s:" msgstr "%s %s ला जोडण्यास असमर्थ:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:167 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "अंतर्गत त्रुटी: चांगली सही, पण की ठसे सांगू शकत नाही?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "किमान एक अवैध सही सापडली." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:173 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "सहीची खात्री करण्यासाठी '%s' कार्यान्वित करू शकत नाही (gpgv संस्थापित केले आहे का?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "gpgv कार्यान्वित होत असताना अपरिचित त्रुटी" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 msgid "The following signatures were invalid:\n" msgstr "खालील सह्या अवैध आहेत:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1536,59 +1556,59 @@ msgstr "HTTP सर्व्हरने विस्तार तांत् msgid "Unknown date format" msgstr "अपरिचित दिनांक प्रकार/स्वरूप " -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "चुकले/असमर्थ निवड करा" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "जोडणी वेळेअभावी तुटली" -#: methods/http.cc:855 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "निर्गत फाईल मध्ये लिहिताना त्रुटी/चूक" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी" -#: methods/http.cc:928 +#: methods/http.cc:927 msgid "Error reading from server. Remote end closed connection" msgstr "सर्व्हर मधून वाचण्यात चूक. लांब शेवट आणि बंद झालेली जोडणी" -#: methods/http.cc:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "सर्व्हर मधून वाचण्यात चूक" -#: methods/http.cc:1198 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "चुकीचा शीर्षक डाटा" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "जोडणी अयशस्वी" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "अंतर्गत त्रुटी" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "%s वाचण्यास असमर्थ" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1637,7 +1657,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "उपक्रियेचा आयपीसी वाहिनी तयार करण्यास असमर्थ" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "जोडणी अकाली बंद झाली" @@ -2119,11 +2139,11 @@ msgstr "अयोग्य अर्काईव्ह मेंबर शीर msgid "Invalid archive member header" msgstr "अयोग्य अर्काईव्ह मेंबर शीर्षक" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "अर्काईव्ह खूप छोटे आहे" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "अर्काईव्ह शीर्षके वाचणे असफल" @@ -2447,7 +2467,7 @@ msgstr "%s अवैध क्रिया" msgid "Unable to stat the mount point %s" msgstr "%s माऊंट पॉईंट स्टॅट करण्यास असमर्थ" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "सीडी-रॉम स्टॅट करण्यास असमर्थ" @@ -2466,101 +2486,101 @@ msgstr "फक्त वाचण्यासाठी कुलूप संच msgid "Could not open lock file %s" msgstr "%s कुलूप फाईल उघडता येत नाही" -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "%s nfs(नेटवर्क फाईल सिस्टीम) माऊंटेड कुलुप फाईल ला कुलुप /बंद करता येत नाही" -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "%s कुलुप मिळवता येत नाही" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "%s उपक्रियेला सेगमेंटेशन दोष प्राप्त झाला." -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "%s उपक्रियेला सेगमेंटेशन दोष प्राप्त झाला." -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "%s उपक्रियेने (%u) त्रुटी कोड दिलेला आहे" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "%s उपक्रिया अचानकपणे बाहेर पडली" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "%s फाईल उघडता येत नाही" -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "%s साठी पाईप उघडता येत नाही" -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "आयपीसी उपक्रिया तयार करण्यास असमर्थ" -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "दाबक(संकलितकर्ता) कर्यान्वित करण्यास असमर्थ" -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "वाचा, %lu अजूनही वाचण्यासाठी आहे पण आता काही उरली नाही" -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "लिहा, %lu अजूनही लिहिण्यासाठी आहे पण लिहिता येत नाही" -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "फाईल बंद करण्यात अडचण" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "संचिकेची syncing समस्या" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "फाईल अनलिंकिंग करण्यात अडचण" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "संचिकेची syncing समस्या" @@ -2758,19 +2778,19 @@ msgstr "स्त्रोत सुची %s (प्रकार) मध्य msgid "Type '%s' is not known on line %u in source list %s" msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही " -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "%s फाईल उघडता येत नाही" -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2793,7 +2813,7 @@ msgid "" msgstr "" "%s पॅकेज पुनः:अधिष्ठापित करण्याची गरज आहे, परंतु मला त्यासाठी ऑर्काइव्ह सापडू शकले नाही." -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2801,11 +2821,11 @@ msgstr "" "दोष,पॅकेज समस्या निवारक::निवारण करतांना अडथळा निर्माण झाला, ह्याचे कारण स्थगित " "पॅकेजेस असू शकते." -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "अडचणी दूर करण्यास असमर्थ, तुम्ही तुटलेले पॅकेज घेतलेले आहे." -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2979,40 +2999,40 @@ msgstr "पुनर्नामांकन अयशस्वी, %s (%s -> %s msgid "MD5Sum mismatch" msgstr "एमडी५ बेरीज/MD5Sum जुळत नाही" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 msgid "Hash Sum mismatch" msgstr "हॅश बेरीज जुळत नाही" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "पुढील कळ ओळखचिन्हांसाठी सार्वजनिक कळ उपलब्ध नाही:\n" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3020,12 +3040,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3034,7 +3054,7 @@ msgstr "" "मी %s पॅकेजकरीता संचिका शोधण्यास समर्थ नव्हतो. याचा अर्थ असाकी तुम्हाला हे पॅकेज स्वहस्ते " "स्थिर/निश्चित करण्याची गरज आहे(हरवलेल्या आर्चमुळे) " -#: apt-pkg/acquire-item.cc:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3043,7 +3063,7 @@ msgstr "" "मी %s पॅकेजकरीता संचिका शोधण्यास समर्थ नव्हतो. याचा अर्थ असाकी तुम्हालाहे पॅकेज स्वहस्ते " "स्थिर/निश्चित करण्याची गरज आहे." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3051,7 +3071,7 @@ msgstr "" "पॅकेज यादीची/सुचीची संचिका दूषित/खराब झालेली आहे. संचिका नाव नाही: पॅकेजकरीता क्षेत्र/" "ठिकाण %s." -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "आकार जुळतनाही" @@ -3173,22 +3193,22 @@ msgstr "नविन स्त्रोत सूची लिहित आह msgid "Source list entries for this disc are:\n" msgstr "ह्या डिस्क/चकती करिता स्त्रोत सूचीच्या प्रवेशिका आहेत: \n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "%i माहितीसंच लिहिले.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i गहाळ संचिकाबरोबर %i माहिती संच लिहिले.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i विजोड संचिकांबरोबर %i माहिती संच लिहिले\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "%i गहाळ संचिकाबरोबर आणि %i विजोड संचिकाबरोबर %i माहिती संच लिहिले\n" @@ -3275,12 +3295,12 @@ msgstr "" msgid "Installing %s" msgstr "%s संस्थापित होत आहे" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr "%s संरचित होत आहे" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr "%s काढून टाकत आहे" @@ -3301,96 +3321,96 @@ msgid "Running post-installation trigger %s" msgstr "संस्थापना-पश्चात ट्रिगर %s चालवत आहे" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, c-format msgid "Directory '%s' missing" msgstr "'%s' संचयिका गहाळ आहे" -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "%s फाईल उघडता येत नाही" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr "%s तयार करित आहे" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr "%s सुटे/मोकळे करीत आहे " -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "%s संरचने साठी तयार करत आहे" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr "%s संस्थापित झाले" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "%s ला काढून टाकण्यासाठी तयारी करत आहे" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr "%s काढून टाकले" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "%s संपूर्ण काढून टाकण्याची तयारी करत आहे" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr "%s संपूर्ण काढून टाकले" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "सत्रनोंद लिहिता येत नाही, openpty() असफल (/dev/pts आरोहित नाही?)\n" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/nb.po b/po/nb.po index 9cb8cb1b9..0a6cd5dff 100644 --- a/po/nb.po +++ b/po/nb.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2010-09-01 21:10+0200\n" "Last-Translator: Hans Fredrik Nordhaug \n" "Language-Team: Norwegian Bokmål \n" @@ -95,78 +95,78 @@ msgstr "Plass brukt av slark: " msgid "Total space accounted for: " msgstr "Samlet mengde redegjort plass: " -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "Pakkefila %s er ikke oppdatert." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Fant ingen pakker" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 msgid "You must give at least one search pattern" msgstr "Du må oppgi minst ett søkemønster" -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Klarer ikke å finne pakken %s" -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "Pakkefiler:" -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Mellomlageret er ikke oppdatert, kan ikke kryssreferere til en pakkefil" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "Låste pakker:" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(ikke funnet)" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr " Installert: " -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr " Kandidat: " -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(ingen)" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr " Pakke låst til: " #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr " Versjonstabell:" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s for %s kompilert på %s %s\n" -#: cmdline/apt-cache.cc:1730 +#: cmdline/apt-cache.cc:1760 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -298,83 +298,101 @@ msgstr "" " -c=? Les denne innstillingsfila.\n" " -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +msgid "[Y/n]" +msgstr "[J/n]" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "[j/N]" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" msgstr "" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Kompileringsfeil i regulært uttrykk - %s" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "Følgende pakker har uinnfridde avhengighetsforhold:" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "men %s er installert" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "men %s skal installeres" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "men lar seg ikke installere" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "men er en virtuell pakke" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "men er ikke installert" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "men skal ikke installeres" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr " eller" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "Følgende NYE pakker vil bli installert:" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "Følgende pakker vil bli FJERNET:" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 msgid "The following packages have been kept back:" msgstr "Følgende pakker er holdt tilbake:" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "Følgende pakker vil bli oppgradert:" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "Følgende pakker vil bli NEDGRADERT:" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "Følgende pakker vil bli endret:" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s (pga. %s) " -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -382,59 +400,59 @@ msgstr "" "ADVARSEL: Følgende essensielle pakker vil bli fjernet.\n" "Dette bør IKKE gjøres, med mindre du vet nøyaktig hva du gjør!" -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu oppgraderte, %lu nylig installerte, " -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "%lu installert på nytt, " -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderte, " -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu å fjerne og %lu ikke oppgradert.\n" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pakker ikke fullt installert eller fjernet.\n" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "Merk, velger «%s» for oppgaven «%s»\n" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "Merk, velger «%s» for det regulære uttrykket «%s»\n" -#: cmdline/apt-get.cc:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakken %s er en virtuell pakke, som oppfylt av:\n" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr " [Installert]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 msgid " [Not candidate version]" msgstr " [Ikke versjonskandidat]" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "Du må velge en pakke som skal installeres." -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -445,135 +463,135 @@ msgstr "" "Dette kan bety at pakken mangler, er utgått, eller bare finnes \n" "tilgjengelig fra en annen kilde.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "Følgende pakker erstatter den imidlertid:" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, c-format msgid "Package '%s' has no installation candidate" msgstr "Pakken «%s» har ingen installasjonskandidat" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "Virtuelle pakker som «%s» kan ikke fjernes\n" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "Merk, velger «%s» istedenfor «%s»\n" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Omgår %s - den er allerede installert eller ikke satt til oppgradering.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "" "Hopper over %s siden den ikke er installert eller kun oppgraderinger er " "ønsket.\n" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Det er ikke mulig å installere %s på nytt - den kan ikke nedlastes.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "%s er allerede nyeste versjon.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s satt til manuell installasjon.\n" -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:913 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "Utvalgt versjon «%s» (%s) for «%s»\n" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, fuzzy, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "Utvalgt versjon «%s» (%s) for «%s»\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "Retter på avhengighetsforhold ..." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr " mislyktes." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "Klarer ikke å rette på avhengighetsforholdene" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "Klarer ikke å minimere oppgraderingsettet" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr " Utført" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Du vil kanskje kjøre «apt-get -f install» for å rette på dette." -#: cmdline/apt-get.cc:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "Uinnfridde avhengighetsforhold - Prøv «-f»." -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ADVARSEL: Følgende pakker ble ikke autentisert!" -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "Autentiseringsadvarsel overstyrt.\n" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " -msgstr "Installer disse pakkene uten verifikasjon [j/N]? " +#: cmdline/apt-get.cc:1108 +msgid "Install these packages without verification?" +msgstr "Installer disse pakkene uten verifikasjon?" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" msgstr "Noen pakker ble ikke autentisert" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "Det oppsto problemer og «-y» ble brukt uten «--force-yes»" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Intern feil, InstallPackages ble kalt med ødelagte pakker!" -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 msgid "Packages need to be removed but remove is disabled." msgstr "Pakker trenges å fjernes, men funksjonen er slått av." -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 msgid "Internal error, Ordering didn't finish" msgstr "Intern feil, sortering fullførte ikke" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Så rart ... Størrelsene stemmer ikke overens, send en e-post til " @@ -581,55 +599,55 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Må hente %sB/%sB med arkiver.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Må hente %sB med arkiver.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Etter denne operasjonen vil %sB ekstra diskplass bli brukt.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, c-format 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:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Couldn't determine free space in %s" msgstr "Klarte ikke bestemme ledig plass i %s" -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, c-format msgid "You don't have enough free space in %s." msgstr "Dessverre, ikke nok ledig plass i %s" -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "«Bare trivielle endringer» ble angitt, men dette er ikke en triviell endring." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "Ja, gjør som jeg sier!" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -640,28 +658,28 @@ msgstr "" "For å fortsette skriv inn teksten «%s»\n" " ?] " -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "Avbryter." -#: cmdline/apt-get.cc:1284 -msgid "Do you want to continue [Y/n]? " -msgstr "Vil du fortsette [Y/n]? " +#: cmdline/apt-get.cc:1313 +msgid "Do you want to continue?" +msgstr "Vil du fortsette?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikke å skaffe %s %s\n" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "Klarte ikke laste ned alle filene" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "Nedlasting fullført med innstillinga «bare nedlasting»" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -669,19 +687,19 @@ msgstr "" "Klarte ikke å hente alle arkivene. Du kan prøve med «apt-get update» eller " "«--fix-missing»." -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "«--fix-missing» og bytte av media støttes nå ikke" -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "Klarer ikke å rette på manglende pakker." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "Avbryter installasjonen." -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -695,35 +713,35 @@ msgstr[1] "" "De følgende pakkene forsvant fra systemet ditt siden\n" "alle filene er overskrevet av andre pakker:" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Merk: Dette er gjort automatisk og med hensikt av dpkg." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Ignorer utilgjengelig målutgave «%s» av pakke «%s»" -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Velger «%s» som kildepakke istedenfor «%s»\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Ignorer utilgjengelig versjon «%s» av pakke «%s»" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr "Oppdaterings-kommandoen tar ingen argumenter" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 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:1817 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -741,15 +759,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 msgid "The following information may help to resolve the situation:" msgstr "Følgende informasjon kan være til hjelp med å løse problemet:" -#: cmdline/apt-get.cc:1824 +#: cmdline/apt-get.cc:1853 msgid "Internal Error, AutoRemover broke stuff" msgstr "Intern feil, autofjerneren (AutoRemover) ødela noe" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -760,7 +778,7 @@ msgstr[0] "" msgstr[1] "" "Følgende pakker ble automatisk installert og er ikke lenger påkrevet:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -768,22 +786,22 @@ msgid_plural "" msgstr[0] "%lu pakke ble automatisk installert og er ikke lenger påkrevet.\n" msgstr[1] "%lu pakker ble automatisk installert og er ikke lenger påkrevet.\n" -#: cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1866 #, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Bruk «apt-get autoremove» for å fjerne dem." msgstr[1] "Bruk «apt-get autoremove» for å fjerne dem." -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern feil - «AllUpgrade» ødela noe" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1984 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Du vil kanskje utføre «apt-get -f install» for å rette på disse:" -#: cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -791,7 +809,7 @@ msgstr "" "Uinnfridde avhengighetsforhold. Prøv «apt-get -f install» uten pakker (eller " "angi en løsning)." -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:2002 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" @@ -803,78 +821,78 @@ msgstr "" "at visse kjernepakker ennå ikke er laget eller flyttet ut av «Incoming» for\n" "distribusjonen." -#: cmdline/apt-get.cc:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "Ødelagte pakker" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "Følgende ekstra pakker vil bli installert." -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "Foreslåtte pakker:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "Anbefalte pakker" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "Klarte ikke å finne pakken %s" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s satt til automatisk installasjon.\n" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "Beregner oppgradering... " -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "Mislyktes" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "Utført" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 msgid "Internal error, problem resolver broke stuff" msgstr "Intern feil, problemløser ødela noe" -#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "Klarer ikke å låse nedlastingsmappa" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 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:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, c-format msgid "Unable to find a source package for %s" msgstr "Klarer ikke å finne en kildekodepakke for %s" -#: cmdline/apt-get.cc:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -883,7 +901,7 @@ msgstr "" "MERK: «%s»-pakker blir vedlikeholdt i versjonskontrollsystemet «%s» på:\n" "%s\n" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, fuzzy, c-format msgid "" "Please use:\n" @@ -894,106 +912,106 @@ msgstr "" "bzr get %s\n" "for å hente siste (muligens ikke utgitte) oppdateringer for pakken.\n" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hopper over allerede nedlastet fil «%s»\n" -#: cmdline/apt-get.cc:2604 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikke nok ledig plass i %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2644 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Trenger å skaffe %sB av %sB fra kildekodearkivet.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2649 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Trenger å skaffe %sB fra kildekodearkivet.\n" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "Skaffer kildekode %s\n" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "Klarte ikke å skaffe alle arkivene." -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Omgår utpakking av allerede utpakket kilde i %s\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen «%s» mislyktes.\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, 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:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggekommandoen «%s» mislyktes.\n" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "Barneprosessen mislyktes" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 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:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, 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:2839 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen avhengigheter.\n" -#: cmdline/apt-get.cc:3009 +#: cmdline/apt-get.cc:3040 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes" -#: cmdline/apt-get.cc:3027 +#: cmdline/apt-get.cc:3058 #, 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:3050 +#: cmdline/apt-get.cc:3081 #, 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:3089 +#: cmdline/apt-get.cc:3120 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1002,37 +1020,37 @@ 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:3095 +#: cmdline/apt-get.cc:3126 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes" -#: cmdline/apt-get.cc:3118 +#: cmdline/apt-get.cc:3149 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikke å tilfredsstille %s avhengighet for %s: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3164 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Klarte ikke å tilfredstille bygg-avhengighetene for %s." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "Klarte ikke å behandle forutsetningene for bygging" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Kobler til %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "Støttede moduler:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1121,7 +1139,7 @@ msgstr "" "for mer informasjon og flere valg.\n" " Denne APT har kraften til en Superku.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1196,8 +1214,8 @@ msgid "%s was already not hold.\n" msgstr "%s er allerede nyeste versjon.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Ventet på %s, men den ble ikke funnet" @@ -1266,7 +1284,7 @@ msgstr "" msgid "Disk not found." msgstr "Disk ikke funnet." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "Fant ikke fila" @@ -1329,7 +1347,7 @@ msgstr "Kommandoen «%s» i innlogginsskriptet mislykkes, tjeneren sa: %s" msgid "TYPE failed, server said: %s" msgstr "TYPE mislykkes, tjeneren sa: %s" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "Tidsavbrudd på forbindelsen" @@ -1337,8 +1355,8 @@ msgstr "Tidsavbrudd på forbindelsen" msgid "Server closed the connection" msgstr "Tjeneren lukket forbindelsen" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "Lesefeil" @@ -1350,86 +1368,86 @@ msgstr "Et svar oversvømte bufferen." msgid "Protocol corruption" msgstr "Protokollødeleggelse" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "Skrivefeil" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "Klarte ikke å opprette en sokkel" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "Klarte ikke å kople til datasokkelen, tidsavbrudd på forbindelsen" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "Klarte ikke å koble til en passiv sokkel." -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo klarte ikke å opprette en lyttesokkel" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "Klarte ikke å binde til sokkel" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "Klarte ikke å lytte til sokkel" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "Klarte ikke å avgjøre sokkelnavnet" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "Klarte ikke å sende PORT-kommandoen" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Ukjent adressefamilie %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT mislykkes, tjeneren sa: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "Tidsavbrudd på tilkoblingen til datasokkelen" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "Klarte ikke å godta tilkoblingen" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "Problem ved oppretting av nøkkel for fil" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Klarte ikke å hente fila, tjeneren sa «%s»" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "Tidsavbrudd på datasokkelen" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Dataoverføringen mislykkes, tjeneren sa «%s»" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "Spørring" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "Klarte ikke å starte" @@ -1465,7 +1483,7 @@ msgstr "Klarte ikke å koble til %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "Kobler til %s" @@ -1495,37 +1513,37 @@ msgstr "Noe galt skjedde ved oppslag av «%s:%s» (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Klarte ikke koble til %s:%s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:167 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Intern feil: God signatur, men kunne bestemme nøkkelfingeravtrykk?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Minst en ugyldig signatur ble funnet." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:173 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Klarte ikke kjøre «gpgv» for å verifisere signaturen (er gpgv installert?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "Ukjent feil ved kjøring av gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 msgid "The following signatures were invalid:\n" msgstr "De følgende signaturene var ugyldige:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1565,59 +1583,59 @@ msgstr "Denne HTTP-tjeneren har ødelagt støtte for område" msgid "Unknown date format" msgstr "Ukjent datoformat" -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "Utvalget mislykkes" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "Tidsavbrudd på forbindelsen" -#: methods/http.cc:855 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:928 +#: methods/http.cc:927 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden" -#: methods/http.cc:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "Feil ved lesing fra tjeneren" -#: methods/http.cc:1198 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "Ødelagte hodedata" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "Forbindelsen mislykkes" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "Intern feil" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "Klarer ikke å lese %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1670,7 +1688,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "Klarte ikke å opprette IPC-rør til underprosessen" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "Forbindelsen ble uventet stengt" @@ -2153,11 +2171,11 @@ msgstr "Ugyldig arkivmedlemshode %s" msgid "Invalid archive member header" msgstr "Ugyldig arkivmedlemshode" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "Arkivet er for kort" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "Klarte ikke å lese arkivhodene" @@ -2487,7 +2505,7 @@ msgstr "Ugyldig operasjon %s" msgid "Unable to stat the mount point %s" msgstr "Klarer ikke å fastsette monteringspunktet %s" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "Klarer ikke å få statusen på CD-spilleren" @@ -2506,101 +2524,101 @@ msgstr "Bruker ikke låsing for den skrivebeskyttede låsefila %s" msgid "Could not open lock file %s" msgstr "Klarte ikke åpne låsefila %s" -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Bruker ikke låsing på den nfs-monterte låsefila %s" -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "Får ikke låst %s" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Underprosessen %s mottok et minnefeilsignal." -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, c-format msgid "Sub-process %s received signal %u." msgstr "Underprosessen %s mottok signalet %u." -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Underprosessen %s ga en feilkode (%u)" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Underprosessen %s avsluttet uventet" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "Klarte ikke åpne fila %s" -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, c-format msgid "Could not open file descriptor %d" msgstr "Klarte ikke åpne fildeskriptor %d" -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "Klarte ikke å opprette underprosessen IPC" -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "Klarte ikke å kjøre komprimeringen" -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "lese, har fremdeles %lu igjen å lese, men ingen igjen" -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "skrive, har fremdeles %lu igjen å skrive, men klarte ikke å" -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, c-format msgid "Problem closing the file %s" msgstr "Problem ved låsing av fila %s" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problem ved endring av navn på fila %s til %s" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, c-format msgid "Problem unlinking the file %s" msgstr "Problem ved oppheving av lenke til fila %s" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "Problem ved oppdatering av fila" @@ -2798,7 +2816,7 @@ msgstr "Feil på %u i kildelista %s (type)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen «%s» er ukjent i linje %u i kildelista %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2807,12 +2825,12 @@ msgstr "" "Klarte ikke gjennomføre umiddelbar konfigurasjon av «%s». Se man 5 apt.conf " "under APT::Immediate-Configure for detaljer. (%d)" -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Klarte ikke åpne fila «%s»" -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2835,7 +2853,7 @@ msgid "" msgstr "" "Pakka %s trenger å installeres på nytt, men jeg finner ikke lageret for den." -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2843,11 +2861,11 @@ msgstr "" "Feil, pkgProblemResolver::Resolve skapte et brudd, det kan skyldes pakker " "som holdes tilbake." -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "Klarer ikke å rette problemene, noen ødelagte pakker er holdt tilbake." -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3018,41 +3036,41 @@ msgstr "klarte ikke å endre navnet, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "Feil MD5sum" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 msgid "Hash Sum mismatch" msgstr "Hashsummen stemmer ikke" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Klarer ikke å fortolke Release-fila %s" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Det er ingen offentlig nøkkel tilgjengelig for de følgende nøkkel-ID-ene:\n" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konflikt mellom distribusjoner: %s (forventet %s men fant %s)" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3062,12 +3080,12 @@ msgstr "" "forrige indeksfilen vil bli brukt. GPG-feil: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-feil: %s: %s" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3076,7 +3094,7 @@ msgstr "" "Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne pakken " "selv (fordi arkitekturen mangler)." -#: apt-pkg/acquire-item.cc:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3085,13 +3103,13 @@ msgstr "" "Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne denne " "pakken selv." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Oversiktsfilene er ødelagte. Feltet «Filename:» mangler for pakken %s." -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "Feil størrelse" @@ -3215,22 +3233,22 @@ msgstr "Skriver ny kildeliste\n" msgid "Source list entries for this disc are:\n" msgstr "Kildelisteoppføringer for denne CD-en er:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "Skrev %i poster.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Skrev %i poster med %i manglende filer.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Skrev %i poster med %i feile filer.\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Skrev %i poster med %i manglende filer og %i feile filer.\n" @@ -3324,12 +3342,12 @@ msgstr "" msgid "Installing %s" msgstr "Installerer %s" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr "Setter opp %s" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr "Fjerner %s" @@ -3350,78 +3368,78 @@ msgid "Running post-installation trigger %s" msgstr "Kjører etter-installasjonsutløser %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, c-format msgid "Directory '%s' missing" msgstr "Mappa «%s» mangler" -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, c-format msgid "Could not open file '%s'" msgstr "Klarte ikke åpne fila «%s»" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr "Forbereder %s" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr "Pakker ut %s" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "Forbereder oppsett av %s" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr "Installerte %s" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "Forbereder fjerning av %s" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr "Fjernet %s" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "Forbereder å fullstendig slette %s" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr "Fjernet %s fullstendig" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "Klarte ikke skrive logg, openpty() feilet (/dev/pts ikke montert?)\n" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "Kjører dpkg" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "Ingen apport-rapport skrevet for MaxReports allerede er nådd" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "avhengighetsproblemer - lar den være uoppsatt" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3429,7 +3447,7 @@ msgstr "" "Ingen apport-rapport skrevet fordi feilmeldingen indikerer at den er en " "følgefeil fra en tidligere feil." -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3437,7 +3455,7 @@ msgstr "" "Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «full disk»-" "feil" -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3445,7 +3463,7 @@ msgstr "" "Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «tom for " "minne»-feil" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/ne.po b/po/ne.po index d8f863c28..f54af4fa9 100644 --- a/po/ne.po +++ b/po/ne.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2006-06-12 14:35+0545\n" "Last-Translator: Shiva Pokharel \n" "Language-Team: Nepali \n" @@ -93,78 +93,78 @@ msgstr "कूल शिथिल खाली ठाऊँ:" msgid "Total space accounted for: " msgstr "को लागि कूल खाली ठाऊँ लेखांकन:" -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "प्याकेज फाइल %s sync भन्दा बाहिर छ ।" -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "कुनै प्याकेजहरू फेला परेन" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 #, fuzzy msgid "You must give at least one search pattern" msgstr "तपाईँले एउटा वास्तविक बान्की दिनुपर्छ" -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "प्याकेज %s तोक्न असक्षम भयो" -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "प्याकेज फाइलहरू:" -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 msgid "Cache is out of sync, can't x-ref a package file" msgstr "क्यास sync भन्दा बाहिर छ, प्याकेज फाइल x-ref गर्न सक्दैन" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "पिन गरिएका प्याकेजहरू:" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(फेला परेन)" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr " स्थापना भयो:" -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr " उमेद्वार:" -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(कुनै पनि होइन)" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr "प्याकेज पिन:" #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr " संस्करण तालिका:" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s को लागि %s %s, %s %s मा कम्पाएल गरिएको छ\n" -#: cmdline/apt-cache.cc:1730 +#: cmdline/apt-cache.cc:1760 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -296,83 +296,101 @@ msgstr "" " -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n" " -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +msgid "[Y/n]" +msgstr "" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" -msgstr "Y" +msgstr "" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" msgstr "" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "संकलन त्रुटि रिजेक्स गर्नुहोस् - %s" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "निम्न प्याकेजहरुले निर्भरताहरू भेटेनन्:" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "तर %s स्थापना भयो" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "तर %s स्थापना हुनुपर्यो" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "तर यो स्थापनायोग्य छैन" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "तर यो अवास्तविक प्याकेज होइन" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "तर यो स्थापना भएन" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "तर यो स्थापना हुन गइरहेको छैन" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr "वा" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "निम्न प्याकेजहरू हटाइनेछन्:" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 msgid "The following packages have been kept back:" msgstr "निम्न प्याकेजहरू पछाडि राखिनेछन्:" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "निम्न प्याकेजहरू स्तर वृद्धि हुनेछन्:" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "निम्न प्याकेजहरू स्तरकम गरिनेछन्:" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "निम्न भइरहेको प्याकेजहरू परिवर्तन हुनेछैन:" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s (%s कारणले) " -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -380,60 +398,60 @@ msgstr "" "चेतावनी: निम्न आवश्यक प्याकेजहरू हटाइनेछन् ।\n" "तपाईँ के गरिरहेको यकिन नभएसम्म यो काम गरिने छैन!" -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu स्तर वृद्धि गरियो, %lu नयाँ स्थापना भयो, " -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "%lu पुन: स्थापना गरियो, " -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "%lu स्तर कम गरियो, " -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu हटाउन र %lu स्तर वृद्धि गरिएन ।\n" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu पूर्णरुपले स्थापना भएन र हटाइएन ।\n" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, fuzzy, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "द्रष्टब्य, रिजेक्स '%s' को लागि %s चयन गरिदैछ\n" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, fuzzy, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "द्रष्टब्य, रिजेक्स '%s' को लागि %s चयन गरिदैछ\n" -#: cmdline/apt-get.cc:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "प्याकेज %s ...द्वारा उपलब्ध गराइएको अवास्तविक प्याकेज हो:\n" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr " [स्थापना भयो]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 #, fuzzy msgid " [Not candidate version]" msgstr "उमेद्वार संस्करणहरू" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "तपाईँले स्थापना गर्न स्पष्ट रुपमा एउटा चयन गर्नुहोस् ।" -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -444,185 +462,186 @@ msgstr "" "यसको मतलब प्याकेज हराइरहेको प्याकेज, बेकायम भयो\n" " अर्को स्रोतबाट मात्र उपलब्ध हुन्छ\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "जे भए पनि निम्न प्याकेजहरूले यसलाई बदल्छ:" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, fuzzy, c-format msgid "Package '%s' has no installation candidate" msgstr "प्याकेज %s संग कुनै स्थापना उमेद्वार छैन" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "प्याकेज %s स्थापना भएन, त्यसैले हटेन\n" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "प्याकेज %s स्थापना भएन, त्यसैले हटेन\n" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, fuzzy, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "द्रष्टब्य, %s को सट्टा %s चयन भइरहेछ\n" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "%s फड्किदैछ, यो पहिल्यै स्थापना भयो र स्तरवृद्धि सेट भएको छैन ।\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, fuzzy, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "%s फड्किदैछ, यो पहिल्यै स्थापना भयो र स्तरवृद्धि सेट भएको छैन ।\n" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr " %s को पुन: स्थापना सम्भव छैन, यो डाउनलोड हुन सक्दैन ।\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "तर %s स्थापना हुनुपर्यो" -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:913 #, fuzzy, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "%s को लागि चयन भएको संस्करण %s (%s)\n" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, fuzzy, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "%s को लागि चयन भएको संस्करण %s (%s)\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "निर्भरताहरू सुधार गरिदैछ..." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr "असफल भयो ।" -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "निर्भरताहरू सुधार गर्न असक्षम भयो" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "स्तर वृद्धि सेटलाई न्यूनतम गर्न असक्षम भयो" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr "काम भयो" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "यी सुधार गर्न तपाईँले 'apt-get -f install' चलाउन पर्छ ।" -#: cmdline/apt-get.cc:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "नभेटिएका निर्भरताहरू । -f प्रयोग गरेर प्रयास गर्नुहोस् ।" -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 msgid "WARNING: The following packages cannot be authenticated!" msgstr "चेतावनी: निम्न प्याकलेजहरू प्रणाणीकरण हुन सक्दैन! " -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "प्रमाणिकरण चेतावनी अधिलेखन भयो ।\n" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " +#: cmdline/apt-get.cc:1108 +#, fuzzy +msgid "Install these packages without verification?" msgstr "यी प्याकेजहरू रूजू बिना स्थापना गर्नुहुन्छ [y/N]? " -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" msgstr "केही प्याकेजहरू प्रमाणीकरण हुन सक्दैन" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "त्यहाँ समस्याहरू छन् र हुन्छलाई जोड नगरिकन -y को प्रयोग भयो" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "आन्तरिक त्रुटि, स्थापना प्याकेजहरुलाई भाँचिएको प्याकेज भनिन्थ्यो!" -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 msgid "Packages need to be removed but remove is disabled." msgstr "प्याकेजहरू हट्न चाहदैछन् तर हटाई अक्षम भइरहेछ ।" -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 msgid "Internal error, Ordering didn't finish" msgstr "आन्तरिक त्रुटि, आदेश समाप्त भएको छैन" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "कस्तो नमिलेको.. साइजहरू मेल खाएन, apt@packages.debian.org इमेल गर्नुहोस्" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "संग्रहहरुको %sB/%sB प्राप्त गर्न आवश्यक ।\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "संग्रहहरुको %sB प्राप्त गर्न आवश्यक ।\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, fuzzy, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "अनप्याक गरिसके पछि थप डिस्क खाली ठाउँको %sB प्रयोग हुनेछ ।\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, fuzzy, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "%sB अनप्याक गरिसके पछि डिस्क खाली ठाउँ खाली हुनेछ ।\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Couldn't determine free space in %s" msgstr " %s मा खाली ठाऊँ निर्धारण गर्न सकिएन" -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, c-format msgid "You don't have enough free space in %s." msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन ।" -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "त्रिभियल मात्र निर्दिष्ट गरिएको छ तर यो त्रिभियल सञ्चालन होइन ।" #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "हो,मैले भने जस्तै गर्नुहोस्!" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -633,28 +652,29 @@ msgstr "" "निरन्तरता दिन '%s' वाक्यांशमा टाइप गर्नुहोस् \n" " ?] " -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "परित्याग गर्नुहोस् ।" -#: cmdline/apt-get.cc:1284 -msgid "Do you want to continue [Y/n]? " +#: cmdline/apt-get.cc:1313 +#, fuzzy +msgid "Do you want to continue?" msgstr "के तपाईँ निरन्तरता दिन चाहनुहुन्छ [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s %s तान्न असफल भयो\n" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "केही फाइलहरू डाउनलोड गर्न असफल भयो" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "डाउनलोड समाप्त भयो र डाउनलोडमा मोड मात्रै छ" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -662,19 +682,19 @@ msgstr "" "केही संग्रहहरू तान्न असक्षम भयो,apt-get अद्यावधिक चलिरहेछ वा हराइरहेको --fix-संगै प्रयास " "गर्नुहुन्छ ?" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "हराइरहेको --fix-र स्वाप भइरहेको मेडिया हाल समर्थित भइरहेको छैन" -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "हराइरहेको प्याकेजहरू सुधार्न असक्षम भयो ।" -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "स्थापना परित्याग गरिदैछ ।" -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -684,35 +704,35 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन " #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr "अद्यावधिक आदेशले कुनै तर्कहरू लिदैन" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -728,16 +748,16 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 msgid "The following information may help to resolve the situation:" msgstr "निम्न सूचनाले अवस्थालाई हल गर्न मद्दत गर्नेछ: " -#: cmdline/apt-get.cc:1824 +#: cmdline/apt-get.cc:1853 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो " -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -747,7 +767,7 @@ msgid_plural "" msgstr[0] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:" msgstr[1] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -755,21 +775,21 @@ msgid_plural "" msgstr[0] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:" msgstr[1] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:" -#: cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1866 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "आन्तरिक त्रुटि,सबै स्तरवृद्धिले उत्तम गुण नष्ट गर्दछ" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1984 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "तपाईँ यसलाई सुधार गर्न 'apt-get -f install' चलाउन चाहनुहुन्छ:" -#: cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -777,7 +797,7 @@ msgstr "" "नभेटिएका निर्भरताहरू । प्याकेजहरू बिना 'apt-get -f install' प्रयास गर्नुहोस् ( वा " "समाधान निर्दिष्ट गर्नुहोस्) ।" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:2002 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" @@ -790,85 +810,85 @@ msgstr "" " वितरण अहिले सम्म सिर्जना\n" " भएको छैन वा आवगमन विनानै सर्यो ।" -#: cmdline/apt-get.cc:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "भाँचिएका प्याकेजहरू" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "निम्न अतिरिक्त प्याकेजहरू स्थापना हुनेछन्:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "सुझाव दिएका प्याकेजहरू:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "सिफारिस गरिएका प्याकेजहरू:" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "प्याकेज फेला पार्न सकिएन %s" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "तर %s स्थापना हुनुपर्यो" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "स्तर वृद्धि गणना गरिदैछ..." -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "असफल भयो" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "काम भयो" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 msgid "Internal error, problem resolver broke stuff" msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो " -#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "डाउनलोड डाइरेक्ट्री ताल्चा मार्न असक्षम" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 msgid "Must specify at least one package to fetch source for" msgstr "को लागि स्रोत तान्न कम्तिमा एउटा प्याकेज निर्दिष्ट गर्नुपर्छ" -#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, c-format msgid "Unable to find a source package for %s" msgstr "%s को लागि स्रोत प्याकेज फेला पार्न असफल भयो" -#: cmdline/apt-get.cc:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, c-format msgid "" "Please use:\n" @@ -876,104 +896,104 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "पहिल्यै डाउनलोड भएका फाइलहरु फड्काइदैछ '%s'\n" -#: cmdline/apt-get.cc:2604 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2644 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "स्रोत संग्रहहरुको %sB/%sB प्राप्त गर्न आवश्यक छ ।\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2649 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "स्रोत संग्रहहरुको %sB प्राप्त गर्न आवश्यक छ ।\n" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "स्रोत फड्काउनुहोस् %s\n" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "केही संग्रह फड्काउन असफल भयो ।" -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr " %s मा पहिल्यै अनप्याक गरिएका स्रोतको अनप्याक फड्काइदैछ\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "अनप्याक आदेश '%s' असफल भयो ।\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n" -#: cmdline/apt-get.cc:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "निर्माण आदेश '%s' असफल भयो ।\n" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "शाखा प्रक्रिया असफल भयो" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 msgid "Must specify at least one package to check builddeps for" msgstr "को लागि builddeps जाँच्न कम्तिमा एउटा प्याकेज निर्दष्ट गर्नुपर्छ" -#: cmdline/apt-get.cc:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s को लागि निर्माण-निर्भरता सूचना प्राप्त गर्न असक्षम भयो" -#: cmdline/apt-get.cc:2839 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr "%s कुनै निर्माणमा आधारित हुदैन ।\n" -#: cmdline/apt-get.cc:3009 +#: cmdline/apt-get.cc:3040 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन" -#: cmdline/apt-get.cc:3027 +#: cmdline/apt-get.cc:3058 #, 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:3050 +#: cmdline/apt-get.cc:3081 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "%s को लागि %s निर्भरता सन्तुष्ट पार्न असफल भयो: स्थापित प्याकेज %s अति नयाँ छ" -#: cmdline/apt-get.cc:3089 +#: cmdline/apt-get.cc:3120 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -982,37 +1002,37 @@ msgstr "" "%sको लागि %s निर्भरता सन्तुष्ट हुन सकेन किन भने प्याकेज %s को कुनै उपलब्ध संस्करणले संस्करण " "आवश्यकताहरुलाई सन्तुष्ट पार्न सकेन " -#: cmdline/apt-get.cc:3095 +#: cmdline/apt-get.cc:3126 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन" -#: cmdline/apt-get.cc:3118 +#: cmdline/apt-get.cc:3149 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s को लागि %s निर्भरता सन्तुष्ट गर्न असफल: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3164 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s को लागि निर्माण निर्भरताहरू सन्तुष्ट गर्न सकिएन । " -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "निर्माण निर्भरताहरू प्रक्रिया गर्न असफल" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "%s (%s) मा जडान गरिदैछ" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "समर्थित मोड्युलहरू:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1097,7 +1117,7 @@ msgstr "" "pages हेर्नुहोस् ।\n" " APT संग सुपर काउ शक्तिहरू छ ।\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1168,8 +1188,8 @@ msgid "%s was already not hold.\n" msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr " %s को लागि पर्खिरहेको तर यो त्यहाँ छैन" @@ -1236,7 +1256,7 @@ msgstr "%s मा सिडी रोम अनमाउन्ट गर्न msgid "Disk not found." msgstr "डिस्क फेला परेन ।" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "फाइल फेला परेन " @@ -1299,7 +1319,7 @@ msgstr "लगइन स्क्रिफ्ट आदेश '%s' असफल msgid "TYPE failed, server said: %s" msgstr "टाइप असफल भयो: %s" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "जडान समय सकियो" @@ -1307,8 +1327,8 @@ msgstr "जडान समय सकियो" msgid "Server closed the connection" msgstr "सर्भरले जडान बन्द गर्यो" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "त्रुटि पढ्नुहोस्" @@ -1320,86 +1340,86 @@ msgstr "एउटा प्रतिक्रियाले बफर अधि msgid "Protocol corruption" msgstr "प्रोटोकल दूषित" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "त्रुटि लेख्नुहोस्" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "एउटा सकेट सिर्जना गर्न सकेन" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "डेटा सकेट जडान गर्न सकिएन, जडान समय सकियो" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "निस्क्रिय सकेट जडान गर्न सकिएन" -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo सुन्ने सकेट प्राप्त गर्न असक्षम भयो" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "सकेट बाँध्न सकिएन" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "सकेटमा सुन्न सकिएन" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "सकेट नाम निर्धारण गर्न सकिएन" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "पोर्ट आदेश पठाउन असक्षम भयो" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "अज्ञात ठेगाना परिवार %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT असफल भयो, सर्भरले भन्यो: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "डेटा सकेटको जडान समय सकियो" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "जडान स्वीकार गर्न असक्षम भयो" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "समस्या द्रुतान्वेषण फाइल" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "फाइल तान्न असक्षम भयो, सर्भरले भन्यो '%s'" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "डेटा सकेट समय सकियो" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "डेटा स्थान्तरण असफल भयो, सर्भरले भन्यो '%s'" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "क्वेरी" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "आह्वान गर्न असक्षम भयो" @@ -1435,7 +1455,7 @@ msgstr " %s:%s (%s) मा जडान गर्न सकिएन ।" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "%s मा जडान गरिदैछ" @@ -1465,37 +1485,37 @@ msgstr " '%s:%s' (%i) हल गर्दा केही दुष्ट घट msgid "Unable to connect to %s:%s:" msgstr "%s %s मा जडान गर्न असफल भयो:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:167 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "आन्तरिक त्रुटि: असल हस्ताक्षर, तर कुञ्जी औठाछाप निर्धारण गर्न सकिएन?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "कम्तिमा एउटा अवैध हस्ताक्षर विरोध भयो ।" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:173 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "हस्ताक्षर रूजू गर्न '%s' कार्यन्वयन गर्न सकिएन (के gpgv स्थापना भयो?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "gpgv कार्यन्वयन गर्दा अज्ञात त्रुटि" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 msgid "The following signatures were invalid:\n" msgstr "निम्न हस्ताक्षरहरू अवैध छन्:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1533,59 +1553,59 @@ msgstr "HTTP सर्भर संग भाँचिएको दायरा msgid "Unknown date format" msgstr "अज्ञात मिति ढाँचा" -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "असफल चयन गर्नुहोस्" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "जडान समय सकियो" -#: methods/http.cc:855 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "निर्गात फाइलमा त्रुटि लेखिदैछ" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "फाइलमा त्रुटि लेखिदैछ" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "फाइलमा त्रुटि लेखिदैछ" -#: methods/http.cc:928 +#: methods/http.cc:927 msgid "Error reading from server. Remote end closed connection" msgstr "सर्भरबाट त्रुटि पढिदैछ । दूर गन्तब्य बन्द जडान" -#: methods/http.cc:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "सर्भरबाट त्रुटि पढिदैछ" -#: methods/http.cc:1198 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "खराब हेडर डेटा" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "जडान असफल भयो" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "आन्तरिक त्रुटि" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "%s पढ्न असफल भयो" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1634,7 +1654,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "सहायक प्रक्रियामा IPC पाइप सिर्जना गर्न असफल" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "जडान असमायिक बन्द भयो" @@ -2115,11 +2135,11 @@ msgstr "अवैध संग्रह सदस्य हेडर" msgid "Invalid archive member header" msgstr "अवैध संग्रह सदस्य हेडर" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "संग्रह अति छोटो छ" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "संग्रह हेडरहरू पढ्न असफल" @@ -2444,7 +2464,7 @@ msgstr "अवैध सञ्चालन %s" msgid "Unable to stat the mount point %s" msgstr "माउन्ट बिन्दु %s स्थिर गर्न असक्षम" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "सिडी रोम स्थिर गर्न असफल भयो" @@ -2463,101 +2483,101 @@ msgstr "ताल्चा मारिएको फाइल मात्र msgid "Could not open lock file %s" msgstr "ताल्चा मारिएको फाइल खोल्न सकिएन %s" -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "nfs माउन्ट गरिएको लक फाइलको लागि लक प्रयोग गरिएको छैन %s" -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "ताल्चा प्राप्त गर्न सकिएन %s" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "सहायक प्रक्रिया %s ले खण्डिकरण गल्ति प्राप्त भयो ।" -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "सहायक प्रक्रिया %s ले खण्डिकरण गल्ति प्राप्त भयो ।" -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "सहायक प्रक्रिया %s ले एउटा त्रुटि कोड फर्कायो (%u)" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "सहायक प्रक्रिया %s अनपेक्षित बन्द भयो" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "फाइल %s खोल्न सकिएन" -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "%s को लागि पाइप खोल्न सकिएन" -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "सहायक प्रक्रिया IPC सिर्जना गर्न असफल" -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "सङ्कुचनकर्ता कार्यान्वयन गर्न असफल भयो" -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "पड्नुहोस्, अहिले सम्म %lu पढ्न छ तर कुनै बाँकी छैन" -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "लेख्नुहोस्, अहिले सम्म %lu लेख्न छ तर सकिदैन " -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "फाइल बन्द गर्दा समस्या" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "फाइल गुप्तिकरण गर्दा समस्या" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "फाइल अनलिङ्क गर्दा समस्या" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "फाइल गुप्तिकरण गर्दा समस्या" @@ -2756,19 +2776,19 @@ msgstr "वैरुप्य लाइन %u स्रोत सूचिमा msgid "Type '%s' is not known on line %u in source list %s" msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "फाइल %s खोल्न सकिएन" -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2790,7 +2810,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "प्याकेज %s पुन:स्थापना हुन चाहन्छ, तर यसको लागि मैले एउटा संग्रह फेला पार्न सकिन ।" -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2798,11 +2818,11 @@ msgstr "" "त्रुटि, pkgProblemResolver:: समाधानले विच्छेदन सिर्जना गर्दछ, यो भइरहेको प्याकेजहरुको " "कारणले गर्दा हो ।" -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "समस्याहरू सुधार्न असक्षम भयो, तपाईँले प्याकेजहरु भाँच्नुभयो ।" -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2972,41 +2992,41 @@ msgstr "पुन:नामकरण असफल गरियो, %s (%s -> %s) msgid "MD5Sum mismatch" msgstr "MD5Sum मेल भएन" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 #, fuzzy msgid "Hash Sum mismatch" msgstr "MD5Sum मेल भएन" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "निम्न कुञ्जी IDs को लागि कुनै सार्वजनिक कुञ्जी उपलब्ध छैन:\n" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3014,12 +3034,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3028,7 +3048,7 @@ msgstr "" "%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज " "निश्चित गर्नुहोस् । (arch हराएरहेको कारणले) " -#: apt-pkg/acquire-item.cc:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3037,13 +3057,13 @@ msgstr "" "%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज " "निश्चित गर्नुहोस् ।" -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "प्याकेज अनुक्रमणिका फाइलहरू दूषित भए । प्याकेज %s को लागि कुनै फाइलनाम: फाँट छैन ।" -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "साइज मेल खाएन" @@ -3164,22 +3184,22 @@ msgstr "नयाँ स्रोत सूचि लेखिदैछ\n" msgid "Source list entries for this disc are:\n" msgstr "यो डिस्कको लागि स्रोत सूचि प्रविष्टिहरू:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "%i रेकर्डहरू लेखियो ।\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "हराइरहेको फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "मेल नखाएका फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "हराइरहेको फाइल %i हरू र मेल नखाएका फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n" @@ -3266,12 +3286,12 @@ msgstr "" msgid "Installing %s" msgstr " %s स्थापना भयो" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr " %s कनफिगर गरिदैछ" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr " %s हटाइदैछ" @@ -3292,96 +3312,96 @@ msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "आंशिक सूचिहरुको डाइरेक्ट्री %s हराइरहेछ ।" -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "फाइल %s खोल्न सकिएन" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr " %s तयार गरिदैछ" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr " %s अनप्याक गरिदैछ" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr " %s कनफिगर गर्न तयार गरिदैछ" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr " %s स्थापना भयो" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr " %s हटाउन तयार गरिदैछ" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr " %s हट्यो" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr " %s पूर्ण रुपले हटाउन तयार गरिदैछ" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr " %s पूर्ण रुपले हट्यो" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/nl.po b/po/nl.po index ef59d0e7e..11422b003 100644 --- a/po/nl.po +++ b/po/nl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.15.9\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2011-12-05 17:10+0100\n" "Last-Translator: Jeroen Schot \n" "Language-Team: Debian l10n Dutch \n" @@ -94,77 +94,77 @@ msgstr "Totale onbenutte ruimte: " msgid "Total space accounted for: " msgstr "Totale hoeveelheid verantwoorde ruimte: " -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "Pakketbestand %s is niet meer gesynchroniseerd." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Geen pakketten gevonden" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 msgid "You must give at least one search pattern" msgstr "U dient precies één zoekpatroon op te geven" -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Kan pakket %s niet vinden" -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "Pakketbestanden:" -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Cache loopt niet synchroon, kan pakketbestand niet 'x-ref'-en" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "Vastgepinde pakketten:" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(niet gevonden)" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr " Geïnstalleerd: " -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr " Kandidaat: " -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(geen)" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr " Pakketpin: " #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr " Versietabel:" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s voor %s gecompileerd op %s %s\n" -#: cmdline/apt-cache.cc:1730 +#: cmdline/apt-cache.cc:1760 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -298,83 +298,101 @@ msgstr "" " -c=? Lees dit configuratiebestand.\n" " -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +msgid "[Y/n]" +msgstr "[J/n]" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "[j/N]" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" -msgstr "" +msgstr "N" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-compilatiefout - %s" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "De volgende pakketten hebben niet-voldane vereisten:" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "maar %s is geïnstalleerd" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "maar %s zal geïnstalleerd worden" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "maar het is niet installeerbaar" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "maar het is een virtueel pakket" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "maar het is niet geïnstalleerd" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "maar het zal niet geïnstalleerd worden" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr " of" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "De volgende NIEUWE pakketten zullen geïnstalleerd worden:" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "De volgende pakketten zullen VERWIJDERD worden:" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 msgid "The following packages have been kept back:" msgstr "De volgende pakketten zijn achtergehouden:" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "De volgende pakketten zullen opgewaardeerd worden:" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "De volgende pakketten zullen GEDEGRADEERD worden:" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "De volgende vastgehouden pakketten zullen gewijzigd worden:" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s (vanwege %s) " -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -382,59 +400,59 @@ msgstr "" "WAARSCHUWING: De volgende essentiële pakketten zullen verwijderd worden.\n" "Dit dient NIET gedaan te worden tenzij u precies weet wat u doet!" -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu pakketten opgewaardeerd, %lu pakketten nieuw geïnstalleerd, " -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "%lu opnieuw geïnstalleerd, " -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "%lu gedegradeerd, " -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu te verwijderen en %lu niet opgewaardeerd.\n" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pakketten niet volledig geïnstalleerd of verwijderd.\n" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "Let op, '%s' wordt geselecteerd omwille van de taak '%s'\n" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, 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:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakket %s is een virtueel pakket voorzien door:\n" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr " [Geïnstalleerd]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 msgid " [Not candidate version]" msgstr "[Niet de kandidaat-versie]" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "U dient er één expliciet te selecteren voor installatie." -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -445,138 +463,138 @@ msgstr "" "een ander pakket. Mogelijk betekent dit dat het pakket ontbreekt,\n" "verouderd is, of enkel beschikbaar is van een andere bron\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "Echter, de volgende pakketten vervangen dit:" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, c-format msgid "Package '%s' has no installation candidate" msgstr "Pakket '%s' heeft geen kandidaat voor installatie" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "Virtuele pakketten zoals '%s' kunnen niet worden verwijderd\n" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "Pakket %s is niet geïnstalleerd, en wordt dus niet verwijderd\n" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "Pakket %s is niet geïnstalleerd, en wordt dus niet verwijderd\n" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "Let op, '%s' wordt geselecteerd in plaats van '%s'\n" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "%s wordt overgeslagen, het is al geïnstalleerd en opwaardering is niet " "gevraagd.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "" "%s wordt overgeslagen, het is niet geïnstalleerd en alleen opwaardering is " "gevraagd.\n" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "Herinstallatie van %s is niet mogelijk daar het niet opgehaald kan worden.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "%s is reeds de nieuwste versie.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s is ingesteld voor handmatige installatie.\n" -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:913 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "Versie '%s' (%s) geselecteerd voor '%s'\n" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, fuzzy, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "Versie '%s' (%s) geselecteerd voor '%s'\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "Vereisten worden gecorrigeerd..." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr " mislukt." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "Kan vereisten niet corrigeren" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "Kon de verzameling op te waarderen pakketten niet minimaliseren" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr " Klaar" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "U kunt 'apt-get -f install' uitvoeren om dit op te lossen." -#: cmdline/apt-get.cc:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "Er zijn vereisten waaraan niet voldaan is. Probeer -f te gebruiken." -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" "WAARSCHUWING: De volgende pakketten kunnen niet geauthentificeerd worden:" -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "Authentificatiewaarschuwing is genegeerd.\n" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " -msgstr "Wilt u deze pakketten installeren zonder verificatie [j/N]? " +#: cmdline/apt-get.cc:1108 +msgid "Install these packages without verification?" +msgstr "Wilt u deze pakketten installeren zonder verificatie?" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" msgstr "Sommige pakketten konden niet geauthentificeerd worden" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "Er zijn problemen en -y was gebruikt zonder --force-yes" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Interne fout, InstallPackages is aangeroepen met defecte pakketten!" -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 msgid "Packages need to be removed but remove is disabled." msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld." -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 msgid "Internal error, Ordering didn't finish" msgstr "Interne fout, rangschikken is niet voltooid" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Merkwaardig... De groottes kwamen niet overeen, gelieve apt@packages.debian." @@ -584,54 +602,54 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Er moeten %sB/%sB aan archieven opgehaald worden.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Er moeten %sB aan archieven opgehaald worden.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Door deze operatie zal er %sB extra schijfruimte gebruikt worden.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, c-format 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:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kon de hoeveelheid vrije schijfruimte op %s niet bepalen" -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, c-format msgid "You don't have enough free space in %s." msgstr "U heeft onvoldoende vrije schijfruimte op %s." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "'Trivial Only' is opgegeven, dit is echter geen triviale bewerking." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "Ja, doe wat ik zeg!" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -642,28 +660,28 @@ msgstr "" "Als u wilt doorgaan, dient u de zin '%s' in te typen.\n" " ?] " -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "Afbreken." -#: cmdline/apt-get.cc:1284 -msgid "Do you want to continue [Y/n]? " -msgstr "Wilt u doorgaan [J/n]? " +#: cmdline/apt-get.cc:1313 +msgid "Do you want to continue?" +msgstr "Wilt u doorgaan?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ophalen van %s is mislukt %s\n" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "Ophalen van sommige bestanden is mislukt" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "Ophalen klaar en alleen-ophalen-modus staat aan" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -671,19 +689,19 @@ msgstr "" "Kon sommige archieven niet ophalen, misschien kunt u 'apt-get update' of --" "fix-missing proberen?" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing en medium wisselen wordt op dit moment niet ondersteund" -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "Geen oplossing voor de missende pakketten gevonden." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "Installatie wordt afgebroken." -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -697,35 +715,35 @@ msgstr[1] "" "De volgende pakketten zijn van uw systeem verdwenen omdat\n" "alle bestanden zijn overschreven door andere pakketten:" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Let op: Dit wordt automatische en bewust door dpkg gedaan." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Negeer niet beschikbare doelrelease '%s' van pakket '%s'" -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "'%s' wordt genomen als bronpakket in plaats van '%s'\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Negeer niet beschikbare versie '%s' van pakket '%s'" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr "De opdracht 'update' aanvaard geen argumenten" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 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:1817 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -743,15 +761,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 msgid "The following information may help to resolve the situation:" msgstr "De volgende informatie helpt u mogelijk verder:" -#: cmdline/apt-get.cc:1824 +#: cmdline/apt-get.cc:1853 msgid "Internal Error, AutoRemover broke stuff" msgstr "Interne fout, AutoRemover heeft dingen stukgemaakt" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -763,7 +781,7 @@ msgstr[1] "" "De volgende pakketten zijn automatisch geïnstalleerd en zijn niet langer " "nodig:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -772,24 +790,24 @@ msgstr[0] "%lu pakket is automatisch geïnstalleerd en is niet langer nodig.\n" msgstr[1] "" "%lu pakketten zijn automatisch geïnstalleerd en zijn niet langer nodig.\n" -#: cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1866 #, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "U kunt deze verwijderen via 'apt-get autoremove'." msgstr[1] "U kunt deze verwijderen via 'apt-get autoremove'." -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1984 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:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -797,7 +815,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:1973 +#: cmdline/apt-get.cc:2002 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" @@ -808,80 +826,80 @@ 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:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "Niet-werkende pakketten:" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "De volgende extra pakketten zullen geïnstalleerd worden:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "Voorgestelde pakketten:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "Aanbevolen pakketten:" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "Kon pakket %s niet vinden" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s is ingesteld op automatische geïnstalleerd.\n" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "Opwaardering wordt doorgerekend... " -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "Mislukt" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "Klaar" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 msgid "Internal error, problem resolver broke stuff" msgstr "Interne fout, probleemoplosser heeft dingen stukgemaakt" -#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "Kon de ophaalmap niet vergrendelen" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 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:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, c-format msgid "Unable to find a source package for %s" msgstr "Kan geen bronpakket vinden voor %s" -#: cmdline/apt-get.cc:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -891,7 +909,7 @@ msgstr "" "'%s' op:\n" "%s\n" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, fuzzy, c-format msgid "" "Please use:\n" @@ -903,87 +921,87 @@ msgstr "" "om de nieuwste (mogelijk nog niet uit uitgebrachte) versie van het pakket op " "te halen.\n" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Reeds opgehaald bestand '%s' wordt overgeslagen\n" -#: cmdline/apt-get.cc:2604 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr "U heeft niet voldoende vrije schijfruimte op %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2644 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2649 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Moet %sB aan bronarchieven ophalen.\n" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "Ophalen bron %s\n" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "Ophalen van sommige archieven is mislukt." -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, 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:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uitpakopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, 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:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "Bouwopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "Dochterproces is mislukt" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 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:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, 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:2839 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr "%s heeft geen bouwvereisten.\n" -#: cmdline/apt-get.cc:3009 +#: cmdline/apt-get.cc:3040 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -992,7 +1010,7 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s " "onvindbaar is" -#: cmdline/apt-get.cc:3027 +#: cmdline/apt-get.cc:3058 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1001,14 +1019,14 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s " "onvindbaar is" -#: cmdline/apt-get.cc:3050 +#: cmdline/apt-get.cc:3081 #, 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:3089 +#: cmdline/apt-get.cc:3120 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1017,7 +1035,7 @@ 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:3095 +#: cmdline/apt-get.cc:3126 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1026,30 +1044,30 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s " "onvindbaar is" -#: cmdline/apt-get.cc:3118 +#: cmdline/apt-get.cc:3149 #, 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:3133 +#: cmdline/apt-get.cc:3164 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Bouwvereisten voor %s konden niet voldaan worden." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "Verwerken van de bouwvereisten is mislukt" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Er wordt verbinding gemaakt met %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "Ondersteunde modules:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1138,7 +1156,7 @@ msgstr "" "voor meer informatie en opties.\n" " Deze APT heeft Super Koe kracht.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1213,8 +1231,8 @@ msgid "%s was already not hold.\n" msgstr "%s is reeds de nieuwste versie.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Er is gewacht op %s, maar die kwam niet" @@ -1282,7 +1300,7 @@ msgstr "" msgid "Disk not found." msgstr "Schijf niet gevonden" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "Bestand niet gevonden" @@ -1345,7 +1363,7 @@ msgstr "Aanmeldscriptopdracht '%s' is mislukt; bericht van server: %s" msgid "TYPE failed, server said: %s" msgstr "TYPE mislukt; bericht van server: %s" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "Verbinding is verlopen" @@ -1353,8 +1371,8 @@ msgstr "Verbinding is verlopen" msgid "Server closed the connection" msgstr "Verbinding is verbroken door de server" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "Leesfout" @@ -1366,86 +1384,86 @@ msgstr "Een reactie deed de buffer overlopen" msgid "Protocol corruption" msgstr "Protocolcorruptie" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "Schrijffout" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "Kon geen socket aanmaken" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "Kon de datasocket niet verbinden, de verbinding verliep" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "Kon de passieve socket niet verbinden." -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo kon geen luistersocket verkrijgen" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "Kon geen socket binden" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "Kon niet op de socket niet luisteren" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "Kon de socketnaam niet bepalen" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "Kan PORT-commando niet verzenden" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Onbekende adresfamilie %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT is mislukt; bericht van server: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "Datasocket verbinding is verlopen" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "Kan de verbinding niet aanvaarden" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "Probleem bij het hashen van het bestand" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Kan bestand niet ophalen; bericht van server: %s" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "Datasocket verliep" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Data transfer is mislukt, server zei: %s" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "Zoekopdracht" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "Aanroepen mislukt van " @@ -1481,7 +1499,7 @@ msgstr "Kon niet verbinden met %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "Er wordt verbinding gemaakt met %s" @@ -1511,40 +1529,40 @@ msgstr "Er gebeurde iets raars bij het oplossen van '%s:%s' (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Kan geen verbinding maken met %s %s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:167 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:170 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Er is tenminste één ongeldige ondertekening gevonden." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:173 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Kon 'gpgv' niet uitvoeren om ondertekening te verifiëren (is gpgv " "geïnstalleerd?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "Onbekende fout bij het uitvoeren van gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 msgid "The following signatures were invalid:\n" msgstr "De volgende ondertekeningen waren ongeldig:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1586,60 +1604,60 @@ msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet" msgid "Unknown date format" msgstr "Onbekend datumformaat" -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "Selectie is mislukt" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "Verbinding verliep" -#: methods/http.cc:855 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "Fout bij het schrijven naar het uitvoerbestand" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "Fout bij het schrijven naar bestand" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "Fout bij het schrijven naar het bestand" -#: methods/http.cc:928 +#: methods/http.cc:927 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:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "Fout bij het lezen van de server" -#: methods/http.cc:1198 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "Foute koptekstdata" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "Verbinding mislukt" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "Interne fout" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "Kan %s niet lezen" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1692,7 +1710,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "Aanmaken van IPC-pijp naar subproces is mislukt" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "Verbinding werd voortijdig afgebroken" @@ -2181,11 +2199,11 @@ msgstr "Ongeldige koptekst voor archiefonderdeel: %s" msgid "Invalid archive member header" msgstr "Ongeldige koptekst in archiefonderdeel" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "Archief is te kort" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "Lezen van de archiefkopteksten is mislukt" @@ -2519,7 +2537,7 @@ msgstr "Ongeldige operatie %s" msgid "Unable to stat the mount point %s" msgstr "Kan de status van het aanhechtpunt %s niet opvragen" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "stat op de CD-ROM is mislukt" @@ -2540,102 +2558,102 @@ msgstr "" msgid "Could not open lock file %s" msgstr "Kon het vergrendelingsbestand '%s' niet openen" -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Het via nfs aangekoppelde vergrendelingsbestand %s wordt niet vergrendeld" -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "Kon vergrendeling %s niet verkrijgen" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Subproces %s ontving een segmentatiefout." -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, c-format msgid "Sub-process %s received signal %u." msgstr "Subproces %s ontving signaal %u." -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Subproces %s gaf de foutcode %u terug" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Subproces %s sloot onverwacht af" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "Kon het bestand %s niet openen" -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, c-format msgid "Could not open file descriptor %d" msgstr "Kon de bestandsindicator %d niet openen" -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "Aanmaken subproces-IPC is mislukt" -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "Uitvoeren van de compressor is mislukt " -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "lees, de laatste te lezen %lu zijn niet beschikbaar" -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "schrijf, de laatste %lu konden niet weggeschreven worden" -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, c-format msgid "Problem closing the file %s" msgstr "Probleem bij het afsluiten van het bestand %s" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Probleem bij het hernoemen van '%s' naar '%s'" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, c-format msgid "Problem unlinking the file %s" msgstr "Probleem bij het ontlinken van het bestand %s" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "Probleem bij het synchroniseren van het bestand" @@ -2834,7 +2852,7 @@ msgstr "Misvormde regel %u in bronlijst %s (type)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Type '%s' op regel %u in bronlijst %s is onbekend" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2843,12 +2861,12 @@ msgstr "" "Kon onmiddellijke configuratie van '%s' niet uitvoeren. Voor details zie " "'man 5 apt.conf', onder APT::Immediate-Configure. (%d)" -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Kon het bestand '%s' niet openen" -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2873,7 +2891,7 @@ msgstr "" "Pakket %s moet opnieuw geïnstalleerd worden, maar er kan geen archief voor " "gevonden worden." -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2881,11 +2899,11 @@ msgstr "" "Fout, pkgProblemResolver::Resolve maakte scheidingen aan, dit kan " "veroorzaakt worden door vastgehouden pakketten." -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "Kan problemen niet verhelpen, u houdt defecte pakketten vast." -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3066,41 +3084,41 @@ msgstr "herbenoeming is mislukt, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "MD5-som komt niet overeen" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 msgid "Hash Sum mismatch" msgstr "Hash-som komt niet overeen" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Kon Release-bestand %s niet ontleden" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Er zijn geen publieke sleutels beschikbaar voor de volgende sleutel-IDs:\n" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Conflicterende distributie: %s (verwachtte %s, maar kreeg %s)" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3111,12 +3129,12 @@ msgstr "" "%s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-fout: %s: %s" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3125,7 +3143,7 @@ msgstr "" "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u " "dit pakket handmatig moet repareren (wegens missende architectuur)" -#: apt-pkg/acquire-item.cc:1711 +#: apt-pkg/acquire-item.cc:1722 #, fuzzy, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3134,7 +3152,7 @@ msgstr "" "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u " "dit pakket handmatig moet repareren." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3142,7 +3160,7 @@ msgstr "" "De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor " "pakket %s." -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "Grootte komt niet overeen" @@ -3266,22 +3284,22 @@ msgstr "Nieuwe bronlijst wordt weggeschreven\n" msgid "Source list entries for this disc are:\n" msgstr "Bronlijst-ingangen voor de schijf zijn:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "%i records weggeschreven.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i records weggeschreven met %i missende bestanden.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i records weggeschreven met %i niet overeenkomende bestanden\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3379,12 +3397,12 @@ msgstr "" msgid "Installing %s" msgstr "%s wordt geïnstalleerd" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr "%s wordt geconfigureerd" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr "%s wordt verwijderd" @@ -3405,82 +3423,82 @@ msgid "Running post-installation trigger %s" msgstr "Post-installatie-trigger %s wordt uitgevoerd" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, c-format msgid "Directory '%s' missing" msgstr "Map '%s' ontbreekt" -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, c-format msgid "Could not open file '%s'" msgstr "Kon het bestand '%s' niet openen" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr "%s wordt voorbereid" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr "%s wordt uitgepakt" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "Configuratie van %s wordt voorbereid" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr "%s is geïnstalleerd" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "Verwijdering van %s wordt voorbereid" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr "%s is verwijderd" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "Volledige verwijdering van %s wordt voorbereid" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr "%s is volledig verwijderd" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Kon logbestand niet wegschrijven, openpty() is mislukt (/dev/pts niet " "aangekoppeld?)\n" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "dpkg wordt uitgevoerd" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "" "Er is geen apport-verslag weggeschreven omdat het maximum aantal verslagen " "(MaxReports) al is bereikt" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "problemen met vereisten - wordt niet geconfigureerd" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3488,7 +3506,7 @@ msgstr "" "Er is geen apport-verslag weggeschreven omdat de foutmelding volgt op een " "eerdere mislukking." -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3496,7 +3514,7 @@ msgstr "" "Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is " "over een volle schijf." -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3504,7 +3522,7 @@ msgstr "" "Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is " "over onvoldoende-geheugen." -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/nn.po b/po/nn.po index 9758fd8ef..1be347da0 100644 --- a/po/nn.po +++ b/po/nn.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_nn\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Havard Korsvoll \n" "Language-Team: Norwegian nynorsk \n" @@ -95,78 +95,78 @@ msgstr "Slingringsmon: " msgid "Total space accounted for: " msgstr "Brukt plass i alt: " -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "Pakkefila %s er ute av takt." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Fann ingen pakkar" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 #, fuzzy msgid "You must give at least one search pattern" msgstr "Du m oppgi nyaktig eitt mnster" -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Finn ikkje pakken %s" -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "Pakkefiler:" -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Mellomlageret er ute av takt, kan ikkje x-referera ei pakkefil" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "Spikra pakkar:" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(ikkje funne)" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr " Installert: " -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr " Kandidat: " -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(ingen)" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr " Pakke spikra til: " #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr " Versjonstabell:" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format 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:1730 +#: cmdline/apt-cache.cc:1760 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -300,83 +300,101 @@ msgstr "" " -c=? Les denne oppsettsfila.\n" " -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +msgid "[Y/n]" +msgstr "[J/n]" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "[j/N]" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" -msgstr "" +msgstr "N" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-kompileringsfeil - %s" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "Flgjande pakkar har krav som ikkje er oppfylte:" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "men %s er installert" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "men %s skal installerast" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "men lt seg ikkje installera" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "men er ein virtuell pakke" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "men er ikkje installert" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "men skal ikkje installerast" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr " eller" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "Dei flgjande NYE pakkane vil verta installerte:" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "Dei flgjande pakkane vil verta FJERNA:" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 msgid "The following packages have been kept back:" msgstr "Dei flgjande pakkane er haldne tilbake:" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "Dei flgjande pakkane vil verta oppgraderte:" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "Dei flgjande pakkane vil verta NEDGRADERTE:" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "Dei flgjande pakkane som er haldne tilbake vil verta endra:" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s (fordi %s) " -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@ -385,60 +403,60 @@ msgstr "" "TVARING: Dei flgjande ndvendige pakkane vil verta fjerna.\n" "Dette br IKKJE gjerast utan at du er fullstendig klar over kva du gjer!" -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu oppgraderte, %lu nyleg installerte, " -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "%lu installerte p nytt, " -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderte, " -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu skal fjernast og %lu skal ikkje oppgraderast.\n" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ikkje fullstendig installerte eller fjerna.\n" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, fuzzy, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "Merk, vel %s i staden for regex %s\n" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, fuzzy, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "Merk, vel %s i staden for regex %s\n" -#: cmdline/apt-get.cc:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakken %s er ein virtuell pakke, tilbydd av:\n" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr " [Installert]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 #, fuzzy msgid " [Not candidate version]" msgstr "Kandidatversjonar" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "Du m velja ein som skal installerast." -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -449,192 +467,192 @@ msgstr "" "av ein annan pakke. Dette tyder at pakket manglar, er gjort overfldig\n" "eller er berre tilgjengeleg fr ei anna kjelde\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "Dei flgjande pakkane kan brukast i staden:" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, fuzzy, c-format msgid "Package '%s' has no installation candidate" msgstr "Det finst ingen installasjonskandidat for pakken %s" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, fuzzy, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "Merk, vel %s i staden for %s\n" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Hoppar over %s, for den er installert fr fr og ikkje sett til " "oppgradering.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, fuzzy, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "" "Hoppar over %s, for den er installert fr fr og ikkje sett til " "oppgradering.\n" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "%s kan ikkje installerast p nytt, for pakken kan ikkje lastast ned.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "Den nyaste versjonen av %s er installert fr fr.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "men %s skal installerast" -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:913 #, fuzzy, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "Vald versjon %s (%s) for %s\n" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, fuzzy, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "Vald versjon %s (%s) for %s\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "Rettar p krav ..." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr " mislukkast." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "Klarte ikkje retta p krav" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "Klarte ikkje minimera oppgraderingsmengda" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr " Ferdig" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 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:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "Nokre krav er ikkje oppfylte. Prv med -f." -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 msgid "WARNING: The following packages cannot be authenticated!" msgstr "TVARING: Klarer ikkje autentisere desse pakkane." -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " -msgstr "Installer desse pakkane utan verifikasjon [j/N]? " +#: cmdline/apt-get.cc:1108 +msgid "Install these packages without verification?" +msgstr "Installer desse pakkane utan verifikasjon?" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" msgstr "Nokre pakkar kunne ikkje bli autentisert" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "Det oppstod problem, og -y vart brukt utan --force-yes" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 msgid "Packages need to be removed but remove is disabled." msgstr "Nokre pakkar m fjernast, men fjerning er sltt av." -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 #, fuzzy msgid "Internal error, Ordering didn't finish" msgstr "Intern feil ved tilleggjing av avleiing" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "M henta %sB/%sB med arkiv.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "M henta %sB med arkiv.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, fuzzy, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Etter utpakking vil %sB meir diskplass verta brukt.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, fuzzy, c-format 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:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Du har ikkje nok ledig plass i %s" -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, 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:1257 cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "Trivial Only var spesifisert, men dette er ikkje noka triviell handling." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "Ja, gjer som eg seier!" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -645,28 +663,28 @@ msgstr "" "For halda fram, m du skriva nyaktig %s.\n" " ?] " -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "Avbryt." -#: cmdline/apt-get.cc:1284 -msgid "Do you want to continue [Y/n]? " -msgstr "Vil du halda fram [J/n]? " +#: cmdline/apt-get.cc:1313 +msgid "Do you want to continue?" +msgstr "Vil du halda fram?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikkje henta %s %s\n" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "Klarte ikkje henta nokre av filene" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "Nedlastinga er ferdig i nedlastingsmodus" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -674,19 +692,19 @@ msgstr "" "Klarte ikkje henta nokre av arkiva. Du kan prva med apt-get update eller " "--fix-missing." -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing og byte av medium er ikkje sttta for tida" -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "Klarte ikkje retta opp manglande pakkar." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "Avbryt installasjon." -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -696,35 +714,35 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Klarte ikkje f status p kjeldepakkelista %s" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr "Oppdateringskommandoen tek ingen argument" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -740,16 +758,16 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 msgid "The following information may help to resolve the situation:" msgstr "Flgjande informasjon kan hjelpa med lysa situasjonen:" -#: cmdline/apt-get.cc:1824 +#: cmdline/apt-get.cc:1853 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Intern feil. AllUpgrade ydelagde noko" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -759,7 +777,7 @@ msgid_plural "" msgstr[0] "Dei flgjande NYE pakkane vil verta installerte:" msgstr[1] "Dei flgjande NYE pakkane vil verta installerte:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -767,22 +785,22 @@ msgid_plural "" msgstr[0] "Dei flgjande NYE pakkane vil verta installerte:" msgstr[1] "Dei flgjande NYE pakkane vil verta installerte:" -#: cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1866 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern feil. AllUpgrade ydelagde noko" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1984 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:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -790,7 +808,7 @@ msgstr "" "Nokre krav er ikkje oppfylte. Du kan prva apt-get -f install (eller velja " "ei lysing)." -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:2002 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" @@ -802,86 +820,86 @@ 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:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "ydelagde pakkar" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "Dei flgjande tilleggspakkane vil verta installerte:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "Fresltte pakkar:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "Tilrdde pakkar" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "Fann ikkje pakken %s" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "men %s skal installerast" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "Reknar ut oppgradering ... " -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "Mislukkast" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "Ferdig" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Intern feil. AllUpgrade ydelagde noko" -#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "Klarte ikkje lsa nedlastingskatalogen" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 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:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, c-format msgid "Unable to find a source package for %s" msgstr "Finn ingen kjeldepakke for %s" -#: cmdline/apt-get.cc:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, c-format msgid "" "Please use:\n" @@ -889,105 +907,105 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, 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:2604 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikkje nok ledig plass i %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2644 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "M henta %sB/%sB med kjeldekodearkiv.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2649 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "M henta %sB med kjeldekodearkiv.\n" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "Hent kjeldekode %s\n" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "Klarte ikkje henta nokre av arkiva." -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, 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:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen %s mislukkast.\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggjekommandoen %s mislukkast.\n" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "Barneprosessen mislukkast" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 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:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Klarte ikkje henta byggjekrav for %s" -#: cmdline/apt-get.cc:2839 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen byggjekrav.\n" -#: cmdline/apt-get.cc:3009 +#: cmdline/apt-get.cc:3040 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst" -#: cmdline/apt-get.cc:3027 +#: cmdline/apt-get.cc:3058 #, 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:3050 +#: cmdline/apt-get.cc:3081 #, 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:3089 +#: cmdline/apt-get.cc:3120 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -996,37 +1014,37 @@ 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:3095 +#: cmdline/apt-get.cc:3126 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst" -#: cmdline/apt-get.cc:3118 +#: cmdline/apt-get.cc:3149 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikkje oppfylla kravet %s for %s: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3164 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggjekrav for %s kunne ikkje tilfredstillast." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "Klarte ikkje behandla byggjekrava" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Koplar til %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "Sttta modular:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1112,7 +1130,7 @@ msgstr "" "til apt-get(8), sources.list(5) og apt.conf(5).\n" " APT har superku-krefter.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1183,8 +1201,8 @@ msgid "%s was already not hold.\n" msgstr "Den nyaste versjonen av %s er installert fr fr.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Venta p %s, men den fanst ikkje" @@ -1253,7 +1271,7 @@ msgstr "" msgid "Disk not found." msgstr "Fann ikkje fila" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "Fann ikkje fila" @@ -1316,7 +1334,7 @@ msgstr "Kommandoen msgid "TYPE failed, server said: %s" msgstr "TYPE mislukkast, tenaren sa: %s" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "Tidsavbrot p samband" @@ -1324,8 +1342,8 @@ msgstr "Tidsavbrot p msgid "Server closed the connection" msgstr "Tenaren lukka sambandet" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "Lesefeil" @@ -1337,86 +1355,86 @@ msgstr "Eit svar flaumde over bufferen." msgid "Protocol corruption" msgstr "Protokollydeleggjing" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "Skrivefeil" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "Klarte ikkje oppretta sokkel" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "Klarte ikkje kopla til datasokkel, tidsavbrot p sambandet" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "Klarte ikkje kopla til passiv sokkel." -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo klarte ikkje oppretta ein lyttesokkel" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "Klarte ikkje binda til sokkel" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "Klarte ikkje lytta til sokkel" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "Klarte ikkje avgjera sokkelnamnet" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "Klarte ikkje senda PORT-kommandoen" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Ukjend adressefamilie %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT mislukkast, tenaren sa: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "Tidsavbrot p tilkopling til datasokkel" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "Klarte ikkje godta tilkoplinga" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "Problem ved oppretting av nkkel for fil" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Klarte ikkje henta fila, tenaren sa %s" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "Tidsavbrot p datasokkelen" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Dataoverfringa mislukkast, tenaren sa %s" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "Sprjing" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "Klarte ikkje starta " @@ -1452,7 +1470,7 @@ msgstr "Klarte ikkje kopla til %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "Koplar til %s" @@ -1482,37 +1500,37 @@ msgstr "Det hende noko dumt ved oppslag av msgid "Unable to connect to %s:%s:" msgstr "Klarte ikkje kopla til %s %s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:167 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:173 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Dei flgjande tilleggspakkane vil verta installerte:" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1550,59 +1568,59 @@ msgstr "Denne HTTP-tenaren har msgid "Unknown date format" msgstr "Ukjend datoformat" -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "Utvalet mislukkast" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "Tidsavbrot p sambandet" -#: methods/http.cc:855 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:928 +#: methods/http.cc:927 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing fr tenaren. Sambandet vart lukka i andre enden" -#: methods/http.cc:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "Feil ved lesing fr tenaren" -#: methods/http.cc:1198 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "ydelagde hovuddata" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "Sambandet mislukkast" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "Intern feil" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "Klarte ikkje lesa %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1651,7 +1669,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "Klarte ikkje oppretta IPC-ryr til underprosessen" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "Sambandet vart uventa stengd" @@ -2127,11 +2145,11 @@ msgstr "Ugyldig arkivmedlemshovud" msgid "Invalid archive member header" msgstr "Ugyldig arkivmedlemshovud" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "Arkivet er for kort" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "Klarte ikkje lesa arkivhovuda" @@ -2457,7 +2475,7 @@ msgstr "Ugyldig operasjon %s" msgid "Unable to stat the mount point %s" msgstr "Klarte ikkje f status til monteringspunktet %s" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "Klarte ikkje f status til CD-ROM" @@ -2476,101 +2494,101 @@ msgstr "Brukar ikkje l msgid "Could not open lock file %s" msgstr "Klarte ikkje opna lsefila %s" -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Brukar ikkje lsing for den nfs-monterte lsefila %s" -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "Klarte ikkje lsa %s" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Underprosessen %s mottok ein segmenteringsfeil." -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Underprosessen %s mottok ein segmenteringsfeil." -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Underprosessen %s returnerte ein feilkode (%u)" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Underprosessen %s avslutta uventa" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "Klarte ikkje opna fila %s" -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "Klarte ikkje opna ryr for %s" -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "Klarte ikkje oppretta underprosessen IPC" -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "Klarte ikkje kyra komprimeringa " -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "lese, har framleis %lu att lesa, men ingen att" -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "skrive, har framleis %lu att skrive, men klarte ikkje" -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Problem ved lsing av fila" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Problem ved synkronisering av fila" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Problem ved oppheving av lenkje til fila" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "Problem ved synkronisering av fila" @@ -2769,19 +2787,19 @@ msgstr "Misforma linje %u i kjeldelista %s (type)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen %s er ukjend i linja %u i kjeldelista %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Klarte ikkje opna fila %s" -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2804,7 +2822,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Pakken %s m installerast p nytt, men arkivet finst ikkje." -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2812,12 +2830,12 @@ msgstr "" "Feil, pkgProblemResolver::Resolve har laga brot. Dette kan skuldast pakkar " "som er haldne tilbake." -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Klarte ikkje retta opp problema. Nokre ydelagde pakkar er haldne tilbake." -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2991,41 +3009,41 @@ msgstr "endring av namn mislukkast, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "Feil MD5-sum" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 #, fuzzy msgid "Hash Sum mismatch" msgstr "Feil MD5-sum" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Klarte ikkje tolka pakkefila %s (1)" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3033,12 +3051,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3047,7 +3065,7 @@ msgstr "" "Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv " "(fordi arkitekturen manglar)." -#: apt-pkg/acquire-item.cc:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3055,14 +3073,14 @@ msgid "" msgstr "" "Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Pakkeindeksfilene er ydelagde. Feltet Filename: manglar for pakken %s." -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "Feil storleik" @@ -3183,22 +3201,22 @@ msgstr "Skriv ny kjeldeliste\n" msgid "Source list entries for this disc are:\n" msgstr "Kjeldelisteoppfringar for denne disken er:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "Skreiv %i postar.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Skreiv %i postar med %i manglande filer.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Skreiv %i postar med %i filer som ikkje passa\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Skreiv %i postar med %i manglande filer og %i filer som ikkje passa\n" @@ -3285,12 +3303,12 @@ msgstr "" msgid "Installing %s" msgstr " Installert: " -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, fuzzy, c-format msgid "Configuring %s" msgstr "Koplar til %s" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, fuzzy, c-format msgid "Removing %s" msgstr "Opnar %s" @@ -3311,96 +3329,96 @@ msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Listekatalogen %spartial manglar." -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Klarte ikkje opna fila %s" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, fuzzy, c-format msgid "Preparing %s" msgstr "Opnar %s" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Opnar %s" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, fuzzy, c-format msgid "Preparing to configure %s" msgstr "Opnar oppsettsfila %s" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, fuzzy, c-format msgid "Installed %s" msgstr " Installert: " -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, fuzzy, c-format msgid "Removed %s" msgstr "Tilrdingar" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, fuzzy, c-format msgid "Preparing to completely remove %s" msgstr "Opnar oppsettsfila %s" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Klarte ikkje fjerna %s" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/pl.po b/po/pl.po index e759017df..17e6804ce 100644 --- a/po/pl.po +++ b/po/pl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.3\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2012-07-28 21:53+0200\n" "Last-Translator: Michał Kułach \n" "Language-Team: Polish \n" @@ -96,79 +96,79 @@ msgstr "Sumaryczny rozmiar niewykorzystanego miejsca: " msgid "Total space accounted for: " msgstr "Całkowity rozmiar: " -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "Plik pakietu %s jest przestarzały." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Nie znaleziono żadnych pakietów" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 msgid "You must give at least one search pattern" msgstr "Należy podać przynajmniej jeden wzorzec" -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "To polecenie jest przestarzałe. Prosimy używać \"apt-mark showauto\"." -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Nie udało się odnaleźć pakietu %s" -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "Plików pakietów:" -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Magazyn podręczny jest przestarzały, nie można odwołać się (x-ref) do pliku " "pakietu." #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "Przypięte pakiety:" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(nie znaleziono)" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr " Zainstalowana: " -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr " Kandydująca: " -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(brak)" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr " Sposób przypięcia: " #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr " Tabela wersji:" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s dla %s skompilowany %s %s\n" -#: cmdline/apt-cache.cc:1730 +#: cmdline/apt-cache.cc:1760 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -296,83 +296,101 @@ msgstr "" " -c=? Czyta wskazany plik konfiguracyjny.\n" " -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +msgid "[Y/n]" +msgstr "[T/n]" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "[t/N]" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" msgstr "T" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" msgstr "N" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Błąd kompilacji wyrażenia regularnego - %s" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "Następujące pakiety mają niespełnione zależności:" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "ale %s jest zainstalowany" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "ale %s ma zostać zainstalowany" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "ale nie da się go zainstalować" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "ale jest pakietem wirtualnym" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "ale nie jest zainstalowany" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "ale nie zostanie zainstalowany" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr " lub" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "Zostaną zainstalowane następujące NOWE pakiety:" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "Następujące pakiety zostaną USUNIĘTE:" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 msgid "The following packages have been kept back:" msgstr "Następujące pakiety zostały zatrzymane:" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "Następujące pakiety zostaną zaktualizowane:" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "Zostaną zainstalowane STARE wersje następujących pakietów:" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "Zostaną zmienione następujące zatrzymane pakiety:" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s (z powodu %s) " -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -380,59 +398,59 @@ msgstr "" "UWAGA: Zostaną usunięte następujące istotne pakiety.\n" "NIE należy kontynuować, jeśli nie jest się pewnym tego co się robi!" -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualizowanych, %lu nowo instalowanych, " -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "%lu ponownie instalowanych, " -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "%lu cofniętych wersji, " -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu usuwanych i %lu nieaktualizowanych.\n" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nie w pełni zainstalowanych lub usuniętych.\n" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "Uwaga, wybieranie %s dla zadania \"%s\"\n" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "Uwaga, wybieranie %s dla wyrażenia \"%s\"\n" -#: cmdline/apt-get.cc:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakiet %s jest pakietem wirtualnym zapewnianym przez:\n" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr " [Zainstalowany]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 msgid " [Not candidate version]" msgstr " [Brak wersji kandydującej]" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "Należy jednoznacznie wybrać jeden z nich do instalacji." -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -443,137 +461,137 @@ msgstr "" "Zazwyczaj oznacza to, że pakietu brakuje, został zastąpiony przez inny\n" "pakiet lub nie jest dostępny przy pomocy obecnie ustawionych źródeł.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "Jednak następujące pakiety go zastępują:" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, c-format msgid "Package '%s' has no installation candidate" msgstr "Pakiet %s nie ma kandydata do instalacji" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "Pakiety wirtualne, takie jak \"%s\" nie mogą być usunięte\n" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "" "Pakiet %s nie jest zainstalowany, więc nie zostanie usunięty. Czy chodziło o " "\"%s\"?\n" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "Pakiet \"%s\" nie jest zainstalowany, więc nie zostanie usunięty\n" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "Uwaga, wybieranie \"%s\" zamiast \"%s\"\n" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Pomijanie %s, jest już zainstalowane, a nie została wybrana aktualizacja.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "" "Pomijanie %s, nie jest zainstalowane, a wybrano wyłącznie aktualizacje.\n" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "Ponowna instalacja pakietu %s nie jest możliwa, nie może on zostać pobrany.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "%s jest już w najnowszej wersji.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s zaznaczony jako zainstalowany ręcznie.\n" -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:913 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "Wybrano wersję \"%s\" (%s) pakietu \"%s\"\n" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "Wybrano wersję \"%s\" (%s) pakietu \"%s\", z powodu \"%s\"\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "Naprawianie zależności..." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr " nie udało się." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "Nie udało się naprawić zależności" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "Nie udało się zminimalizować zbioru aktualizacji" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr " Gotowe" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 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:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "Niespełnione zależności. Proszę spróbować użyć -f." -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 msgid "WARNING: The following packages cannot be authenticated!" msgstr "UWAGA: Następujące pakiety nie mogą zostać zweryfikowane!" -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "Zignorowano ostrzeżenie uwierzytelniania.\n" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " -msgstr "Zainstalować te pakiety bez weryfikacji [t/N]? " +#: cmdline/apt-get.cc:1108 +msgid "Install these packages without verification?" +msgstr "Zainstalować te pakiety bez weryfikacji?" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" msgstr "Niektóre pakiety nie mogły zostać zweryfikowane" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "Wystąpiły problemy, a użyto -y bez --force-yes" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Błąd wewnętrzny, użyto InstallPackages z uszkodzonymi pakietami!" -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 msgid "Packages need to be removed but remove is disabled." msgstr "Pakiety powinny zostać usunięte, ale Remove jest wyłączone." -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 msgid "Internal error, Ordering didn't finish" msgstr "Błąd wewnętrzny, sortowanie niezakończone" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Wystąpił dziwny błąd - rozmiary się nie zgadzają. Proszę to zgłosić pod " @@ -581,55 +599,55 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Konieczne pobranie %sB/%sB archiwów.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Konieczne pobranie %sB archiwów.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Po tej operacji zostanie dodatkowo użyte %sB miejsca na dysku.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, c-format 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:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nie udało się ustalić ilości wolnego miejsca w %s" -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, c-format msgid "You don't have enough free space in %s." msgstr "Niestety w %s nie ma wystarczającej ilości wolnego miejsca." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Nakazano wykonywać tylko trywialne operacje, a ta do nich nie należy." # Bezpieczniej jest nie używać tu polskich znaków. #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "Tak, jestem pewien!" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -640,28 +658,28 @@ msgstr "" "Aby kontynuować proszę napisać zdanie \"%s\"\n" " ?] " -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "Przerwane." -#: cmdline/apt-get.cc:1284 -msgid "Do you want to continue [Y/n]? " -msgstr "Kontynuować [T/n]? " +#: cmdline/apt-get.cc:1313 +msgid "Do you want to continue?" +msgstr "Kontynuować?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Nie udało się pobrać %s %s\n" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "Nie udało się pobrać niektórych plików" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "Ukończono pobieranie w trybie samego pobierania" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -669,19 +687,19 @@ msgstr "" "Nie udało się pobrać niektórych archiwów, proszę spróbować uruchomić apt-get " "update lub użyć opcji --fix-missing." -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing i zamiana nośników nie są obecnie obsługiwane" -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "Nie udało się poprawić brakujących pakietów." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "Przerywanie instalacji" -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -698,35 +716,35 @@ msgstr[2] "" "Następujące pakiety zniknęły z tego systemu, ponieważ wszystkie ich pliki " "zostały nadpisane przez inne pakiety:" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Uwaga: dpkg wykonał to automatycznie i celowo." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Ignorowanie niedostępnego wydania docelowego %s pakietu %s" -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Zmieniono wybrany pakiet źródłowy na \"%s\" z \"%s\"\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Ignorowanie niedostępnej wersji \"%s\" pakietu \"%s\"" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr "Polecenie update nie wymaga żadnych argumentów" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 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:1817 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -744,15 +762,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 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:1824 +#: cmdline/apt-get.cc:1853 msgid "Internal Error, AutoRemover broke stuff" msgstr "Błąd wewnętrzny spowodowany przez AutoRemover" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -768,7 +786,7 @@ msgstr[2] "" "Następujące pakiety zostały zainstalowane automatycznie i nie są już więcej " "wymagane:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -783,23 +801,23 @@ msgstr[2] "" "%lu pakietów zostało zainstalowanych automatycznie i nie są już więcej " "wymagane.\n" -#: cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1866 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Aby go usunąć należy użyć \"apt-get autoremove\"." msgstr[1] "Aby je usunąć należy użyć \"apt-get autoremove\"." msgstr[2] "Aby je usunąć należy użyć \"apt-get autoremove\"." -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "Błąd wewnętrzny spowodowany przez AllUpgrade" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1984 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "Należy uruchomić \"apt-get -f install\", aby naprawić poniższe problemy:" -#: cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -807,7 +825,7 @@ msgstr "" "Niespełnione zależności. Proszę spróbować wykonać \"apt-get -f install\" bez " "pakietów (lub podać rozwiązanie)." -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:2002 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" @@ -819,33 +837,33 @@ msgstr "" "w której niektóre pakiety nie zostały jeszcze utworzone lub przeniesione\n" "z katalogu Incoming (\"Przychodzące\")." -#: cmdline/apt-get.cc:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "Pakiety są uszkodzone" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "Zostaną zainstalowane następujące dodatkowe pakiety:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "Sugerowane pakiety:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "Polecane pakiety:" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "Nie udało się odnaleźć pakietu %s" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s zaznaczony jako zainstalowany automatycznie.\n" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -853,48 +871,48 @@ msgstr "" "To polecenie jest przestarzałe. Prosimy używać \"apt-mark auto\" i \"apt-" "mark manual\"." -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "Obliczanie aktualizacji..." -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "Nie udało się" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "Gotowe" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 msgid "Internal error, problem resolver broke stuff" msgstr "Błąd wewnętrzny, spowodowany przez moduł rozwiązywania problemów" -#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "Nie udało się zablokować katalogu pobierania" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Nie można znaleźć źródła do pobrania wersji \"%s\" pakietu \"%s\"" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "Pobieranie %s %s" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 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:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, 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:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -904,7 +922,7 @@ msgstr "" "pod adresem:\n" "%s\n" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, c-format msgid "" "Please use:\n" @@ -916,70 +934,70 @@ msgstr "" "by pobrać najnowsze (prawdopodobnie jeszcze niewydane) poprawki tego " "pakietu.\n" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Pomijanie już pobranego pliku \"%s\"\n" -#: cmdline/apt-get.cc:2604 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr "W %s nie ma wystarczającej ilości wolnego miejsca" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2644 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Konieczne pobranie %sB/%sB archiwów źródeł.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2649 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Konieczne pobranie %sB archiwów źródeł.\n" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "Pobieranie źródeł %s\n" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "Nie udało się pobrać niektórych archiwów." -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, 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:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Polecenie rozpakowania \"%s\" zawiodło.\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, 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:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "Polecenie budowania \"%s\" zawiodło.\n" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "Proces potomny zawiódł" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 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 dla budowania" -#: cmdline/apt-get.cc:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -988,17 +1006,17 @@ msgstr "" "Nie znaleziono informacji o architekturze dla %s. Proszę zapoznać się z apt." "conf(5) APT::Architectures" -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nie udało się pobrać informacji o zależnościach dla budowania %s" -#: cmdline/apt-get.cc:2839 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr "%s nie ma zależności dla budowania.\n" -#: cmdline/apt-get.cc:3009 +#: cmdline/apt-get.cc:3040 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -1007,7 +1025,7 @@ msgstr "" "Zależność %s od %s nie może zostać spełniona, ponieważ %s nie jest dozwolone " "w pakietach \"%s\"" -#: cmdline/apt-get.cc:3027 +#: cmdline/apt-get.cc:3058 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1016,14 +1034,14 @@ msgstr "" "Zależność %s od %s nie może zostać spełniona, ponieważ nie znaleziono " "pakietu %s" -#: cmdline/apt-get.cc:3050 +#: cmdline/apt-get.cc:3081 #, 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:3089 +#: cmdline/apt-get.cc:3120 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1032,7 +1050,7 @@ msgstr "" "Zależność %s od %s nie może zostać spełniona, ponieważ kandydująca wersja " "pakietu %s nie spełnia wymagań wersji" -#: cmdline/apt-get.cc:3095 +#: cmdline/apt-get.cc:3126 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1041,30 +1059,30 @@ msgstr "" "Zależność %s od %s nie może zostać spełniona, ponieważ pakiet %s nie ma " "wersji kandydującej" -#: cmdline/apt-get.cc:3118 +#: cmdline/apt-get.cc:3149 #, 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:3133 +#: cmdline/apt-get.cc:3164 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Nie udało się spełnić zależności dla budowania %s." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "Nie udało się przetworzyć zależności dla budowania" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, c-format msgid "Changelog for %s (%s)" msgstr "Dziennik zmian %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "Obsługiwane moduły:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1152,7 +1170,7 @@ msgstr "" "apt-get(8), sources.list(5) i apt.conf(5).\n" " Ten APT ma moce Super Krowy.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1230,8 +1248,8 @@ msgid "%s was already not hold.\n" msgstr "%s został już odznaczony jako zatrzymany.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Oczekiwano na proces %s, ale nie było go" @@ -1321,7 +1339,7 @@ msgstr "Nie udało się odmontować CD-ROM-u w %s, być może wciąż jest używ msgid "Disk not found." msgstr "Nie odnaleziono dysku." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "Nie odnaleziono pliku" @@ -1386,7 +1404,7 @@ msgstr "" msgid "TYPE failed, server said: %s" msgstr "Polecenie TYPE nie powiodło się, odpowiedź serwera: %s" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "Przekroczenie czasu połączenia" @@ -1394,8 +1412,8 @@ msgstr "Przekroczenie czasu połączenia" msgid "Server closed the connection" msgstr "Serwer zamknął połączenie" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "Błąd odczytu" @@ -1407,86 +1425,86 @@ msgstr "Odpowiedź przepełniła bufor." msgid "Protocol corruption" msgstr "Naruszenie zasad protokołu" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "Błąd zapisu" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "Nie udało się utworzyć gniazda" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "Nie udało się połączyć gniazda danych, przekroczenie czasu połączenia" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "Nie udało się połączyć pasywnego gniazda." -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo nie było w stanie uzyskać nasłuchującego gniazda" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "Nie udało się przyłączyć gniazda" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "Nie udało się nasłuchiwać na gnieździe" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "Nie udało się określić nazwy gniazda" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "Nie można wysłać polecenia PORT" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Nieznana rodzina adresów %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "Polecenie EPRT nie powiodło się, odpowiedź serwera: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "Przekroczony czas połączenia gniazda danych" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "Nie udało się przyjąć połączenia" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "Nie udało się obliczyć skrótu pliku" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Nie można pobrać pliku, odpowiedź serwera: %s" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "Przekroczony czas oczekiwania na dane" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Nie udało się przesłać danych, odpowiedź serwera: %s" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "Info" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "Nie można wywołać " @@ -1522,7 +1540,7 @@ msgstr "Nie udało się połączyć z %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "Łączenie z %s" @@ -1552,39 +1570,39 @@ msgstr "Coś niewłaściwego stało się przy tłumaczeniu \"%s:%s\" (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Nie udało się połączyć z %s:%s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:167 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Błąd wewnętrzny: Prawidłowy podpis, ale nie udało się ustalić odcisku klucza!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Napotkano przynajmniej jeden nieprawidłowy podpis." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:173 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Nie udało się uruchomić gpgv by zweryfikować podpis (czy gpgv jest " "zainstalowane?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "Nieznany błąd podczas uruchamiania gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 msgid "The following signatures were invalid:\n" msgstr "Następujące podpisy były błędne:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1624,59 +1642,59 @@ msgstr "Ten serwer HTTP nieprawidłowo obsługuje zakresy (ranges)" msgid "Unknown date format" msgstr "Nieznany format daty" -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "Operacja select nie powiodła się" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "Przekroczenie czasu połączenia" -#: methods/http.cc:855 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "Błąd przy pisaniu do pliku wyjściowego" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "Błąd przy pisaniu do pliku" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "Błąd przy pisaniu do pliku" -#: methods/http.cc:928 +#: methods/http.cc:927 msgid "Error reading from server. Remote end closed connection" msgstr "Błąd czytania z serwera: Zdalna strona zamknęła połączenie" -#: methods/http.cc:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "Błąd czytania z serwera" -#: methods/http.cc:1198 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "Błędne dane nagłówka" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "Połączenie nie powiodło się" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "Błąd wewnętrzny" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "Nie można czytać %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1729,7 +1747,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "Nie udało się utworzyć potoku IPC do podprocesu" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "Połączenie zostało przedwcześnie zamknięte" @@ -2213,11 +2231,11 @@ msgstr "Nieprawidłowy nagłówek składnika archiwum: %s" msgid "Invalid archive member header" msgstr "Nieprawidłowy nagłówek składnika archiwum" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "Archiwum jest za krótkie" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "Nie udało się odczytać nagłówków archiwum" @@ -2549,7 +2567,7 @@ msgstr "Nieprawidłowa operacja %s" msgid "Unable to stat the mount point %s" msgstr "Nie udało się wykonać operacji stat na punkcie montowania %s" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "Nie udało się wykonać operacji stat na CDROM-ie" @@ -2568,35 +2586,35 @@ msgstr "Dla pliku blokady %s tylko do odczytu nie zostanie użyta blokada" msgid "Could not open lock file %s" msgstr "Nie udało się otworzyć pliku blokady %s" -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Dla pliku blokady %s montowanego przez NFS nie zostanie użyta blokada" -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "Nie udało się uzyskać blokady %s" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" "Lista plików nie może zostać stworzona, ponieważ \"%s\" nie jest katalogiem" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "Ignorowanie \"%s\" w katalogu \"%s\", ponieważ nie jest to zwykły plik" -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" "Ignorowanie pliku \"%s\" w katalogu \"%s\", ponieważ nie ma on rozszerzenia " "pliku" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" @@ -2604,70 +2622,70 @@ msgstr "" "Ignorowanie pliku \"%s\" w katalogu \"%s\", ponieważ ma on nieprawidłowe " "rozszerzenie pliku" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Podproces %s spowodował naruszenie ochrony pamięci." -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, c-format msgid "Sub-process %s received signal %u." msgstr "Podproces %s otrzymał sygnał %u." -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Podproces %s zwrócił kod błędu (%u)" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Podproces %s zakończył się niespodziewanie" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "Nie udało się otworzyć pliku %s" -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, c-format msgid "Could not open file descriptor %d" msgstr "Nie udało się otworzyć deskryptora pliku %d" -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "Nie udało się utworzyć IPC z podprocesem" -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "Nie udało się uruchomić kompresora " -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, c-format msgid "read, still have %llu to read but none left" msgstr "należało przeczytać jeszcze %llu, ale nic nie zostało" -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "należało zapisać jeszcze %llu, ale nie udało się to" -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, c-format msgid "Problem closing the file %s" msgstr "Problem przy zamykaniu pliku %s" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problem przy zapisywaniu pliku %s w %s" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, c-format msgid "Problem unlinking the file %s" msgstr "Problem przy odlinkowywaniu pliku %s" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "Problem przy zapisywaniu pliku na dysk" @@ -2866,7 +2884,7 @@ msgstr "Nieprawidłowa linia %u w liście źródeł %s (typ)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ \"%s\" jest nieznany w linii %u listy źródeł %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2876,12 +2894,12 @@ msgstr "" "5 apt.conf\" i zapoznać się z wpisem APT::Immediate-Configure aby dowiedzieć " "się więcej. (%d)" -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, c-format msgid "Could not configure '%s'. " msgstr "Nie udało się skonfigurować \"%s\". " -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2906,7 +2924,7 @@ msgstr "" "Pakiet %s ma zostać ponownie zainstalowany, ale nie można znaleźć jego " "archiwum." -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2914,11 +2932,11 @@ msgstr "" "Błąd, pkgProblemResolver::Resolve zwrócił błąd, może to być spowodowane " "zatrzymanymi pakietami." -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "Nie udało się naprawić problemów, zatrzymano uszkodzone pakiety." -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3089,12 +3107,12 @@ msgstr "nie udało się zmienić nazwy, %s (%s -> %s)" msgid "MD5Sum mismatch" msgstr "Błędna suma MD5" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 msgid "Hash Sum mismatch" msgstr "Błędna suma kontrolna" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3103,16 +3121,16 @@ msgstr "" "Nie udało się znaleźć oczekiwanego wpisu \"%s\" w pliku Release " "(nieprawidłowy wpis sources.list lub nieprawidłowy plik)" -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nie udało się znaleźć sumy kontrolnej \"%s\" w pliku Release" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "Dla następujących identyfikatorów kluczy brakuje klucza publicznego:\n" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3121,12 +3139,12 @@ msgstr "" "Plik Release dla %s wygasnął (nieprawidłowy od %s). Aktualizacje z tego " "repozytorium nie będą wykonywane." -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Nieprawidłowa dystrybucja: %s (oczekiwano %s, a otrzymano %s)" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3136,12 +3154,12 @@ msgstr "" "w dalszym ciągu będą używane poprzednie pliki indeksu. Błąd GPG %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "Błąd GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3150,7 +3168,7 @@ msgstr "" "Nie udało się odnaleźć pliku dla pakietu %s. Może to oznaczać, że trzeba " "będzie ręcznie naprawić ten pakiet (z powodu brakującej architektury)." -#: apt-pkg/acquire-item.cc:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3159,14 +3177,14 @@ msgstr "" "Nie udało się odnaleźć pliku dla pakietu %s. Może to oznaczać, że trzeba " "będzie ręcznie naprawić ten pakiet." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Pliki indeksu pakietów są uszkodzone. Brak pola Filename: dla pakietu %s." -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "Błędny rozmiar" @@ -3290,22 +3308,22 @@ msgstr "Zapisywanie nowej listy źródeł\n" msgid "Source list entries for this disc are:\n" msgstr "Źródła dla tej płyty to:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "Zapisano %i rekordów.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Zapisano %i rekordów z %i brakującymi plikami.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Zapisano %i rekordów z %i niepasującymi plikami\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Zapisano %i rekordów z %i brakującymi plikami i %i niepasującymi\n" @@ -3405,12 +3423,12 @@ msgstr "Wykonywanie zewnętrznego mechanizmu rozwiązywania zależności" msgid "Installing %s" msgstr "Instalowanie %s" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr "Konfigurowanie %s" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr "Usuwanie %s" @@ -3431,80 +3449,80 @@ msgid "Running post-installation trigger %s" msgstr "Uruchamianie wyzwalacza post-installation %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, c-format msgid "Directory '%s' missing" msgstr "Brakuje katalogu \"%s\"" -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, c-format msgid "Could not open file '%s'" msgstr "Nie udało się otworzyć pliku \"%s\"" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr "Przygotowywanie %s" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr "Rozpakowywanie %s" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "Przygotowywanie do konfiguracji %s" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr "Pakiet %s został zainstalowany" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "Przygotowywanie do usunięcia %s" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr "Pakiet %s został usunięty" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "Przygotowywanie do całkowitego usunięcia %s" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr "Pakiet %s został całkowicie usunięty" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Nie można zapisać dziennika, openpty() nie powiodło się (/dev/pts nie jest " "zamontowane?)\n" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "Uruchamianie dpkg" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "Operacja została przerwana, zanim mogła zostać zakończona" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "Brak raportu programu apport, ponieważ osiągnięto limit MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "problemy z zależnościami - pozostawianie nieskonfigurowanego" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3512,7 +3530,7 @@ msgstr "" "Brak raportu programu apport, ponieważ komunikat błędu wskazuje, że " "przyczyna niepowodzenia leży w poprzednim błędzie." -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3520,7 +3538,7 @@ msgstr "" "Brak raportu programu apport, ponieważ komunikat błędu wskazuje na " "przepełnienie dysku" -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3528,7 +3546,7 @@ msgstr "" "Brak raportu programu apport, ponieważ komunikat błędu wskazuje na błąd " "braku wolnej pamięci" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/pt.po b/po/pt.po index 620ee9c6f..5d4478280 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2012-06-29 15:45+0100\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" @@ -91,80 +91,80 @@ msgstr "Espaço total desperdiçado: " msgid "Total space accounted for: " msgstr "Espaço total contabilizado: " -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "O ficheiro do pacote %s está dessincronizado." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Não foi encontrado nenhum pacote" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 msgid "You must give at least one search pattern" msgstr "Tem de fornecer pelo menos um padrão de busca" -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" "Este comando foi depreceado. Em vez disso por favor utilize 'apt-mark " "showauto'." -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Não foi possível encontrar o pacote %s" -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "Ficheiros de Pacotes :" -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "A cache está dessincronizada, não pode x-referenciar um ficheiro de pacote" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "Pacotes Marcados:" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(não encontrado)" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr " Instalado: " -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr " Candidato: " -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(nenhum)" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr " Marcação do Pacote: " #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr " Tabela de Versão:" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s para %s compilado em %s %s\n" -#: cmdline/apt-cache.cc:1730 +#: cmdline/apt-cache.cc:1760 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -294,83 +294,101 @@ msgstr "" " -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/" "tmp\n" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +msgid "[Y/n]" +msgstr "[S/n]" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "s/N]" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" msgstr "N" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilação de regex - %s" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "Os pacotes a seguir têm dependências não satisfeitas:" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "mas %s está instalado" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "mas %s está para ser instalado" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "mas não é instalável" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "mas é um pacote virtual" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "mas não está instalado" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "mas não vai ser instalado" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr " ou" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "Serão instalados os seguintes NOVOS pacotes:" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "Serão REMOVIDOS os seguintes pacotes:" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 msgid "The following packages have been kept back:" msgstr "Serão mantidos em suas versões actuais os seguintes pacotes:" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "Serão actualizados os seguintes pacotes:" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "Será feito o DOWNGRADE aos seguintes pacotes:" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "Os seguintes pacotes mantidos serão mudados:" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s (devido a %s) " -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -378,59 +396,59 @@ msgstr "" "AVISO: Os seguintes pacotes essenciais serão removidos.\n" "Isso NÃO deverá ser feito a menos que saiba exactamente o que está a fazer!" -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu pacotes actualizados, %lu pacotes novos instalados, " -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "%lu a que foi feito o downgrade, " -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu a remover e %lu não actualizados.\n" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pacotes não totalmente instalados ou removidos.\n" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "Note, a seleccionar '%s' para a tarefa '%s'\n" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, 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:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "O pacote %s é um pacote virtual disponibilizado por:\n" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr " [Instalado]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 msgid " [Not candidate version]" msgstr "[Não é versão candidata]" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "Você deve seleccionar explicitamente um para instalar." -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -441,157 +459,157 @@ msgstr "" "Isso pode significar que o pacote falta, ou ficou obsoleto, ou\n" "está disponível somente a partir de outra fonte\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "No entanto, os seguintes pacotes substituem-no:" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, c-format msgid "Package '%s' has no installation candidate" msgstr "O pacote '%s' não tem candidato para instalação" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "Pacotes virtuais como '%s' não podem ser removidos\n" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "" "O pacote '%s' não está instalado, por isso não será removido. Queria dizer " "'%s'?\n" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "O pacote '%s' não está instalado, por isso não será removido\n" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "Note, a seleccionar '%s' em vez de '%s'\n" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Saltando %s, já está instalado e a actualização não está definida.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "Saltando %s, não está instalado e só são pedidas actualizações.\n" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "A reinstalação de %s não é possível, o download do mesmo não pode ser " "feito.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "%s já está na versão mais recente.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s está definido para ser instalado manualmente.\n" -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:913 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "Versão seleccionada '%s' (%s) para '%s'\n" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "Versão seleccionada '%s' (%s) para '%s' devido a '%s'\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "A corrigir dependências..." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr " falhou." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "Não foi possível corrigir dependências" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "Não foi possível minimizar o conjunto de actualizações" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr " Feito" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Você pode querer executar 'apt-get -f install' para corrigir isso." -#: cmdline/apt-get.cc:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "Dependências não satisfeitas. Tente utilizar -f." -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVISO: Os seguintes pacotes não podem ser autenticados!" -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "Aviso de autenticação ultrapassado.\n" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " -msgstr "Instalar estes pacotes sem verificação [y/N]? " +#: cmdline/apt-get.cc:1108 +msgid "Install these packages without verification?" +msgstr "Instalar estes pacotes sem verificação?" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" msgstr "Alguns pacotes não puderam ser autenticados" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "Há problemas e foi utilizado -y sem --force-yes" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Erro Interno, InstallPackages foi chamado com pacotes estragados!" -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 msgid "Packages need to be removed but remove is disabled." msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado." -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 msgid "Internal error, Ordering didn't finish" msgstr "Erro Interno, Ordering não terminou" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Estranho.. Os tamanhos não coincidiram, escreva para apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "É necessário obter %sB/%sB de arquivos.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "É necessário obter %sB de arquivos.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" @@ -599,33 +617,33 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, c-format 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:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Couldn't determine free space in %s" msgstr "Não foi possível determinar o espaço livre em %s" -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, 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:1257 cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Trivial Only especificado mas isto não é uma operação trivial." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "Sim, faça como eu digo!" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -636,28 +654,28 @@ msgstr "" "Para continuar escreva a frase '%s'\n" " ?] " -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "Abortado." -#: cmdline/apt-get.cc:1284 -msgid "Do you want to continue [Y/n]? " -msgstr "Deseja continuar [Y/n]? " +#: cmdline/apt-get.cc:1313 +msgid "Do you want to continue?" +msgstr "Deseja continuar?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falhou obter %s %s\n" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "Falhou o download de alguns ficheiros" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "Download completo e em modo de fazer apenas o download" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -665,19 +683,19 @@ msgstr "" "Não foi possível obter alguns arquivos, tente talvez correr apt-get update " "ou tente com --fix-missing?" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing e troca de mídia não são suportados actualmente" -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "Não foi possível corrigir os pacotes em falta." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "A abortar a instalação." -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -691,35 +709,35 @@ msgstr[1] "" "Os seguintes pacotes desapareceram do seu sistema pois\n" "todos os ficheiros foram por outros pacotes:" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Nota: Isto foi feito automaticamente e intencionalmente pelo dpkg." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Ignorar o lançamento pretendido, não disponível, '%s' do pacote '%s'" -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "A escolher '%s' como pacote pacote de código fonte em vez de '%s'\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Ignorar a versão '%s', não disponível, do pacote '%s'" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr "O comando update não leva argumentos" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 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:1817 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -737,15 +755,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 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:1824 +#: cmdline/apt-get.cc:1853 msgid "Internal Error, AutoRemover broke stuff" msgstr "Erro Interno, o AutoRemover estragou coisas" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -757,7 +775,7 @@ msgstr[1] "" "Os seguintes pacotes foram instalados automaticamente e já não são " "necessários:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -766,21 +784,21 @@ msgstr[0] "O pacote %lu foi instalado automaticamente e já não é necessário. msgstr[1] "" "Os pacotes %lu foram instalados automaticamente e já não são necessários.\n" -#: cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1866 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Utilize 'apt-get autoremove' para o remover." msgstr[1] "Utilize 'apt-get autoremove' para os remover." -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro Interno, AllUpgrade estragou algo" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1984 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:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -788,7 +806,7 @@ msgstr "" "Dependências não satisfeitas. Tente 'apt-get -f install' sem nenhum pacote " "(ou especifique uma solução)." -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:2002 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" @@ -800,33 +818,33 @@ msgstr "" "distribuição unstable em que alguns pacotes pedidos ainda não foram \n" "criados ou foram movidos do Incoming." -#: cmdline/apt-get.cc:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "Pacotes estragados" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "Os seguintes pacotes extra serão instalados:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "Pacotes sugeridos:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "Pacotes recomendados:" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "Impossível encontrar o pacote %s" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s está definido para ser instalado automaticamente.\n" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -834,46 +852,46 @@ msgstr "" "Este comando foi depreceado. Em vez disso, por favor utilize 'apt-mark auto' " "e 'apt-mark manual'." -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "A calcular a actualização... " -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "Falhou" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "Pronto" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 msgid "Internal error, problem resolver broke stuff" msgstr "Erro Interno, o solucionador de problemas estragou coisas" -#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "Impossível criar acesso exclusivo ao directório de downloads" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Não conseguiu encontrar uma fonte para obter a versão '%s' de '%s'" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "A obter %s %s" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 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:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, 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:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -883,7 +901,7 @@ msgstr "" "'%s' em:\n" "%s\n" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, c-format msgid "" "Please use:\n" @@ -894,71 +912,71 @@ msgstr "" "bzr branch %s\n" "para obter as últimas actualizações (possivelmente por lançar) ao pacote.\n" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, 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:2604 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr "Você não possui espaço livre suficiente em %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2644 #, 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" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2649 #, 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:2624 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "Obter código fonte %s\n" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "Falhou obter alguns arquivos." -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, 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:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "O comando de descompactação '%s' falhou.\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, 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:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "O comando de compilação '%s' falhou.\n" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "O processo filho falhou" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 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:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -967,18 +985,18 @@ msgstr "" "Nenhuma informação de arquitectura disponível para %s. Para configuração " "veja apt.conf(5) APT::Architectures" -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, 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:2839 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr "%s não tem dependências de compilação.\n" -#: cmdline/apt-get.cc:3009 +#: cmdline/apt-get.cc:3040 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -987,7 +1005,7 @@ msgstr "" "a dependência de %s por %s não pode ser satisfeita porque %s não é permitido " "em pacotes '%s'" -#: cmdline/apt-get.cc:3027 +#: cmdline/apt-get.cc:3058 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -996,14 +1014,14 @@ 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:3050 +#: cmdline/apt-get.cc:3081 #, 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:3089 +#: cmdline/apt-get.cc:3120 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1012,7 +1030,7 @@ msgstr "" "a dependência de %s para %s não pode ser satisfeita porque a versão " "candidata do pacote %s não pode satisfazer os requisitos de versão" -#: cmdline/apt-get.cc:3095 +#: cmdline/apt-get.cc:3126 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1021,30 +1039,30 @@ msgstr "" "a dependência de %s para %s não pode ser satisfeita porque o pacote %s não " "tem versão candidata" -#: cmdline/apt-get.cc:3118 +#: cmdline/apt-get.cc:3149 #, 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:3133 +#: cmdline/apt-get.cc:3164 #, 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:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "Falhou processar as dependências de compilação" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, c-format msgid "Changelog for %s (%s)" msgstr "Changlog para %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "Módulos Suportados:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1134,7 +1152,7 @@ msgstr "" "apt-get(8), sources.list(5) e apt.conf(5)\n" " Este APT tem Poderes de Super Vaca.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1209,8 +1227,8 @@ msgid "%s was already not hold.\n" msgstr "%s já estava para não manter.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperou por %s mas não estava lá" @@ -1297,7 +1315,7 @@ msgstr "Impossível desmontar o CD-ROM em %s, pode ainda estar a ser utilizado." msgid "Disk not found." msgstr "Disco não encontrado." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "Ficheiro não encontrado" @@ -1360,7 +1378,7 @@ msgstr "O comando de script de login '%s' falhou, o servidor respondeu: %s" msgid "TYPE failed, server said: %s" msgstr "TYPE falhou, o servidor respondeu: %s" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "Foi atingido o tempo limite de ligação" @@ -1368,8 +1386,8 @@ msgstr "Foi atingido o tempo limite de ligação" msgid "Server closed the connection" msgstr "O servidor fechou a ligação" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "Erro de leitura" @@ -1381,86 +1399,86 @@ msgstr "Uma resposta sobrecarregou o buffer." msgid "Protocol corruption" msgstr "Corrupção de protocolo" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "Erro de escrita" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "Não foi possível criar um socket" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "Não foi possível ligar socket de dados, a ligação expirou" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "Não foi possível ligar socket passivo." -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo não foi capaz de obter um socket de escuta" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "Não foi possível fazer o bind a um socket" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "Não foi possível executar listen no socket" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "Não foi possível determinar o nome do socket" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "Não foi possível enviar o comando PORT" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Família de endereços %u desconhecida (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT falhou, o servidor respondeu: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "Ligação de socket de dados expirou" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "Impossível aceitar ligação" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "Problema ao calcular o hash do ficheiro" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Não foi possível obter o ficheiro, o servidor respondeu '%s'" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "Expirou o tempo do socket de dados" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "A transferência de dados falhou, o servidor respondeu '%s'" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "Pesquisa" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "Não foi possível invocar " @@ -1496,7 +1514,7 @@ msgstr "Não foi possível ligar em %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "A ligar a %s" @@ -1526,40 +1544,40 @@ msgstr "Algo estranho aconteceu ao resolver '%s:%s' (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Não foi possível ligar a %s:%s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:167 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:170 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Pelo menos uma assinatura inválida foi encontrada." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:173 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Não foi possível executar 'gpgv' para verificar a assinatura (o gpgv está " "instalado?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "Erro desconhecido ao executar gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 msgid "The following signatures were invalid:\n" msgstr "As seguintes assinaturas eram inválidas:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1599,59 +1617,59 @@ msgstr "Este servidor HTTP possui suporte de range errado" msgid "Unknown date format" msgstr "Formato de data desconhecido" -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "A selecção falhou" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "O tempo da ligação expirou" -#: methods/http.cc:855 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "Erro ao escrever para o ficheiro de saída" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "Erro ao escrever para ficheiro" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "Erro ao escrever para o ficheiro" -#: methods/http.cc:928 +#: methods/http.cc:927 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:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "Erro ao ler do servidor" -#: methods/http.cc:1198 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "Dados de cabeçalho errados" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "A ligação falhou" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "Erro interno" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "Não foi possível ler %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1704,7 +1722,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "Falha ao criar pipe IPC para subprocesso" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "Ligação encerrada prematuramente" @@ -1741,8 +1759,8 @@ msgstr "causados por dependências em falta. Isto está OK, somente os erros" msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" -"acima desta mensagem são importantes. Por favor resolva-os e execute [I]" -"nstalar novamente" +"acima desta mensagem são importantes. Por favor resolva-os e execute " +"[I]nstalar novamente" #: dselect/update:30 msgid "Merging available information" @@ -2188,11 +2206,11 @@ msgstr "Cabeçalho membro de arquivo inválido %s" msgid "Invalid archive member header" msgstr "Cabeçalho membro de arquivo inválido" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "Arquivo é demasiado pequeno" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "Falha ao ler os cabeçalhos do arquivo" @@ -2523,7 +2541,7 @@ msgstr "Operação %s inválida" msgid "Unable to stat the mount point %s" msgstr "Impossível executar stat ao ponto de montagem %s" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "Impossível executar stat ao cdrom" @@ -2543,37 +2561,37 @@ msgstr "" msgid "Could not open lock file %s" msgstr "Não foi possível abrir ficheiro de lock %s" -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Não está a ser utilizado o acesso exclusivo para o ficheiro %s, montado via " "nfs" -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "Não foi possível obter acesso exclusivo a %s" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" "Lista de ficheiros que não podem ser criados porque '%s' não é um directório" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "A ignorar '%s' no directório '%s' porque não é um ficheiro normal" -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" "A ignorar o ficheiro '%s' no directório '%s' porque não tem extensão no nome " "do ficheiro" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" @@ -2581,70 +2599,70 @@ msgstr "" "A ignorar o ficheiro '%s' no directório '%s' porque tem uma extensão " "inválida no nome do ficheiro" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "O sub-processo %s recebeu uma falha de segmentação." -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, c-format msgid "Sub-process %s received signal %u." msgstr "O sub-processo %s recebeu o sinal %u." -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "O sub-processo %s retornou um código de erro (%u)" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "O sub-processo %s terminou inesperadamente" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "Não foi possível abrir ficheiro o %s" -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, c-format msgid "Could not open file descriptor %d" msgstr "Não foi possível abrir o descritor de ficheiro %d" -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "Falhou criar subprocesso IPC" -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "Falhou executar compactador " -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, c-format msgid "read, still have %llu to read but none left" msgstr "lidos, ainda restam %llu para serem lidos mas não resta nenhum" -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "escritos, ainda restam %llu para escrever mas não foi possível" -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, c-format msgid "Problem closing the file %s" msgstr "Problema ao fechar o ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problema ao renomear o ficheiro %s para %s" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, c-format msgid "Problem unlinking the file %s" msgstr "Problema ao remover o link do ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "Problema sincronizando o ficheiro" @@ -2844,7 +2862,7 @@ msgstr "Linha mal formada %u na lista de fontes %s (tipo)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2853,12 +2871,12 @@ msgstr "" "Não foi possível proceder à configuração imediata em '%s'. Para detalhes, " "por favor veja man 5 apt.conf em APT::Immediate-Configure. (%d)" -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, c-format msgid "Could not configure '%s'. " msgstr "Não pode configurar '%s'. " -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2883,7 +2901,7 @@ msgstr "" "O pacote %s necessita ser reinstalado, mas não foi possível encontrar um " "repositório para o mesmo." -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2891,13 +2909,13 @@ msgstr "" "Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por " "pacotes mantidos (hold)." -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Não foi possível corrigir problemas, você tem pacotes mantidos (hold) " "estragados." -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3077,12 +3095,12 @@ msgstr "falhou renomear, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "MD5Sum não coincide" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 msgid "Hash Sum mismatch" msgstr "Código de verificação hash não coincide" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3091,18 +3109,18 @@ msgstr "" "Incapaz de encontrar a entrada '%s' esperada no ficheiro Release (entrada " "errada em sources.list ou ficheiro malformado)" -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Não foi possível encontrar hash sum para '%s' no ficheiro Release" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Não existe qualquer chave pública disponível para as seguintes IDs de " "chave:\n" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3111,12 +3129,12 @@ msgstr "" "O ficheiro Release para %s está expirado (inválido desde %s). Não serão " "aplicadas as actualizações para este repositório." -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribuição em conflito: %s (esperado %s mas obtido %s)" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3127,12 +3145,12 @@ msgstr "" "GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "Erro GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3142,7 +3160,7 @@ msgstr "" "significar que você precisa corrigir manualmente este pacote. (devido a " "arquitectura em falta)" -#: apt-pkg/acquire-item.cc:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3151,7 +3169,7 @@ msgstr "" "Não foi possível localizar arquivo para o pacote %s. Isto pode significar " "que você precisa consertar manualmente este pacote." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3159,7 +3177,7 @@ msgstr "" "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: " "para o pacote %s." -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "Tamanho incorrecto" @@ -3283,22 +3301,22 @@ msgstr "A escrever lista de novas source\n" msgid "Source list entries for this disc are:\n" msgstr "As entradas de listas de Source para este Disco são:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "Escreveu %i registos.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Escreveu %i registos com %i ficheiros em falta.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Escreveu %i registos com %i ficheiros não coincidentes\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3396,12 +3414,12 @@ msgstr "Executar resolvedor externo" msgid "Installing %s" msgstr "A instalar %s" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr "A configurar %s" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr "A remover %s" @@ -3422,80 +3440,80 @@ msgid "Running post-installation trigger %s" msgstr "A correr o 'trigger' de pós-instalação %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, c-format msgid "Directory '%s' missing" msgstr "Falta o directório '%s'" -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, c-format msgid "Could not open file '%s'" msgstr "Não foi possível abrir ficheiro o '%s'" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr "A preparar %s" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr "A desempacotar %s" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "A preparar para configurar %s" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr "%s instalado" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "A preparar a remoção de %s" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr "%s removido" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "A preparar para remover completamente %s" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr "Remoção completa de %s" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Não é possível escrever o registo (log), openpty() falhou (/dev/pts não está " "montado?)\n" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "A correr o dpkg" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "A operação foi interrompida antes de poder terminar" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "Nenhum relatório apport escrito pois MaxReports já foi atingido" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "problemas de dependências - deixando por configurar" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3503,7 +3521,7 @@ msgstr "" "Nenhum relatório apport escrito pois a mensagem de erro indica que é um erro " "de seguimento de um erro anterior." -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3511,7 +3529,7 @@ msgstr "" "Nenhum relatório apport escrito pois a mensagem de erro indica erro de disco " "cheio" -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3519,7 +3537,7 @@ msgstr "" "Nenhum relatório apport escrito pois a mensagem de erro indica um erro de " "memória esgotada" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 2704aeb94..cd30042b7 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2008-11-17 02:33-0200\n" "Last-Translator: Felipe Augusto van de Wiel (faw) \n" "Language-Team: Brazilian Portuguese %s)." msgid "MD5Sum mismatch" msgstr "MD5Sum incorreto" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 msgid "Hash Sum mismatch" msgstr "Hash Sum incorreto" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Impossível analisar arquivo de pacote %s (1)" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "Não existem chaves públicas para os seguintes IDs de chaves:\n" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3076,12 +3094,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3091,7 +3109,7 @@ msgstr "" "que você precisa consertar manualmente este pacote. (devido a arquitetura " "não especificada)." -#: apt-pkg/acquire-item.cc:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3100,7 +3118,7 @@ msgstr "" "Não foi possível localizar arquivo para o pacote %s. Isto pode significar " "que você precisa consertar manualmente este pacote." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3108,7 +3126,7 @@ msgstr "" "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo \"Filename:" "\" para o pacote %s." -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "Tamanho incorreto" @@ -3230,22 +3248,22 @@ msgstr "Gravando nova lista de fontes\n" msgid "Source list entries for this disc are:\n" msgstr "Entradas na lista de fontes para este disco são:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "Gravados %i registros.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Gravados %i registros com %i arquivos faltando.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Gravados %i registros com %i arquivos que não combinam\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3334,12 +3352,12 @@ msgstr "" msgid "Installing %s" msgstr "Instalando %s" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr "Configurando %s" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr "Removendo %s" @@ -3360,96 +3378,96 @@ msgid "Running post-installation trigger %s" msgstr "Executando gatilho pós-instalação %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, c-format msgid "Directory '%s' missing" msgstr "Diretório '%s' está faltando" -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Não foi possível abrir arquivo %s" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr "Preparando %s" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr "Desempacotando %s" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "Preparando para configurar %s" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr "%s instalado" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "Preparando para a remoção de %s" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr "%s removido" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparando para remover completamente %s" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr "%s completamente removido" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "Impossível escrever log, openpty() falhou (/dev/pts não montado?)\n" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/ro.po b/po/ro.po index 6399bee80..ca0260c26 100644 --- a/po/ro.po +++ b/po/ro.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ro\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2008-11-15 02:21+0200\n" "Last-Translator: Eddy Petrișor \n" "Language-Team: Romanian \n" @@ -93,79 +93,79 @@ msgstr "Total spațiu intern: " msgid "Total space accounted for: " msgstr "Total spațiu contorizat pentru: " -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "Fișierul pachetului %s este desincronizat." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Nu s-au găsit pachete" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 #, fuzzy msgid "You must give at least one search pattern" msgstr "Trebuie să dați exact un șablon" -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Nu s-a putut localiza pachetul %s" -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "Fișiere pachet: " -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Cache-ul este desincronizat, nu se poate executa x-ref pe un fișier pachet" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "Pachete alese special:" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(negăsit)" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr " Instalat: " -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr " Candidează: " -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(niciunul)" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr " Pachet ales special: " #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr " Tabela de versiuni:" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s pentru %s compilat la %s %s\n" -#: cmdline/apt-cache.cc:1730 +#: cmdline/apt-cache.cc:1760 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -297,83 +297,101 @@ msgstr "" " -c=? Citește acest fișier de configurare\n" " -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +msgid "[Y/n]" +msgstr "" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" msgstr "" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Eroare de compilare expresie regulată - %s" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "Următoarele pachete au dependențe neîndeplinite:" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "dar %s este instalat" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "dar %s este pe cale de a fi instalat" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "dar nu este instalabil" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "dar este un pachet virtual" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "dar nu este instalat" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "dar nu este pe cale să fie instalat" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr " sau" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "Următoarele pachete NOI vor fi instalate:" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "Următoarele pachete vor fi ȘTERSE:" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 msgid "The following packages have been kept back:" msgstr "Următoarele pachete au fost reținute:" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "Următoarele pachete vor fi ÎNNOITE:" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "Următoarele pachete vor fi DE-GRADATE:" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "Următoarele pachete ținute vor fi schimbate:" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s (datorită %s) " -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -381,60 +399,60 @@ msgstr "" "AVERTISMENT: Următoarele pachete esențiale vor fi șterse.\n" "Aceasta NU ar trebui făcută decât dacă știți exact ce vreți!" -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu înnoite, %lu nou instalate, " -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalate, " -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "%lu de-gradate, " -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu de șters și %lu neînnoite.\n" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu instalate sau șterse incomplet.\n" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, fuzzy, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "Notă, selectare %s pentru expresie regulată '%s'\n" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, fuzzy, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "Notă, selectare %s pentru expresie regulată '%s'\n" -#: cmdline/apt-get.cc:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pachetul %s este un pachet virtual furnizat de către:\n" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr " [Instalat]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 #, fuzzy msgid " [Not candidate version]" msgstr "Versiuni candidat" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "Ar trebui să alegeți în mod explicit unul pentru instalare." -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -445,187 +463,187 @@ msgstr "" "Aceasta ar putea însemna că pachetul lipsește, s-a învechit, sau\n" "este disponibil numai din altă sursă\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "Oricum următoarele pachete îl înlocuiesc:" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, fuzzy, c-format msgid "Package '%s' has no installation candidate" msgstr "Pachetul %s nu are nici un candidat la instalare" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "Pachetul %s nu este instalat, așa încât nu este șters\n" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "Pachetul %s nu este instalat, așa încât nu este șters\n" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, fuzzy, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "Notă, se selectează %s în locul lui %s\n" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Sar peste %s, este deja instalat și înnoirea nu este activată.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, fuzzy, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "Sar peste %s, este deja instalat și înnoirea nu este activată.\n" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Reinstalarea lui %s nu este posibilă, nu poate fi descărcat.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "%s este deja la cea mai nouă versiune.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s este marcat ca fiind instalat manual.\n" -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:913 #, fuzzy, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "Versiune selectată %s (%s) pentru %s\n" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, fuzzy, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "Versiune selectată %s (%s) pentru %s\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "Corectez dependențele..." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr " eșec." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "Nu s-au putut corecta dependențele" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "Nu s-a putut micșora mulțimea pachetelor de înnoit" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr " Terminat" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Ați putea să porniți 'apt-get -f install' pentru a corecta acestea." -#: cmdline/apt-get.cc:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "Dependențe neîndeplinite. Încercați să folosiți -f." -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVERTISMENT: Următoarele pachete nu pot fi autentificate!" -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "Avertisment de autentificare înlocuit.\n" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " -msgstr "Instalați aceste pachete fără verificare [y/N]? " +#: cmdline/apt-get.cc:1108 +msgid "Install these packages without verification?" +msgstr "Instalați aceste pachete fără verificare?" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" msgstr "Unele pachete n-au putut fi autentificate" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "Sunt unele probleme și -y a fost folosit fără --force-yes" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Eroare internă, InstallPackages a fost apelat cu pachete deteriorate!" -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 msgid "Packages need to be removed but remove is disabled." msgstr "Pachete trebuiesc șterse dar ștergerea este dezactivată." -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 msgid "Internal error, Ordering didn't finish" msgstr "Eroare internă, Ordering nu s-a terminat" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Ce ciudat.. Dimensiunile nu se potrivesc, scrieți la apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Este nevoie să descărcați %sB/%sB de arhive.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Este nevoie să descărcați %sB de arhive.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "După această operație vor fi folosiți din disc încă %sB.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, c-format 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:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Couldn't determine free space in %s" msgstr "N-am putut determina spațiul disponibil în %s" -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, 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:1257 cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "A fost specificat 'doar neimportant' dar nu este o operațiune neimportantă." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "Da, fă cum îți spun!" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -636,28 +654,28 @@ msgstr "" "Pentru a continua tastați fraza '%s'\n" " ?] " -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "Renunțare." -#: cmdline/apt-get.cc:1284 -msgid "Do you want to continue [Y/n]? " -msgstr "Vreți să continuați [Y/n]? " +#: cmdline/apt-get.cc:1313 +msgid "Do you want to continue?" +msgstr "Vreți să continuați?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Eșec la aducerea lui %s %s\n" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "Descărcarea unor fișiere a eșuat" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "Descărcare completă și în modul doar descărcare" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -665,19 +683,19 @@ msgstr "" "Nu s-au putut aduce unele arhive, poate ar fi o idee bună să rulați 'apt-get " "update' sau încercați cu --fix-missing?" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing și schimbul de mediu nu este deocamdată suportat" -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "Nu pot corecta pachetele lipsă." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "Abandonez instalarea." -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -688,36 +706,36 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Nu pot determina starea listei surse de pachete %s" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr "Comanda de actualizare nu are argumente" # XXX: orice sugestie este bine-venită -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 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:1817 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -736,15 +754,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 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:1824 +#: cmdline/apt-get.cc:1853 msgid "Internal Error, AutoRemover broke stuff" msgstr "Eroare internă, AutoRemover a deteriorat diverse chestiuni" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -758,7 +776,7 @@ msgstr[1] "" msgstr[2] "" "Următoarele pachete au fost instalate automat și nu mai sunt necesare:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -770,7 +788,7 @@ msgstr[1] "" msgstr[2] "" "Următoarele pachete au fost instalate automat și nu mai sunt necesare:" -#: cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1866 #, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." @@ -778,15 +796,15 @@ msgstr[0] "Folosiți 'apt-get autoremove' pentru a le șterge." msgstr[1] "Folosiți 'apt-get autoremove' pentru a le șterge." msgstr[2] "Folosiți 'apt-get autoremove' pentru a le șterge." -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1984 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:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -794,7 +812,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:1973 +#: cmdline/apt-get.cc:2002 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" @@ -807,86 +825,86 @@ msgstr "" "pachete\n" "cerute n-au fost create încă sau au fost mutate din Incoming." -#: cmdline/apt-get.cc:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "Pachete deteriorate" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "Următoarele extra pachete vor fi instalate:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "Pachete sugerate:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "Pachete recomandate:" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "Nu pot găsi pachetul %s" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "%s este marcat ca fiind instalat manual.\n" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "Calculez înnoirea... " -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "Eșec" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "Terminat" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 msgid "Internal error, problem resolver broke stuff" msgstr "" "Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni" -#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "Nu s-a putut bloca directorul de descărcare" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 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:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, 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:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, c-format msgid "" "Please use:\n" @@ -894,87 +912,87 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Sar peste fișierul deja descărcat '%s'\n" -#: cmdline/apt-get.cc:2604 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr "Nu aveți suficient spațiu în %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2644 #, 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" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2649 #, 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:2624 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "Aducere sursa %s\n" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "Eșec la aducerea unor arhive." -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, 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:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comanda de despachetare '%s' eșuată.\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, 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:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comanda de construire '%s' eșuată.\n" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "Procesul copil a eșuat" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 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:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, 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:2839 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr "%s nu are dependențe înglobate.\n" -#: cmdline/apt-get.cc:3009 +#: cmdline/apt-get.cc:3040 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -983,7 +1001,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:3027 +#: cmdline/apt-get.cc:3058 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -992,14 +1010,14 @@ msgstr "" "Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu " "poate fi găsit" -#: cmdline/apt-get.cc:3050 +#: cmdline/apt-get.cc:3081 #, 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:3089 +#: cmdline/apt-get.cc:3120 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1008,7 +1026,7 @@ 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:3095 +#: cmdline/apt-get.cc:3126 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1017,30 +1035,30 @@ msgstr "" "Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu " "poate fi găsit" -#: cmdline/apt-get.cc:3118 +#: cmdline/apt-get.cc:3149 #, 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:3133 +#: cmdline/apt-get.cc:3164 #, 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:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "Eșec la prelucrarea dependențelor de compilare" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Conectare la %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "Module suportate:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1129,7 +1147,7 @@ msgstr "" "pentru mai multe informații și opțiuni.\n" " Acest APT are puterile unei Super Vaci.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1200,8 +1218,8 @@ msgid "%s was already not hold.\n" msgstr "%s este deja la cea mai nouă versiune.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Așteptat %s, dar n-a fost acolo" @@ -1268,7 +1286,7 @@ msgstr "Nu se poate demonta CD-ul din %s, poate este încă utilizat." msgid "Disk not found." msgstr "Disc negăsit." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "Fișier negăsit" @@ -1331,7 +1349,7 @@ msgstr "Scriptul „%s” cu comenzile de conectare a eșuat, serverul a spus: % msgid "TYPE failed, server said: %s" msgstr "„TYPE” a eșuat, serverul a spus: %s" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "Timpul de conectare a expirat" @@ -1339,8 +1357,8 @@ msgstr "Timpul de conectare a expirat" msgid "Server closed the connection" msgstr "Serverul a închis conexiunea" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "Eroare de citire" @@ -1352,88 +1370,88 @@ msgstr "Un răspuns a depășit zona de tampon." msgid "Protocol corruption" msgstr "Protocol corupt" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "Eroare de scriere" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "Nu s-a putut crea un socket" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "" "Nu s-a putut realiza conectarea la socket-ul de date, timpul de conectare a " "expirat" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "Nu s-a putut realiza conectarea la un socket pasiv" -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "„getaddrinfo” n-a reușit să obțină un socket de ascultare" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "Nu s-a putut realiza asocierea la un socket" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "Nu s-a putut asculta pe socket" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "Nu s-a putut detecta numele socket-ului" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "Nu s-a putut trimite comanda PORT" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Familie de adrese necunoscută %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "„EPRT” a eșuat, serverul a spus: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "Timpul de conectare la socket-ul de date expirat" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "Nu s-a putut accepta conexiune" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "Problemă la calcularea dispersiei pentru fișierul" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Nu s-a putut aduce fișierul, serverul a spus „%s”" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "Timp expirat pentru socket-ul de date" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Transferul de date a eșuat, serverul a spus: '%s'" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "Interogare" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "Nu s-a putut invoca" @@ -1470,7 +1488,7 @@ msgstr "Nu s-a putut realiza conexiunea cu %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "Conectare la %s" @@ -1500,40 +1518,40 @@ 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:166 +#: methods/gpgv.cc:167 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:170 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Cel puțin o semnătură nevalidă a fost întâlnită." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:173 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Nu s-a putut executa „%s” pentru verificarea semnăturii (gpgv este instalat?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "Eroare necunoscută în timp ce se execută gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 msgid "The following signatures were invalid:\n" msgstr "Următoarele semnături nu au fost valide:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1573,60 +1591,60 @@ msgstr "Acest server HTTP are un suport defect de intervale" msgid "Unknown date format" msgstr "Format dată necunoscut" -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "Selecția a eșuat" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "Timp de conectare expirat" -#: methods/http.cc:855 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "Eroare la scrierea fișierului de rezultat" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "Eroare la scrierea în fișier" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "Eroare la scrierea în fișierul" -#: methods/http.cc:928 +#: methods/http.cc:927 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:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "Eroare la citirea de la server" -#: methods/http.cc:1198 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "Antet de date necorespunzător" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "Conectare eșuată" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "Eroare internă" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "Nu s-a putut citi %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1675,7 +1693,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "Eșec la crearea conexiunii IPC către subproces" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "Conexiune închisă prematur" @@ -1711,8 +1729,8 @@ msgstr "sau erori cauzate de dependențe lipsă. Fiind normal, doar erorile de" msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" -"deasupra acestui mesaj sunt importante. Corectați-le și reporniți [I]" -"nstalarea" +"deasupra acestui mesaj sunt importante. Corectați-le și reporniți " +"[I]nstalarea" #: dselect/update:30 msgid "Merging available information" @@ -2167,11 +2185,11 @@ msgstr "Antet de membru de arhivă necorespunzător" msgid "Invalid archive member header" msgstr "Antet de membru de arhivă necorespunzător" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "Arhiva este prea scurtă" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "Eșec la citirea antetelor arhivei" @@ -2502,7 +2520,7 @@ msgstr "Operațiune invalidă %s" msgid "Unable to stat the mount point %s" msgstr "Nu pot determina starea punctului de montare %s" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "Eșec la „stat” pentru CD" @@ -2521,101 +2539,101 @@ msgstr "Nu s-a folosit închiderea pentru fișierul disponibil doar-citire %s" msgid "Could not open lock file %s" msgstr "Nu pot deschide fișierul blocat %s" -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Nu este folosit blocajul pentru fișierul montat nfs %s" -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "Nu pot determina blocajul %s" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Subprocesul %s a primit o eroare de segmentare." -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Subprocesul %s a primit o eroare de segmentare." -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Subprocesul %s a întors un cod de eroare (%u)" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Subprocesul %s s-a terminat brusc" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "Nu s-a putut deschide fișierul %s" -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "Nu s-a putut deschide conexiunea pentru %s" -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "Eșec la crearea IPC-ului pentru subproces" -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "Eșec la executarea compresorului" -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "citire, încă mai am %lu de citit dar n-a mai rămas nimic" -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "scriere, încă mai am %lu de scris dar nu pot" -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Problemă la închiderea fișierului" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Problemă în timpul sincronizării fișierului" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Problemă la dezlegarea fișierului" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "Problemă în timpul sincronizării fișierului" @@ -2813,19 +2831,19 @@ msgstr "Linie greșită %u în lista sursă %s (tip)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Nu s-a putut deschide fișierul %s" -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2849,7 +2867,7 @@ msgid "" msgstr "" "Pachetul %s are nevoie să fie reinstalat, dar nu pot găsi o arhivă pentru el." -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2857,11 +2875,11 @@ msgstr "" "Eroare, pkgProblemResolver::Resolve a generat întreruperi, aceasta poate fi " "cauzată de pachete ținute." -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "Nu pot corecta problema, ați ținut pachete deteriorate." -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3040,42 +3058,42 @@ msgstr "redenumire eșuată, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "Nepotrivire MD5Sum" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 msgid "Hash Sum mismatch" msgstr "Nepotrivire la suma de căutare" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nu s-a putut analiza fișierul pachet %s (1)" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Nu există nici o cheie publică disponibilă pentru următoarele " "identificatoare de chei:\n" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3083,12 +3101,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3097,7 +3115,7 @@ msgstr "" "N-am putut localiza un fișier pentru pachetul %s. Aceasta ar putea însemna " "că aveți nevoie să reparați manual acest pachet (din pricina unui arch lipsă)" -#: apt-pkg/acquire-item.cc:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3106,7 +3124,7 @@ msgstr "" "N-am putut localiza un fișier pentru pachetul %s. Aceasta ar putea însemna " "că aveți nevoie să depanați manual acest pachet." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3114,7 +3132,7 @@ msgstr "" "Fișierele index de pachete sunt deteriorate. Fără câmpul 'nume fișier:' la " "pachetul %s." -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "Nepotrivire dimensiune" @@ -3237,22 +3255,22 @@ msgstr "Scriere noua listă sursă\n" msgid "Source list entries for this disc are:\n" msgstr "Intrările listei surselor pentru acest disc sunt:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "S-au scris %i înregistrări.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "S-au scris %i înregistrări cu %i fișiere lipsă.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "S-au scris %i înregistrări cu %i fișiere nepotrivite\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3340,12 +3358,12 @@ msgstr "" msgid "Installing %s" msgstr "Se instalează %s" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr "Se configurează %s" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr "Se șterge %s" @@ -3366,97 +3384,97 @@ msgid "Running post-installation trigger %s" msgstr "Se rulează declanșatorul post-instalare %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, c-format msgid "Directory '%s' missing" msgstr "Directorul „%s” lipsește." -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Nu s-a putut deschide fișierul %s" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr "Se pregătește %s" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr "Se despachetează %s" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "Se pregătește configurarea %s" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr "Instalat %s" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "Se pregătește ștergerea lui %s" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr "Șters %s" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "Se pregătește ștergerea completă a %s" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr "Șters complet %s" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Nu se poate scrie jurnalul, openpty() a eșuat (oare /dev/pts e montat?)\n" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/ru.po b/po/ru.po index fee0aaa8c..f0784896e 100644 --- a/po/ru.po +++ b/po/ru.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: apt rev2227.1.3\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2012-06-30 08:47+0400\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" @@ -99,77 +99,77 @@ msgstr "Пустого места в кэше: " msgid "Total space accounted for: " msgstr "Полное учтённое пространство: " -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "Список пакетов %s рассинхронизирован." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Не найдено ни одного пакета" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 msgid "You must give at least one search pattern" msgstr "Вы должны задать не менее одно шаблона поиска" -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "Эта команда устарела. Используйте вместо неё «apt-mark showauto»." -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Не удалось найти пакет %s" -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "Списки пакетов:" -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Кэш рассинхронизирован, невозможно обнаружить ссылку на список пакетов" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "Зафиксированные пакеты:" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(не найдено)" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr " Установлен: " -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr " Кандидат: " -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(отсутствует)" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr " Фиксатор пакета: " #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr " Таблица версий:" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s для %s скомпилирован %s %s\n" -#: cmdline/apt-cache.cc:1730 +#: cmdline/apt-cache.cc:1760 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -297,84 +297,102 @@ msgstr "" " -o=? Задать значение произвольной настройке, например, -o dir::cache=/" "tmp\n" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +msgid "[Y/n]" +msgstr "[Д/н]" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" msgstr "д" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" msgstr "н" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Ошибка компиляции регулярного выражения — %s" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "Пакеты, имеющие неудовлетворённые зависимости:" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "но %s уже установлен" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "но %s будет установлен" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "но он не может быть установлен" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "но это виртуальный пакет" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "но он не установлен" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "но он не будет установлен" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr " или" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "НОВЫЕ пакеты, которые будут установлены:" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "Пакеты, которые будут УДАЛЕНЫ:" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 msgid "The following packages have been kept back:" msgstr "Пакеты, которые будут оставлены в неизменном виде:" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "Пакеты, которые будут обновлены:" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "Пакеты, будут заменены на более СТАРЫЕ версии:" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "" "Пакеты, которые должны были бы остаться без изменений, но будут заменены:" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s (вследствие %s) " -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -382,59 +400,59 @@ msgstr "" "ВНИМАНИЕ: Эти существенно важные пакеты будут удалены.\n" "НЕ ДЕЛАЙТЕ этого, если вы НЕ представляете себе все возможные последствия!" -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "обновлено %lu, установлено %lu новых пакетов, " -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "переустановлено %lu переустановлено, " -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "%lu пакетов заменены на старые версии, " -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "для удаления отмечено %lu пакетов, и %lu пакетов не обновлено.\n" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "не установлено до конца или удалено %lu пакетов.\n" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "Заметьте, выбирается «%s» для задачи «%s»\n" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "Заметьте, выбирается «%s» для регулярного выражения «%s»\n" -#: cmdline/apt-get.cc:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Пакет %s — виртуальный, его функции предоставляются пакетами:\n" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr " [Установлен]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 msgid " [Not candidate version]" msgstr " [Нет версии-кандидата]" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "Вы должны явно указать, какой именно вы хотите установить." -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -445,159 +463,159 @@ msgstr "" "Это может означать, что пакет отсутствует, устарел, или доступен из " "источников, не упомянутых в sources.list\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "Однако следующие пакеты могут его заменить:" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, c-format msgid "Package '%s' has no installation candidate" msgstr "Для пакета «%s» не найден кандидат на установку" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "Виртуальные пакеты, подобные «%s», не могут быть удалены\n" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "" "Пакет «%s» не установлен, поэтому не может быть удалён. Возможно имелся в " "виду «%s»?\n" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "Пакет «%s» не установлен, поэтому не может быть удалён\n" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "Заметьте, вместо «%2$s» выбирается «%1$s»\n" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Пропускается %s — пакет уже установлен и нет команды upgrade.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "" "Пропускается %s — пакет не установлен, а запрошено только обновление.\n" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Переустановка %s невозможна, он не скачивается.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "Уже установлена самая новая версия %s.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s установлен вручную.\n" -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:913 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "Выбрана версия «%s» (%s) для «%s»\n" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "Выбрана версия «%s» (%s) для «%s» из-за «%s»\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "Исправление зависимостей…" -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr " не удалось." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "Невозможно скорректировать зависимости" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "Невозможно минимизировать набор обновлений" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr " Готово" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" "Возможно, для исправления этих ошибок вы захотите воспользоваться «apt-get -" "f install»." -#: cmdline/apt-get.cc:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "Неудовлетворённые зависимости. Попытайтесь использовать -f." -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ВНИМАНИЕ: Следующие пакеты невозможно аутентифицировать!" -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "Предупреждение об аутентификации не принято в внимание.\n" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " -msgstr "Установить эти пакеты без проверки [y/N]? " +#: cmdline/apt-get.cc:1108 +msgid "Install these packages without verification?" +msgstr "Установить эти пакеты без проверки?" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" msgstr "Некоторые пакеты невозможно аутентифицировать" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "Существуют проблемы, а параметр -y указан без --force-yes" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "Внутренняя ошибка, InstallPackages была вызвана с неработоспособными " "пакетами!" -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 msgid "Packages need to be removed but remove is disabled." msgstr "Пакеты необходимо удалить, но удаление запрещено." -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 msgid "Internal error, Ordering didn't finish" msgstr "Внутренняя ошибка, Ordering не завершилась" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "Странно. Несовпадение размеров, напишите на apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Необходимо скачать %sB/%sB архивов.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Необходимо скачать %sБ архивов.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" @@ -606,25 +624,25 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "" "После данной операции, объём занятого дискового пространства уменьшится на " "%sB.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Couldn't determine free space in %s" msgstr "Не удалось определить количество свободного места в %s" -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, c-format msgid "You don't have enough free space in %s." msgstr "Недостаточно свободного места в %s." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "Запрошено выполнение только тривиальных операций, но это не тривиальная " @@ -632,11 +650,11 @@ msgstr "" #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "Да, делать, как я скажу!" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -647,28 +665,28 @@ msgstr "" "Чтобы продолжить, введите фразу: «%s»\n" " ?] " -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "Аварийное завершение." -#: cmdline/apt-get.cc:1284 -msgid "Do you want to continue [Y/n]? " -msgstr "Хотите продолжить [Д/н]? " +#: cmdline/apt-get.cc:1313 +msgid "Do you want to continue?" +msgstr "Хотите продолжить?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Не удалось получить %s %s\n" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "Некоторые файлы скачать не удалось" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "Указан режим «только скачивание», и скачивание завершено" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -676,19 +694,19 @@ msgstr "" "Невозможно получить некоторые архивы, вероятно надо запустить apt-get update " "или попытаться повторить запуск с ключом --fix-missing" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing и смена носителя в данный момент не поддерживаются" -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "Невозможно исправить ситуацию с пропущенными пакетами." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "Аварийное завершение установки." -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -705,35 +723,35 @@ msgstr[2] "" "Следующие пакеты исчез из системы, так как все их файлы\n" "теперь берутся из других пакетов:" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Замечание: это сделано автоматически и специально программой dpkg." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Игнорируется недоступный выпуск «%s» пакета «%s»" -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Используется «%s» в качестве исходного пакета вместо «%s»\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Игнорируется недоступная версия «%s» пакета «%s»" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr "Команде update не нужны аргументы" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Не предполагалось удалять stuff, невозможно запустить AutoRemover" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -751,15 +769,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 msgid "The following information may help to resolve the situation:" msgstr "Следующая информация, возможно, поможет вам:" -#: cmdline/apt-get.cc:1824 +#: cmdline/apt-get.cc:1853 msgid "Internal Error, AutoRemover broke stuff" msgstr "Внутренняя ошибка, AutoRemover всё поломал" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -771,7 +789,7 @@ msgstr[1] "" msgstr[2] "" "Следующие пакеты устанавливались автоматически и больше не требуются:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -780,24 +798,24 @@ msgstr[0] "%lu пакет был установлен автоматически msgstr[1] "%lu пакета было установлено автоматически и больше не требуется.\n" msgstr[2] "%lu пакетов было установлены автоматически и больше не требуются.\n" -#: cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1866 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Для его удаления используйте «apt-get autoremove»." msgstr[1] "Для их удаления используйте «apt-get autoremove»." msgstr[2] "Для их удаления используйте «apt-get autoremove»." -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "Внутренняя ошибка, AllUpgrade всё поломал" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1984 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "Возможно, для исправления этих ошибок вы захотите воспользоваться «apt-get -" "f install»:" -#: cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -805,7 +823,7 @@ msgstr "" "Неудовлетворённые зависимости. Попытайтесь выполнить «apt-get -f install», " "не указывая имени пакета, (или найдите другое решение)." -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:2002 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" @@ -816,33 +834,33 @@ msgstr "" "или же используете нестабильную версию дистрибутива, где запрошенные вами\n" "пакеты ещё не созданы или были удалены из Incoming." -#: cmdline/apt-get.cc:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "Сломанные пакеты" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "Будут установлены следующие дополнительные пакеты:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "Предлагаемые пакеты:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "Рекомендуемые пакеты:" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "Не удалось найти пакет %s" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s выбран для автоматической установки.\n" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -850,47 +868,47 @@ msgstr "" "Эта команда устарела. Используйте вместо неё «apt-mark auto» и «apt-mark " "manual»." -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "Расчёт обновлений…" -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "Неудачно" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "Готово" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 msgid "Internal error, problem resolver broke stuff" msgstr "Внутренняя ошибка, решатель проблем всё поломал" -#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "Невозможно заблокировать каталог, куда складываются скачиваемые файлы" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Невозможно найти источник для загрузки «%2$s» версии «%1$s»" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "Выполняется загрузка %s %s" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 msgid "Must specify at least one package to fetch source for" msgstr "" "Укажите как минимум один пакет, исходный код которого необходимо получить" -#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, c-format msgid "Unable to find a source package for %s" msgstr "Невозможно найти пакет с исходным кодом для %s" -#: cmdline/apt-get.cc:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -899,7 +917,7 @@ msgstr "" "ВНИМАНИЕ: упаковка «%s» поддерживается в системе контроля версий «%s»:\n" "%s\n" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, c-format msgid "" "Please use:\n" @@ -910,70 +928,70 @@ msgstr "" "bzr branch %s\n" "для получения последних (возможно не выпущенных) обновлений пакета.\n" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускаем уже скачанный файл «%s»\n" -#: cmdline/apt-get.cc:2604 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr "Недостаточно места в %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2644 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необходимо получить %sб/%sб архивов исходного кода.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2649 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Необходимо получить %sб архивов исходного кода.\n" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "Получение исходного кода %s\n" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "Некоторые архивы не удалось получить." -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Пропускается распаковка уже распакованного исходного кода в %s\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Команда распаковки «%s» завершилась неудачно.\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Проверьте, установлен ли пакет «dpkg-dev».\n" -#: cmdline/apt-get.cc:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "Команда сборки «%s» завершилась неудачно.\n" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "Порождённый процесс завершился неудачно" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 msgid "Must specify at least one package to check builddeps for" msgstr "" "Для проверки зависимостей для сборки необходимо указать как минимум один " "пакет" -#: cmdline/apt-get.cc:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -982,17 +1000,17 @@ msgstr "" "У %s отсутствует информация об архитектуре. Для её настройки смотрите apt." "conf(5) APT::Architectures" -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Невозможно получить информацию о зависимостях для сборки %s" -#: cmdline/apt-get.cc:2839 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr "%s не имеет зависимостей для сборки.\n" -#: cmdline/apt-get.cc:3009 +#: cmdline/apt-get.cc:3040 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -1001,7 +1019,7 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как %s не " "разрешён для пакетов «%s»" -#: cmdline/apt-get.cc:3027 +#: cmdline/apt-get.cc:3058 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1010,14 +1028,14 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не " "найден" -#: cmdline/apt-get.cc:3050 +#: cmdline/apt-get.cc:3081 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный " "пакет %s новее, чем надо" -#: cmdline/apt-get.cc:3089 +#: cmdline/apt-get.cc:3120 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1026,7 +1044,7 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как версия-" "кандидат пакета %s не может удовлетворить требованиям по версии" -#: cmdline/apt-get.cc:3095 +#: cmdline/apt-get.cc:3126 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1035,30 +1053,30 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не " "имеет версии-кандидата" -#: cmdline/apt-get.cc:3118 +#: cmdline/apt-get.cc:3149 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3164 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Зависимости для сборки %s не могут быть удовлетворены." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "Обработка зависимостей для сборки завершилась неудачно" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, c-format msgid "Changelog for %s (%s)" msgstr "Changelog для %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "Поддерживаемые модули:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1150,7 +1168,7 @@ msgstr "" "содержится подробная информация и описание параметров.\n" " В APT есть коровья СУПЕРСИЛА.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1225,8 +1243,8 @@ msgid "%s was already not hold.\n" msgstr "%s уже помечен как не зафиксированный.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Ожидалось завершение процесса %s, но он не был запущен" @@ -1315,7 +1333,7 @@ msgstr "Невозможно размонтировать CD-ROM в %s, возм msgid "Disk not found." msgstr "Диск не найден." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "Файл не найден" @@ -1380,7 +1398,7 @@ msgstr "" msgid "TYPE failed, server said: %s" msgstr "Команда TYPE не выполнена, сервер сообщил: %s" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "Допустимое время ожидания для соединения истекло" @@ -1388,8 +1406,8 @@ msgstr "Допустимое время ожидания для соединен msgid "Server closed the connection" msgstr "Сервер прервал соединение" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "Ошибка чтения" @@ -1401,88 +1419,88 @@ msgstr "Ответ переполнил буфер." msgid "Protocol corruption" msgstr "Искажение протокола" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "Ошибка записи" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "Не удалось создать сокет" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "" "Не удалось присоединиться к сокету данных, время на установление соединения " "истекло" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "Невозможно присоединить пассивный сокет" -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "Вызов getaddrinfo не смог получить сокет" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "Невозможно присоединиться к сокету" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "Не удалось принимать соединения на сокете" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "Не удалось определить имя сокета" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "Невозможно послать команду PORT" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Неизвестное семейство адресов %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "Команда EPRT не выполнена, сервер сообщил: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "Время установления соединения для сокета данных истекло" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "Невозможно принять соединение" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "Проблема при хешировании файла" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Невозможно получить файл, сервер сообщил: «%s»" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "Время ожидания соединения для сокета данных истекло" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Передача данных завершилась неудачно, сервер сообщил: «%s»" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "Запрос" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "Невозможно вызвать " @@ -1518,7 +1536,7 @@ msgstr "Не удаётся соединиться с %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "Соединение с %s" @@ -1548,38 +1566,38 @@ msgstr "Что-то странное произошло при определе msgid "Unable to connect to %s:%s:" msgstr "Невозможно соединиться с %s: %s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:167 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Внутренняя ошибка: Правильная подпись, но не удалось определить отпечаток " "ключа?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Найдена как минимум одна неправильная подпись." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:173 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Не удалось выполнить «gpgv» для проверки подписи (gpgv установлена?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "Неизвестная ошибка при выполнении gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 msgid "The following signatures were invalid:\n" msgstr "Следующие подписи неверные:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1619,59 +1637,59 @@ msgstr "Этот HTTP-сервер не поддерживает скачива msgid "Unknown date format" msgstr "Неизвестный формат данных" -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "Ошибка в select" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "Время ожидания для соединения истекло" -#: methods/http.cc:855 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "Ошибка записи в выходной файл" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "Ошибка записи в файл" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "Ошибка записи в файл" -#: methods/http.cc:928 +#: methods/http.cc:927 msgid "Error reading from server. Remote end closed connection" msgstr "Ошибка чтения, удалённый сервер прервал соединение" -#: methods/http.cc:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "Ошибка чтения с сервера" -#: methods/http.cc:1198 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "Неверный заголовок данных" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "Соединение разорвано" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "Внутренняя ошибка" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "Невозможно прочитать %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1724,7 +1742,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "Не удалось создать IPC-канал для порождённого процесса" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "Соединение закрыто преждевременно" @@ -2211,11 +2229,11 @@ msgstr "Неправильный заголовок элемента архив msgid "Invalid archive member header" msgstr "Неправильный заголовок элемента архива" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "Слишком короткий архив" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "Не удалось прочитать заголовки архива" @@ -2547,7 +2565,7 @@ msgstr "Неверная операция %s" msgid "Unable to stat the mount point %s" msgstr "Невозможно прочитать атрибуты точки монтирования %s" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "Невозможно получить атрибуты cdrom" @@ -2568,34 +2586,34 @@ msgstr "" msgid "Could not open lock file %s" msgstr "Не удалось открыть файл блокировки %s" -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Блокировка не используется, так как файл блокировки %s находится на файловой " "системе nfs" -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "Не удалось получить доступ к файлу блокировки %s" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "Список файлов не может быть создан, так как «%s» не является каталогом" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "Файл «%s» в каталоге «%s» игнорируется, так как это необычный файл" -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "Файл «%s» в каталоге «%s» игнорируется, так как он не имеет расширения" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" @@ -2603,72 +2621,72 @@ msgstr "" "Файл «%s» в каталоге «%s» игнорируется, так как он не имеет неправильное " "расширение" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" "Нарушение защиты памяти (segmentation fault) в порождённом процессе %s." -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, c-format msgid "Sub-process %s received signal %u." msgstr "Порождённый процесс %s получил сигнал %u." -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Порождённый процесс %s вернул код ошибки (%u)" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Порождённый процесс %s неожиданно завершился" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "Не удалось открыть файл %s" -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, c-format msgid "Could not open file descriptor %d" msgstr "Не удалось открыть файловый дескриптор %d" -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "Не удалось создать IPC с порождённым процессом" -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "Не удалось выполнить компрессор " -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, c-format msgid "read, still have %llu to read but none left" msgstr "" "ошибка при чтении; собирались прочесть ещё %llu байт, но ничего больше нет" -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "ошибка при записи; собирались записать ещё %llu байт, но не смогли" -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, c-format msgid "Problem closing the file %s" msgstr "Проблема закрытия файла %s" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Проблема при переименовании файла %s в %s" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, c-format msgid "Problem unlinking the file %s" msgstr "Проблема при удалении файла %s" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "Проблема при синхронизации файла" @@ -2869,7 +2887,7 @@ msgstr "Искажённая строка %u в списке источнико msgid "Type '%s' is not known on line %u in source list %s" msgstr "Неизвестный тип «%s» в строке %u в списке источников %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2878,12 +2896,12 @@ msgstr "" "Не удалось выполнить оперативную настройку «%s». Подробней, смотрите в man 5 " "apt.conf о APT::Immediate-Configure. (%d)" -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, c-format msgid "Could not configure '%s'. " msgstr "Не удалось настроить «%s»." -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2908,7 +2926,7 @@ msgid "" msgstr "" "Пакет %s нуждается в переустановке, но найти архив для него не удалось." -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2916,11 +2934,11 @@ msgstr "" "Ошибка, pkgProblemResolver::Resolve сгенерировал повреждённые пакеты. Это " "может быть вызвано отложенными (held) пакетами." -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "Невозможно исправить ошибки, у вас отложены (held) битые пакеты." -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3096,12 +3114,12 @@ msgstr "переименовать не удалось, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "MD5Sum не совпадает" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 msgid "Hash Sum mismatch" msgstr "Хеш сумма не совпадает" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3110,16 +3128,16 @@ msgstr "" "Невозможно найти ожидаемый элемент «%s» в файле Release (некорректная запись " "в sources.list или файл)" -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Невозможно найти хеш-сумму «%s» в файле Release" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "Недоступен открытый ключ для следующих ID ключей:\n" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3128,12 +3146,12 @@ msgstr "" "Файл Release для %s просрочен (недостоверный начиная с %s). Обновление этого " "репозитория производиться не будет." -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Конфликт распространения: %s (ожидался %s, но получен %s)" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3143,12 +3161,12 @@ msgstr "" "использованы предыдущие индексные файлы. Ошибка GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "Ошибка GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3157,7 +3175,7 @@ msgstr "" "Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся " "вручную исправить этот пакет (возможно, пропущен arch)" -#: apt-pkg/acquire-item.cc:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3166,13 +3184,13 @@ msgstr "" "Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся " "вручную исправить этот пакет." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Некорректный перечень пакетов. Нет поля Filename: для пакета %s." -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "Не совпадает размер" @@ -3296,22 +3314,22 @@ msgstr "Запись нового списка источников\n" msgid "Source list entries for this disc are:\n" msgstr "Записи в списке источников для этого диска:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "Сохранено %i записей.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Сохранено %i записей с %i отсутствующими файлами.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Сохранено %i записей с %i несовпадающими файлами\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3409,12 +3427,12 @@ msgstr "Запустить внешний решатель" msgid "Installing %s" msgstr "Устанавливается %s" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr "Настраивается %s" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr "Удаляется %s" @@ -3435,80 +3453,80 @@ msgid "Running post-installation trigger %s" msgstr "Выполняется послеустановочный триггер %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, c-format msgid "Directory '%s' missing" msgstr "Отсутствует каталог «%s»" -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, c-format msgid "Could not open file '%s'" msgstr "Не удалось открыть файл «%s»" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr "Подготавливается %s" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr "Распаковывается %s" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "Подготавливается для настройки %s" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr "Установлен %s" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "Подготавливается для удаления %s" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr "Удалён %s" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "Подготовка к полному удалению %s" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr "%s полностью удалён" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Не удалось записать в журнал, неудачное выполнение openpty() (/dev/pts не " "смонтирован?)\n" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "Запускается dpkg" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "Действие прервано до его завершения" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "Отчёты apport не записаны, так достигнут MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "проблемы с зависимостями — оставляем ненастроенным" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3516,7 +3534,7 @@ msgstr "" "Отчёты apport не записаны, так как сообщение об ошибке указывает на " "повторную ошибку от предыдущего отказа." -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3524,7 +3542,7 @@ msgstr "" "Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке " "места на диске" -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3532,7 +3550,7 @@ msgstr "" "Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке " "памяти" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/sk.po b/po/sk.po index 901db71f9..d708bd39f 100644 --- a/po/sk.po +++ b/po/sk.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2012-06-28 20:49+0100\n" "Last-Translator: Ivan Masár \n" "Language-Team: Slovak \n" @@ -93,79 +93,79 @@ msgstr "Celkom jalového miesta: " msgid "Total space accounted for: " msgstr "Celkom priradeného miesta: " -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "Súbor balíkov %s je neaktuálny." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Neboli nájdené žiadne balíky" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 msgid "You must give at least one search pattern" msgstr "Musíte zadať aspoň jeden vyhľadávací vzor" -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" "Tento príkaz je zavrhovaný. Prosím, použite namiesto neho „apt-mark " "showauto“." -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Nedá sa nájsť balík %s" -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "Súbory balíka:" -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Vyrovnávacia pamäť je neaktuálna, nedá sa odvolať na súbor balíka" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "Pripevnené balíky:" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(nenájdené)" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr " Nainštalovaná verzia: " -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr " Kandidát: " -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(žiadna)" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr " Pripevnený balík:" #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr " Tabuľka verzií:" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s pre %s skompilovaný %s %s\n" -#: cmdline/apt-cache.cc:1730 +#: cmdline/apt-cache.cc:1760 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -293,83 +293,101 @@ msgstr "" " -c=? Načíta tento konfiguračný súbor\n" " -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +msgid "[Y/n]" +msgstr "" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" -msgstr "Y" +msgstr "" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" -msgstr "N" +msgstr "" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba pri preklade regulárneho výrazu - %s" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "Nasledovné balíky majú nesplnené závislosti:" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "ale nainštalovaný je %s" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "ale inštalovať sa bude %s" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "ale sa nedá nainštalovať" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "ale je to virtuálny balík" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "ale nie je nainštalovaný" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "ale sa nebude inštalovať" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr " alebo" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "Nainštalujú sa nasledovné NOVÉ balíky:" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "Nasledovné balíky sa ODSTRÁNIA:" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 msgid "The following packages have been kept back:" msgstr "Nasledovné balíky sa ponechajú v súčasnej verzii:" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "Nasledovné balíky sa aktualizujú:" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "Nasledovné balíky sa DEGRADUJÚ:" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "Nasledovné pridržané balíky sa zmenia:" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s (kvôli %s) " -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -377,59 +395,59 @@ msgstr "" "UPOZORNENIE: Nasledovné dôležité balíky sa odstránia.\n" "Ak presne neviete, čo robíte, tak to NEROBTE!" -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualizovaných, %lu nových nainštalovaných, " -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinštalovaných, " -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "%lu degradovaných, " -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu na odstránenie a %lu neaktualizovaných.\n" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu iba čiastočne nainštalovaných alebo odstránených.\n" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "Poznámka: vyberá sa „%s“ pre úlohu „%s“\n" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, 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:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Balík %s je virtuálny balík poskytovaný balíkmi:\n" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr " [Nainštalovaný]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 msgid " [Not candidate version]" msgstr " [Nie je kandidátska verzia]" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "Mali by ste explicitne vybrať jeden na inštaláciu." -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -439,135 +457,135 @@ msgstr "" "Balík %s nie je dostupný, ale odkazuje naň iný balík. Možno to znamená,\n" "že balík chýba, bol zrušený alebo je dostupný iba z iného zdroja\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "Avšak nahrádzajú ho nasledovné balíky:" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, c-format msgid "Package '%s' has no installation candidate" msgstr "Balík „%s“ nemá kandidáta na inštaláciu" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "Virtuálne balíky ako „%s“ nemožno odstrániť\n" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "" "Balík „%s“ nie je nainštalovaný, nedá sa teda odstrániť. Mali ste na mysli " "„%s“?\n" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "Balík „%s“ nie je nainštalovaný, nedá sa teda odstrániť\n" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "Poznámka: „%s“ sa vyberá namiesto „%s“\n" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Preskakuje sa %s, pretože je už nainštalovaný.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "" "Preskakuje sa %s, nie je nainštalovaný a bola vy6iadan8 iba aktualizácia.\n" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Nie je možná reinštalácia %s, pretože sa nedá stiahnuť.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "%s je už najnovšej verzie.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s je označený ako manuálne nainštalovaný.\n" -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:913 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "Vybraná verzia „%s“ (%s) pre „%s“\n" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "Vybraná verzia „%s“ (%s) pre „%s“ kvôli „%s“\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "Opravujú sa závislosti..." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr " zlyhalo." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "Závislosti sa nedajú opraviť" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "Sada na aktualizáciu sa nedá minimalizovať" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr " Hotovo" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Možno to budete chcieť napraviť spustením „apt-get -f install“." -#: cmdline/apt-get.cc:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "Nesplnené závislosti. Skúste použiť -f." -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 msgid "WARNING: The following packages cannot be authenticated!" msgstr "UPOZORNENIE: Pri nasledovných balíkoch sa nedá overiť vierohodnosť!" -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "Upozornenie o vierohodnosti bolo potlačené.\n" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " -msgstr "Nainštalovať tieto nekontrolované balíky [y/N]? " +#: cmdline/apt-get.cc:1108 +msgid "Install these packages without verification?" +msgstr "Nainštalovať tieto nekontrolované balíky?" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" msgstr "Nedala sa zistiť vierohodnosť niektorých balíkov" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "Nastali problémy a -y bolo použité bez --force-yes" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Vnútorná chyba, InstallPackages bolo volané s poškodenými balíkmi!" -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 msgid "Packages need to be removed but remove is disabled." msgstr "Je potrebné odstránenie balíka, ale funkcia Odstrániť je vypnutá." -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 msgid "Internal error, Ordering didn't finish" msgstr "Vnútorná chyba, Triedenie sa neukončilo" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Nezvyčajná udalosť... Veľkosti nesúhlasia, pošlite e-mail na apt@packages." @@ -575,54 +593,54 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Je potrebné stiahnuť %sB/%sB archívov.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Je potrebné stiahnuť %sB archívov.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Po tejto operácii sa na disku použije ďalších %sB.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, c-format 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:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Couldn't determine free space in %s" msgstr "Na %s sa nedá zistiť veľkosť voľného miesta" -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, 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:1257 cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Zadané „iba triviálne“, ale toto nie je triviálna operácia." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "Áno, urob to, čo vravím!" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -633,28 +651,28 @@ msgstr "" "Ak chcete pokračovať, opíšte frázu „%s“\n" " ?]" -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "Prerušené." -#: cmdline/apt-get.cc:1284 -msgid "Do you want to continue [Y/n]? " -msgstr "Chcete pokračovať [Y/n]? " +#: cmdline/apt-get.cc:1313 +msgid "Do you want to continue?" +msgstr "Chcete pokračovať?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Zlyhalo stiahnutie %s %s\n" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "Niektoré súbory sa nedajú stiahnuť" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "Sťahovanie ukončené v režime „iba stiahnuť“" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -662,19 +680,19 @@ msgstr "" "Niektoré archívy sa nedajú stiahnuť. Skúste spustiť apt-get update alebo --" "fix-missing" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing a výmena nosiča nie sú momentálne podporované" -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "Chýbajúce balíky sa nedajú opraviť." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "Inštalácia sa prerušuje." -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -691,35 +709,35 @@ msgstr[2] "" "Nasledovné balíky zmizli z vášho systému, pretože\n" "všetky súbory boli prepísané inými balíkmi:" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Pozn.: Toto robí dpkg automaticky a zámerne." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Ignorovať nedostupné cieľové vydanie „%s“ balíka „%s“" -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Vyberá sa „%s“ ako zdrojový balík namiesto „%s“\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Ignorovať nedostupnú verziu „%s“ balíka „%s“" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr "Príkaz update neprijíma žiadne argumenty" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 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:1817 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -737,15 +755,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 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:1824 +#: cmdline/apt-get.cc:1853 msgid "Internal Error, AutoRemover broke stuff" msgstr "Vnútorná chyba, AutoRemover niečo pokazil" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -758,7 +776,7 @@ msgstr[1] "" msgstr[2] "" "Nasledovné balíky boli nainštalované automaticky a už viac nie sú potrebné:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -770,22 +788,22 @@ msgstr[1] "" msgstr[2] "" "%lu balíkov bolo nainštalovaných automaticky a už viac nie sú potrebné.\n" -#: cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1866 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Na jeho odstránenie použite „apt-get autoremove“." msgstr[1] "Na ich odstránenie použite „apt-get autoremove“." msgstr[2] "Na ich odstránenie použite „apt-get autoremove“." -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "Vnútorná chyba, AllUpgrade pokazil veci" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1984 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Možno to budete chcieť napraviť spustením „apt-get -f install“:" -#: cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -793,7 +811,7 @@ msgstr "" "Nesplnené závislosti. Skúste spustiť „apt-get -f install“ bez balíkov (alebo " "navrhnite riešenie)." -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:2002 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" @@ -805,33 +823,33 @@ msgstr "" "požadované balíky ešte neboli vytvorené alebo presunuté z fronty\n" "Novoprichádzajúcich (Incoming) balíkov." -#: cmdline/apt-get.cc:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "Poškodené balíky" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "Nainštalujú sa nasledovné extra balíky:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "Navrhované balíky:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "Odporúčané balíky:" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "Balík %s sa nedá nájsť" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s je označený ako automaticky nainštalovaný.\n" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -839,46 +857,46 @@ msgstr "" "Tento príkaz je zavrhovaný. Prosím, použite namiesto neho „apt-mark auto“ a " "„apt-mark manual“." -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "Prepočítava sa aktualizácia... " -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "Chyba" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "Hotovo" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 msgid "Internal error, problem resolver broke stuff" msgstr "Vnútorná chyba, „problem resolver“ niečo pokazil" -#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "Adresár pre sťahovanie sa nedá zamknúť" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Nie je možné nájsť zdroj na stiahnutie verzie „%s“ balíka „%s“" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "Sťahuje sa %s %s" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 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:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, 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:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -888,7 +906,7 @@ msgstr "" "adrese:\n" "%s\n" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, c-format msgid "" "Please use:\n" @@ -900,70 +918,70 @@ msgstr "" "ak chcete získať najnovšie (a pravdepodobne zatiaľ nevydané) aktualizácie " "balíka.\n" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Preskakuje sa už stiahnutý súbor „%s“\n" -#: cmdline/apt-get.cc:2604 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr "Na %s nemáte dostatok voľného miesta" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2644 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Je potrebné stiahnuť %sB/%sB zdrojových archívov.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2649 #, 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:2624 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "Stiahnuť zdroj %s\n" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "Zlyhalo stiahnutie niektorých archívov." -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, 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:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Príkaz na rozbalenie „%s“ zlyhal.\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, 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:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "Príkaz na zostavenie „%s“ zlyhal.\n" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "Proces potomka zlyhal" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 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:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -972,17 +990,17 @@ msgstr "" "Informácie o architektúre nie sú dostupné pre %s. Informácie o nastavení " "nájdete v apt.conf(5) APT::Architectures" -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, 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:2839 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žiadne závislosti na zostavenie.\n" -#: cmdline/apt-get.cc:3009 +#: cmdline/apt-get.cc:3040 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -991,20 +1009,20 @@ msgstr "" "%s závislosť pre %s nemožno splniť, pretože %s nie je povolené na balíkoch " "„%s“" -#: cmdline/apt-get.cc:3027 +#: cmdline/apt-get.cc:3058 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s závislosť pre %s nemožno splniť, pretože sa nedá nájsť balík %s" -#: cmdline/apt-get.cc:3050 +#: cmdline/apt-get.cc:3081 #, 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:3089 +#: cmdline/apt-get.cc:3120 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1013,7 +1031,7 @@ msgstr "" "%s závislosť pre %s nemožno splniť, pretože kandidátska verzia balíka %s, " "nedokáže splniť požiadavky na verziu" -#: cmdline/apt-get.cc:3095 +#: cmdline/apt-get.cc:3126 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1021,30 +1039,30 @@ msgid "" msgstr "" "%s závislosť pre %s nemožno splniť, pretože balík %s nemá kandidátsku verziu" -#: cmdline/apt-get.cc:3118 +#: cmdline/apt-get.cc:3149 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Zlyhalo splnenie %s závislosti pre %s: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3164 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Závislosti na zostavenie %s nemožno splniť." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "Spracovanie závislostí na zostavenie zlyhalo" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, c-format msgid "Changelog for %s (%s)" msgstr "Záznam zmien %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "Podporované moduly:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1132,7 +1150,7 @@ msgstr "" "a apt.conf(5).\n" " Tento APT má schopnosti posvätnej kravy.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1207,8 +1225,8 @@ msgid "%s was already not hold.\n" msgstr "%s bol už nastavený na nepodržanie.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Čakalo sa na %s, ale nebolo to tam" @@ -1294,7 +1312,7 @@ msgstr "Nedá sa odpojiť CD-ROM v %s - možno sa ešte používa." msgid "Disk not found." msgstr "Disk sa nenašiel." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "Súbor sa nenašiel" @@ -1357,7 +1375,7 @@ msgstr "Príkaz „%s“ prihlasovacieho skriptu zlyhal, server odpovedal: %s" msgid "TYPE failed, server said: %s" msgstr "Zlyhalo zadanie typu, server odpovedal: %s" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "Uplynul čas spojenia" @@ -1365,8 +1383,8 @@ msgstr "Uplynul čas spojenia" msgid "Server closed the connection" msgstr "Server ukončil spojenie" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "Chyba pri čítaní" @@ -1378,86 +1396,86 @@ msgstr "Odpoveď preplnila zásobník." msgid "Protocol corruption" msgstr "Narušenie protokolu" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "Chyba pri zápise" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "Nedá sa vytvoriť socket" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "Nedá sa pripojiť dátový socket, uplynul čas spojenia" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "Nedá sa pripojiť pasívny socket." -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo nezískal počúvajúci socket" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "Nedá sa nadviazať socket" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "Na sockete sa nedá počúvať" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "Názov socketu sa nedá zistiť" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "Príkaz PORT sa nedá odoslať" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Neznáma rodina adries %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "Zlyhalo zadanie EPRT, server odpovedal: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "Uplynulo spojenie dátového socketu" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "Spojenie sa nedá prijať" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "Problém s hašovaním súboru" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Súbor sa nedá stiahnuť, server odpovedal „%s“" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "Uplynula doba dátového socketu" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Prenos dát zlyhal, server odpovedal „%s“" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "Dotaz" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "Nedá sa vyvolať " @@ -1493,7 +1511,7 @@ msgstr "Nedá sa pripojiť k %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "Pripája sa k %s" @@ -1523,36 +1541,36 @@ msgstr "Niečo veľmi zlé sa prihodilo pri preklade „%s:%s“ (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Nedá sa pripojiť k %s:%s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:167 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:170 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Bola zistená aspoň jedna nesprávna signatúra." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:173 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Nedá sa spustiť „gpgv“ kvôli overeniu podpisu (je nainštalované gpgv?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "Neznáma chyba pri spustení gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 msgid "The following signatures were invalid:\n" msgstr "Nasledovné signatúry sú neplatné:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1592,59 +1610,59 @@ msgstr "Tento HTTP server má poškodenú podporu rozsahov" msgid "Unknown date format" msgstr "Neznámy formát dátumu" -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "Výber zlyhal" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "Uplynul čas spojenia" -#: methods/http.cc:855 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "Chyba zápisu do výstupného súboru" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "Chyba zápisu do súboru" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "Chyba zápisu do tohto súboru" -#: methods/http.cc:928 +#: methods/http.cc:927 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba pri čítaní zo servera. Druhá strana ukončila spojenie" -#: methods/http.cc:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "Chyba pri čítaní zo servera" -#: methods/http.cc:1198 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "Zlé dátové záhlavie" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "Spojenie zlyhalo" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "Vnútorná chyba" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "Nedá sa načítať %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1697,7 +1715,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "Zlyhalo vytvorenie IPC rúry k podprocesu" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "Spojenie bolo predčasne ukončené" @@ -2174,11 +2192,11 @@ msgstr "Neplatná hlavička prvku archívu %s" msgid "Invalid archive member header" msgstr "Neplatné záhlavie prvku archívu" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "Archív je príliš krátky" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "Chyba pri čítaní hlavičiek archívu" @@ -2507,7 +2525,7 @@ msgstr "Neplatná operácia %s" msgid "Unable to stat the mount point %s" msgstr "Prípojný bod %s sa nedá vyhodnotiť" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "Nedá sa vykonať stat() CD-ROM" @@ -2526,102 +2544,102 @@ msgstr "Zamykanie pre súbor zámku %s, ktorý je iba na čítanie, sa nepouží msgid "Could not open lock file %s" msgstr "Súbor zámku %s sa nedá otvoriť" -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, 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" -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "Zámok %s sa nedá získať" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "Zoznam súborov nemožno vytvoriť, pretože „%s“ nie je adresár" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "Ignoruje sa „%s“ v adresári „%s“, pretože to nie je obyčajný súbor" -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "Ignoruje sa „%s“ v adresári „%s“, pretože nemá príponu názvu súboru" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" "Ignoruje sa „%s“ v adresári „%s“, pretože má neplatnú príponu názvu súboru" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Podproces %s obdržal chybu segmentácie." -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, c-format msgid "Sub-process %s received signal %u." msgstr "Podproces %s dostal signál %u." -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Podproces %s vrátil chybový kód (%u)" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Podproces %s neočakávane skončil" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "Nedá sa otvoriť súbor %s" -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, c-format msgid "Could not open file descriptor %d" msgstr "Nedá sa otvoriť popisovač súboru %d" -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "Nedá sa vytvoriť podproces IPC" -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "Nepodarilo sa spustiť kompresor " -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, c-format msgid "read, still have %llu to read but none left" msgstr "čítanie, treba prečítať ešte %llu, ale už nič neostáva" -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "zápis, treba zapísať ešte %llu, no nedá sa to" -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, c-format msgid "Problem closing the file %s" msgstr "Problém pri zatváraní súboru %s" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problém pri synchronizovaní súboru %s na %s" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, c-format msgid "Problem unlinking the file %s" msgstr "Problém pri odstraňovaní súboru %s" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "Problém pri synchronizovaní súboru" @@ -2819,7 +2837,7 @@ msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ „%s“ je neznámy na riadku %u v zozname zdrojov %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2828,12 +2846,12 @@ msgstr "" "Nebolo možné vykonať okamžitú konfiguráciu „%s“. Pozri prosím podrobnosti v " "man 5 apt.conf pod APT::Immediate-Configure (%d)" -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, c-format msgid "Could not configure '%s'. " msgstr "Nedá sa nakonfigurovať „%s“." -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2855,7 +2873,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Je nutné preinštalovať balík %s, ale nedá sa nájsť jeho archív." -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2863,11 +2881,11 @@ msgstr "" "Chyba, pkgProblemResolver::Resolve vytvára poruchy, čo môže být spôsobené " "pridržanými balíkmi." -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "Problémy sa nedajú opraviť, niektoré balíky držíte v poškodenom stave." -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3039,12 +3057,12 @@ msgstr "premenovanie zlyhalo, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "Nezhoda kontrolných MD5 súčtov" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 msgid "Hash Sum mismatch" msgstr "Nezhoda kontrolných haš súčtov" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3053,16 +3071,16 @@ msgstr "" "Nepodarilo sa nájsť očakávanú položku „%s“ v súbore Release (Nesprávna " "položka sources.list alebo chybný formát súboru)" -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nepodarilo sa nájsť haš „%s“ v súbore Release" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "Nie sú dostupné žiadne verejné kľúče ku kľúčom s nasledovnými ID:\n" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3071,12 +3089,12 @@ msgstr "" "Súbor Release pre %s vypršal (neplatný od %s). Aktualizácie tohto zdroja " "softvéru sa nepoužijú." -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "V konflikte s distribúciou: %s (očakávalo sa %s ale dostali sme %s)" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3086,12 +3104,12 @@ msgstr "" "použijú sa predošlé indexové súbory. Chyba GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "Chyba GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3100,7 +3118,7 @@ msgstr "" "Nedá sa nájsť súbor s balíkom %s. To by mohlo znamenať, že tento balík je " "potrebné opraviť manuálne (kvôli chýbajúcej architektúre)." -#: apt-pkg/acquire-item.cc:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3109,13 +3127,13 @@ msgstr "" "Nedá sa nájsť súbor s balíkom %s. Asi budete musieť opraviť tento balík " "manuálne." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Indexové súbory balíka sú narušené. Chýba pole Filename: pre balík %s." -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "Veľkosti sa nezhodujú" @@ -3239,22 +3257,22 @@ msgstr "Zapisuje sa nový zoznam zdrojov\n" msgid "Source list entries for this disc are:\n" msgstr "Položky zoznamu zdrojov pre tento disk sú:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "Zapísaných %i záznamov.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Zapísaných %i záznamov s %i chýbajúcimi súbormi.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Zapísaných %i záznamov s %i chybnými súbormi\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Zapísaných %i záznamov s %i chýbajúcimi a %i chybnými súbormi\n" @@ -3348,12 +3366,12 @@ msgstr "Spustiť externého riešiteľa" msgid "Installing %s" msgstr "Inštaluje sa %s" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr "Nastavuje sa %s" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr "Odstraňuje sa %s" @@ -3374,80 +3392,80 @@ msgid "Running post-installation trigger %s" msgstr "Vykonáva sa spúšťač post-installation %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, c-format msgid "Directory '%s' missing" msgstr "Adresár „%s“ chýba" -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, c-format msgid "Could not open file '%s'" msgstr "Nedá sa otvoriť súbor „%s“" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr "Pripravuje sa %s" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr "Rozbaľuje sa %s" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "Pripravuje sa nastavenie %s" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr "Nainštalovaný balík %s" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "Pripravuje sa odstránenie %s" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr "Odstránený balík %s" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "Pripravuje sa úplné odstránenie %s" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr "Balík „%s“ je úplne odstránený" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Nedá sa zapísať záznam, volanie openpty() zlyhalo (/dev/pts nie je " "pripojený?)\n" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "Spúšťa sa dpkg" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "Operácia bola prerušená predtým, než sa stihla dokončiť" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "Nezapíše sa správa apport, pretože už bol dosiahnutý limit MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "problém so závislosťami - ponecháva sa nenakonfigurované" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3455,7 +3473,7 @@ msgstr "" "Nezapíše sa správa apport, pretože chybová správa indikuje, že je to chyba v " "nadväznosti na predošlé zlyhanie." -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3463,7 +3481,7 @@ msgstr "" "Nezapíše sa správa apport, pretože chybová správa indikuje, že je disk " "zaplnený" -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3471,7 +3489,7 @@ msgstr "" "Nezapíše sa správa apport, pretože chybová správa indikuje chybu nedostatku " "pamäte" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/sl.po b/po/sl.po index 91cbe9aee..39ae7db71 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2012-06-27 21:29+0000\n" "Last-Translator: Andrej Znidarsic \n" "Language-Team: Slovenian \n" @@ -93,77 +93,77 @@ msgstr "Celotna ohlapna velikost: " msgid "Total space accounted for: " msgstr "Celotna velikost, izračunana za: " -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "Datoteka paketa %s ni usklajena." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Noben paket ni bil najden" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 msgid "You must give at least one search pattern" msgstr "Podati morate vsaj en iskalni vzorec" -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "Ta ukaz je zastarel. Namesto njega uporabite 'apt-mark showauto'." -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Ni mogoče najti paketa %s" -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "Datoteke paketa:" -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Predpomnilnik ni usklajen, x-ref datoteke paketa ni mogoč" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "Pripeti paketi:" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(ni najdeno)" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr " Nameščen: " -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr " Kandidat: " -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(brez)" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr " Bucika paketa: " #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr " Preglednica različic:" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s za %s kodno preveden na %s %s\n" -#: cmdline/apt-cache.cc:1730 +#: cmdline/apt-cache.cc:1760 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -231,8 +231,8 @@ msgstr "" " -i Pokaže le pomembne odvisnosti za neujemajoč ukaz.\n" " -c=? Prebere to nastavitveno datoteko\n" " -o=? Nastavi poljubno možnost nastavitve, na primer -o dir::cache=/tmp\n" -"Za več podrobnosti si oglejte strani priročnikov apt-cache(8) in apt.conf" -"(5).\n" +"Za več podrobnosti si oglejte strani priročnikov apt-cache(8) in apt." +"conf(5).\n" #. }}} #: cmdline/apt-cdrom.cc:43 @@ -291,83 +291,101 @@ msgstr "" " -c=? Prebere podano datoteko z nastavitvami\n" " -o=? Nastavi poljubno nastavitveno možnost, na primer. -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +msgid "[Y/n]" +msgstr "" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" -msgstr "Y" +msgstr "" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" -msgstr "N" +msgstr "" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Napaka med prevajanjem logičnega izraza - %s" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "Naslednji paketi imajo nerešene odvisnosti:" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "vendar je paket %s nameščen" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "vendar bo paket %s nameščen" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "vendar se ga ne da namestiti" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "vendar je navidezen paket" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "vendar ni nameščen" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "vendar ne bo nameščen" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr " ali" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "Naslednji NOVI paketi bodo nameščeni:" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "Naslednji novi paketi bodo ODSTRANJENI:" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 msgid "The following packages have been kept back:" msgstr "Naslednji paketi so bili zadržani:" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "Naslednji paketi bodo nadgrajeni:" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "Naslednji paketi bodo POSTARANI:" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "Naslednji zadržani paketi bodo spremenjeni:" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s (zaradi %s) " -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -375,59 +393,59 @@ msgstr "" "OPOZORILO: Naslednji nujni paketi bodo odstranjeni.\n" "Tega NE storite, razen če ne veste natanko kaj počenjate!" -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu nadgrajenih, %lu na novo nameščenih, " -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "%lu posodobljenih, " -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "%lu postaranih, " -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu bo odstranjenih in %lu ne nadgrajenih.\n" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ne popolnoma nameščenih ali odstranjenih.\n" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "Izbiranje '%s' za nalogo '%s'\n" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "Izbiranje '%s' za logični izraz '%s'\n" -#: cmdline/apt-get.cc:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Paket %s je navidezen in ga je priskrbel:\n" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr " [Nameščeno]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 msgid " [Not candidate version]" msgstr " [Ni različica kandidata]" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "Sami izberite paket, ki ga želite namestiti." -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -438,133 +456,133 @@ msgstr "" "To ponavadi pomeni, da paket manjka, je zastaran ali\n" "pa je na voljo samo iz drugega vira.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "Kakorkoli, naslednji paketi ga nadomestijo:" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, c-format msgid "Package '%s' has no installation candidate" msgstr "Paket '%s' nima namestitvenega kandidata" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "Navideznih paketov kot je '%s' ni mogoče odstraniti\n" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "" "Paket '%s' ni nameščen, zato ni bil odstranjen. Ali ste mislili '%s'?\n" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "Paket '%s' ni nameščen, zato ni bil odstranjen\n" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "Izbiranje '%s' namesto '%s'\n" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "%s je preskočen, ker je že nameščen in ne potrebuje nadgradnje.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "Preskok %s, ni nameščen in zahtevane so le nadgradnje\n" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Ponovna namestitev %s ni možna, ker prejem ni možen.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "Najnovejša različica %s je že nameščena.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s je bil nastavljen na ročno nameščen.\n" -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:913 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "Izbrana različica '%s' (%s) za '%s'\n" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "Izbrana različica '%s' (%s) za '%s' namesto '%s'\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "Popravljanje odvisnosti ..." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr " spodletelo." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "Ni mogoče popraviti odvisnosti" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "Ni mogoče pomanjšati zbirke za nadgradnjo" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr " Opravljeno" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Če želite popraviti napake, poskusite pognati 'apt-get -f install'." -#: cmdline/apt-get.cc:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "Nerešene odvisnosti. Poskusite uporabiti -f." -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 msgid "WARNING: The following packages cannot be authenticated!" msgstr "POZOR: Naslednjih paketov ni bilo mogoče overiti!" -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "Opozorilo overitve je bilo prepisano.\n" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " -msgstr "Ali želite te pakete namestiti brez preverjanja [y/N]? " +#: cmdline/apt-get.cc:1108 +msgid "Install these packages without verification?" +msgstr "Ali želite te pakete namestiti brez preverjanja?" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" msgstr "Nekaterih paketkov bi bilo mogoče overiti" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "Prišlo je do težav in -y je bil uporabljen brez --force-yes" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Notranja napaka, NamestiPakete je bil klican z pokvarjenimi paketi!" -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 msgid "Packages need to be removed but remove is disabled." msgstr "Odstraniti je treba pakete, a je odstranjevanje onemogočeno." -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 msgid "Internal error, Ordering didn't finish" msgstr "Notranja napaka, Urejanje se ni končalo" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Kako čudno .. Velikosti se ne ujemata, pošljite sporočilo na apt@packages." @@ -572,54 +590,54 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Potrebno je dobiti %sB/%sB arhivov.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Potrebno je dobiti %sB arhivov.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Po tem opravilu bo porabljenega %sB dodatnega prostora.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Po tem opravilu bo sproščenega %sB prostora na disku.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Couldn't determine free space in %s" msgstr "Ni mogoče določiti prostega prostora v %s" -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, c-format msgid "You don't have enough free space in %s." msgstr "Na %s je premalo prostora." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Navedena je možnost Samo preprosto, a to opravilo ni preprosto." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "Da, naredi tako kot pravim!" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -630,28 +648,28 @@ msgstr "" "Za nadaljevanje vtipkajte frazo '%s'\n" " ?] " -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "Prekini." -#: cmdline/apt-get.cc:1284 -msgid "Do you want to continue [Y/n]? " -msgstr "Ali želite nadaljevati [Y/n]? " +#: cmdline/apt-get.cc:1313 +msgid "Do you want to continue?" +msgstr "Ali želite nadaljevati?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ni mogoče dobiti %s %s\n" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "Prejem nekaterih datotek ni uspel" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "Prejem je dokončan in uporabljen je način samo prejema" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -659,19 +677,19 @@ msgstr "" "Nekaterih arhivov ni mogoče dobiti. Poskusite uporabiti apt-get update ali --" "fix-missing." -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing in izmenjava medija trenutno nista podprta" -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "Ni mogoče popraviti manjkajočih paketov." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "Prekinjanje namestitve." -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -691,37 +709,37 @@ msgstr[3] "" "Naslednji paketi so izginili z vašega sistema, ker so vse\n" "datoteke prepisali drugi paketi:" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Opomba: To je dpkg storil samodejno in namenoma." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Prezri nerazpoložljiv cilj izdaje '%s' paketa '%s'" -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Izbiranje '%s' kot vir paketa namesto '%s'\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Prezri nerazpoložljivo različico '%s' paketa '%s'" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr "Ukaz update ne sprejema argumentov" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Program ne bi smel brisati stvari, ni mogoče zagnati " "SamodejnegaOdstranjevalnika" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -740,15 +758,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 msgid "The following information may help to resolve the situation:" msgstr "Naslednji podatki vam bodo morda pomagali rešiti težavo:" -#: cmdline/apt-get.cc:1824 +#: cmdline/apt-get.cc:1853 msgid "Internal Error, AutoRemover broke stuff" msgstr "Notranja napaka, SamodejniOdstranjevalnik je pokvaril stvari" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -760,7 +778,7 @@ msgstr[2] "" "Naslednja paketa sta bila samodejno nameščena in nista več zahtevana:" msgstr[3] "Naslednji paketi so bili samodejno nameščeni in niso več zahtevani:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -770,7 +788,7 @@ msgstr[1] "%lu paket je bil samodejno nameščen in ni bil več zahtevan.\n" msgstr[2] "%lu paketa sta bila samodejno nameščena in nista več zahtevana.\n" msgstr[3] "%lu paketi so bili samodejno nameščeni in niso več zahtevani.\n" -#: cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1866 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Uporabite 'apt-get autoremove' za njihovo odstranitev." @@ -778,15 +796,15 @@ msgstr[1] "Uporabite 'apt-get autoremove' za njegovo odstranitev." msgstr[2] "Uporabite 'apt-get autoremove' za njuno odstranitev." msgstr[3] "Uporabite 'apt-get autoremove' za njihovo odstranitev." -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "Notranja napaka zaradi AllUpgrade." -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1984 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Poskusite zagnati 'apt-get -f install', če želite popraviti naslednje:" -#: cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -794,7 +812,7 @@ msgstr "" "Nerešene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali " "navedite rešitev)." -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:2002 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" @@ -806,33 +824,33 @@ msgstr "" ", da nekateri zahtevani paketi še niso ustvarjeni ali premaknjeni\n" " iz Prihajajočega." -#: cmdline/apt-get.cc:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "Pokvarjeni paketi" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "Naslednji dodatni paketi bodo nameščeni:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "Predlagani paketi:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "Priporočeni paketi:" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "Ni mogoče najti paketa %s" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s je nastavljen na samodejno nameščen.\n" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -840,47 +858,47 @@ msgstr "" "Ta ukaz je zastarel. Namesto njega uporabite 'apt-mark auto' in 'apt-mark " "manual'." -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "Preračunavanje nadgradnje ... " -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "Spodletelo" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "Opravljeno" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 msgid "Internal error, problem resolver broke stuff" msgstr "Notranja napaka, reševalnik težav je pokvaril stvari" -#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "Ni mogoče zakleniti mape prejemov" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Ni mogoče najti vira za prejem različice '%s' paketa '%s'" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "Prejemanje %s %s" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 msgid "Must specify at least one package to fetch source for" msgstr "" "Potrebno je navesti vsaj en paket, za katerega želite dobiti izvorno kodo" -#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, c-format msgid "Unable to find a source package for %s" msgstr "Izvornega paketa za %s ni mogoče najti" -#: cmdline/apt-get.cc:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -889,7 +907,7 @@ msgstr "" "OPOMBA: pakiranje '%s' vzdrževano v sistemu nadzora različice '%s' na:\n" "%s\n" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, c-format msgid "" "Please use:\n" @@ -900,70 +918,70 @@ msgstr "" "bzr branch %s\n" "za pridobitev zadnjih (morda še neizdanih) posodobitev paketa.\n" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Preskok že prejete datoteke '%s'\n" -#: cmdline/apt-get.cc:2604 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr "Nimate dovolj prostora na %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2644 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potrebno je dobiti %sB/%sB izvornih arhivov.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2649 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potrebno je dobiti %sB izvornih arhivov.\n" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "Dobi vir %s\n" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "Nekaterih arhivov ni mogoče pridobiti." -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Odpakiranje že odpakiranih izvornih paketov v %s je bilo preskočeno\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Ukaz odpakiranja '%s' ni uspel.\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Izberite, če je paket 'dpkg-dev' nameščen.\n" -#: cmdline/apt-get.cc:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "Ukaz gradnje '%s' ni uspel.\n" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "Podrejeno opravilo ni uspelo" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 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:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -972,17 +990,17 @@ msgstr "" "Za %s ni bilo mogoče najti podatkov o arhitekturi. Za nastavitev si oglejte " "apt.conf(5) APT::Architectures" -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ni mogoče dobiti podrobnosti o odvisnostih za gradnjo za %s" -#: cmdline/apt-get.cc:2839 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr "%s nima odvisnosti za gradnjo.\n" -#: cmdline/apt-get.cc:3009 +#: cmdline/apt-get.cc:3040 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -990,20 +1008,20 @@ msgid "" msgstr "" "odvisnosti %s za %s ni mogoče zadovoljiti, ker %s ni dovoljen na paketih '%s'" -#: cmdline/apt-get.cc:3027 +#: cmdline/apt-get.cc:3058 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s odvisnosti za %s ni mogoče zadostiti, ker ni mogoče najti paketa %s" -#: cmdline/apt-get.cc:3050 +#: cmdline/apt-get.cc:3081 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Ni mogoče zadostiti %s odvisnosti za %s. Nameščen paket %s je preveč nov" -#: cmdline/apt-get.cc:3089 +#: cmdline/apt-get.cc:3120 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1012,7 +1030,7 @@ msgstr "" "odvisnosti %s za %s ni mogoče zadovoljiti, ker je različica kandidata paketa " "%s ne more zadostiti zahtev različice" -#: cmdline/apt-get.cc:3095 +#: cmdline/apt-get.cc:3126 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1021,30 +1039,30 @@ msgstr "" "odvisnosti %s za %s ni mogoče zadovoljiti, ker je različica kandidata paketa " "%s nima različice kandidata" -#: cmdline/apt-get.cc:3118 +#: cmdline/apt-get.cc:3149 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Ni mogoče zadostiti %s odvisnosti za %s: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3164 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Odvisnosti za gradnjo %s ni bilo mogoče zadostiti." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "Obdelava odvisnosti za gradnjo je spodletela" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, c-format msgid "Changelog for %s (%s)" msgstr "Dnevnik sprememb za %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "Podprti moduli:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1131,7 +1149,7 @@ msgstr "" " sources.list(5) in apt.conf(5). \n" " Ta APT ima moči super krav.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1206,8 +1224,8 @@ msgid "%s was already not hold.\n" msgstr "paket %s je bil že nastavljen kot ne na čakanju.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Program je čakal na %s a ga ni bilo tam" @@ -1292,7 +1310,7 @@ msgstr "Ni mogoče odklopiti CD-ROM-a v %s, ker je morda še v uporabi." msgid "Disk not found." msgstr "Diska ni mogoče najti." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "Datoteke ni mogoče najti" @@ -1355,7 +1373,7 @@ msgstr "Ukaz prijavne skripte '%s' ni uspel, strežnik je odgovoril: %s" msgid "TYPE failed, server said: %s" msgstr "TYPE je spodletel, strežnik je odgovoril: %s" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "Povezava je zakasnela" @@ -1363,8 +1381,8 @@ msgstr "Povezava je zakasnela" msgid "Server closed the connection" msgstr "Strežnik je zaprl povezavo" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "Napaka branja" @@ -1376,86 +1394,86 @@ msgstr "Odgovor je prekoračil predpomnilnik." msgid "Protocol corruption" msgstr "Okvara protokola" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "Napaka pisanja" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "Ni mogoče ustvariti vtiča" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "Ni mogoče povezati podatkovnega vtiča. Povezava je zakasnela." -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "Ni mogoče povezat pasivnega vtiča." -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo ni mogel dobiti poslušajočega vtiča" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "Ni mogoče povezati vtiča" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "Ni mogoče poslušati na vtiču" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "Ni mogoče določiti imena vtiča" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "Ni mogoče poslati ukaza PORT" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Neznan naslov družine %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT ni uspel, strežnik je odgovoril: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "Povezava podatkovne vtičnice je zakasnela" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "Ni mogoče sprejeti povezave" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "Težava med razprševanjem datoteke" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Ni mogoče pridobiti datoteke, strežnik je odgovoril '%s'" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "Podatkovna vtič je potekel" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Prenos podatkov ni uspel, strežnik je odgovoril '%s'" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "Poizvedba" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "Ni mogoče klicati " @@ -1491,7 +1509,7 @@ msgstr "Ni se mogoče povezati z %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "Povezovanje z %s" @@ -1521,37 +1539,37 @@ msgstr "Nekaj čudnega se je zgodilo med razreševanjem '%s:%s' (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Ni se mogoče povezati z %s:%s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:167 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Notranja napaka: Dober podpis, toda ni mogoče določiti podpisa ključa?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Najden je bil vsaj en neveljaven podpis." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:173 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Ni mogoče izvesti 'gpgv' za preverjanje podpisa (je gpgv nameščen?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "Neznana napaka med izvajanjem gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 msgid "The following signatures were invalid:\n" msgstr "Naslednji podpisi so bili neveljavni:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1590,59 +1608,59 @@ msgstr "Ta strežnik HTTP ima pokvarjen obseg podpore" msgid "Unknown date format" msgstr "Neznana oblika datuma" -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "Izbira ni uspela" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "Povezava je zakasnela" -#: methods/http.cc:855 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "Napaka med pisanjem v izhodno datoteko" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "Napaka med pisanjem v datoteko" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "Napaka med pisanjem v datoteko" -#: methods/http.cc:928 +#: methods/http.cc:927 msgid "Error reading from server. Remote end closed connection" msgstr "Napaka med branjem s strežnika. Oddaljeni del je zaprl povezavo" -#: methods/http.cc:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "Napaka med branjem s strežnika" -#: methods/http.cc:1198 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "Napačni podatki glave" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "Povezava ni uspela" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "Notranja napaka" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "Ni mogoče brati %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1695,7 +1713,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "Ustvarjanje cevi IPC do podopravila je spodletelo" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "Povezava se je prezgodaj zaprla" @@ -2175,11 +2193,11 @@ msgstr "Neveljavna glava arhiva člana %s" msgid "Invalid archive member header" msgstr "Neveljavna glava člana arhiva" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "Arhiv je prekratek" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "Glav arhiva ni mogoče brati" @@ -2507,7 +2525,7 @@ msgstr "Neveljavno opravilo %s" msgid "Unable to stat the mount point %s" msgstr "Ni mogoče določiti priklopne točke %s" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "Ni mogoče določiti CD-ROM-a" @@ -2526,102 +2544,102 @@ msgstr "Brez uporabe zaklepanja za zaklenjeno datoteko le za branje %s" msgid "Could not open lock file %s" msgstr "Ni mogoče odprti zaklenjene datoteke %s" -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Brez uporabe zaklepanja za datoteko %s, priklopljeno z NTFS" -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "Ni mogoče zakleniti datoteke %s" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "Seznama datotek ni mogoče ustvariti, ker '%s' ni mapa" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "Preziranje '%s' v mapi '%s', ker ni običajna datoteka" -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "Preziranje datoteke '%s' v mapi '%s', ker nima pripone imena datotek" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" "Preziranje datoteke '%s' v mapi '%s', ker nima veljavne pripone imena datotek" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Pod-opravilo %s je prejelo segmentacijsko napako." -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, c-format msgid "Sub-process %s received signal %u." msgstr "Pod-opravilo %s je prejelo signal %u." -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Pod-opravilo %s je vrnilo kodo napake (%u)" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Pod-opravilo %s se je nepričakovano zaključilo" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "Ni mogoče odpreti datoteke %s" -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, c-format msgid "Could not open file descriptor %d" msgstr "Ni mogoče odpreti opisnika datotek %d" -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "Ni mogoče ustvariti podopravila IPD" -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "Ni mogoče izvesti stiskanja " -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, c-format msgid "read, still have %llu to read but none left" msgstr "Prebrano, še vedno je treba prebrati %llu bajtov, vendar ni nič ostalo" -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "pisanje, preostalo je še %llu za pisanje, vendar ni bilo mogoče pisati" -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, c-format msgid "Problem closing the file %s" msgstr "Težava med zapiranjem datoteke %s" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Težava med preimenovanje datoteke %s v %s" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, c-format msgid "Problem unlinking the file %s" msgstr "Težava med razvezovanjem datoteke %s" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "Težava med usklajevanjem datoteke" @@ -2824,7 +2842,7 @@ msgstr "Slabo oblikovana vrstica %u v seznamu virov %s (vrsta)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Vrsta '%s' v vrstici %u na seznamu virov %s ni znana" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2833,12 +2851,12 @@ msgstr "" "Ni mogoče izvesti takojąnje nastavitve na '%s'. Oglejte si man5 apt.conf pod " "APT::Immediate-Configure za podrobnosti. (%d)" -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, c-format msgid "Could not configure '%s'. " msgstr "Ni mogoče nastaviti '%s' " -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2860,7 +2878,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Paket %s mora biti znova nameščen, vendar ni mogoče najti arhiva zanj." -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2868,11 +2886,11 @@ msgstr "" "Napaka. pkgProblemResolver::Resolve pri razrešitvi, ki so jih morda " "povzročili zadržani paketi." -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "Ni mogoče popraviti težav. Imate pokvarjene pakete." -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3042,12 +3060,12 @@ msgstr "preimenovanje je spodletelo, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "Neujemanje vsote MD5" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 msgid "Hash Sum mismatch" msgstr "Neujemanje vsote razpršil" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3056,16 +3074,16 @@ msgstr "" "Ni mogoče najti pričakovanega vnosa '%s' v datoteki Release (napačen vnos " "sources.list ali slabo oblikovana datoteka)" -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Ni mogoče najti vsote razprševanja za '%s' v datoteki Release" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "Za naslednje ID-je ključa ni na voljo javnih ključev:\n" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3074,12 +3092,12 @@ msgstr "" "Datoteka Release za %s je potekla (neveljavna od %s). Posodobitev za to " "skladišče ne bo uveljavljena." -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribucija v sporu: %s (pričakovana %s, toda dobljena %s)" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3089,12 +3107,12 @@ msgstr "" "zato bodo uporabljene predhodne datoteke kazal. Napaka GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "Napaka GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3103,7 +3121,7 @@ msgstr "" "Ni bilo mogoče najti datoteke za paket %s. Morda boste morali ročno " "popraviti ta paket (zaradi manjkajočega arhiva)." -#: apt-pkg/acquire-item.cc:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3112,7 +3130,7 @@ msgstr "" "Ni bilo mogoče najti datoteke za paket %s. Morda boste morali ročno " "popraviti ta paket." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3120,7 +3138,7 @@ msgstr "" "Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje za paket " "%s." -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "Neujemanje velikosti" @@ -3244,22 +3262,22 @@ msgstr "Pisanje novega seznama virov\n" msgid "Source list entries for this disc are:\n" msgstr "Izvorni vnosi za ta disk so:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "Zapisanih je bilo %i zapisov.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Zapisanih je bilo %i zapisov z %i manjkajočimi datotekami.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Zapisanih je bilo %i zapisov z %i neujemajočimi datotekami.\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3352,12 +3370,12 @@ msgstr "Izvedi zunanji reševalnik" msgid "Installing %s" msgstr "Nameščanje %s" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr "Nastavljanje %s" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr "Odstranjevanje %s" @@ -3378,81 +3396,81 @@ msgid "Running post-installation trigger %s" msgstr "Poganjanje sprožilca po namestitvi %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, c-format msgid "Directory '%s' missing" msgstr "Mapa '%s' manjka" -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, c-format msgid "Could not open file '%s'" msgstr "Ni mogoče odpreti datoteke '%s'" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr "Pripravljanje %s" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr "Razširjanje %s" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "Pripravljanje na nastavljanje %s" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr "%s je bil nameščen" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "Pripravljanje na odstranitev %s" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr "%s je bil odstranjen" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "Pripravljanje na popolno odstranitev %s" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr "%s je bil popolnoma odstranjen" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Ni mogoče pisati dnevnika, openpty() je spodletelo (/dev/pts ni " "prklopljen?)\n" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "Poganjanje dpkg" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "Opravilo je bilo prekinjeno preden se je lahko končalo" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "" "Poročilo apport ni bilo napisano, ker je bilo število MaxReports že doseženo" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "težave odvisnosti - puščanje nenastavljenega" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3460,7 +3478,7 @@ msgstr "" "Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na " "navezujočo napako iz predhodne napake." -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3468,7 +3486,7 @@ msgstr "" "Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako " "polnega diska" -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3476,7 +3494,7 @@ msgstr "" "Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako " "zaradi pomanjkanja pomnilnika" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/sv.po b/po/sv.po index b7502b6cd..69f785394 100644 --- a/po/sv.po +++ b/po/sv.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2010-08-24 21:18+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -93,77 +93,77 @@ msgstr "Totalt bortkastat utrymme: " msgid "Total space accounted for: " msgstr "Totalt utrymme som kan redogöras för: " -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "Paketfilen %s är inte synkroniserad." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Inga paket hittades" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 msgid "You must give at least one search pattern" msgstr "Du måste ange minst ett sökmönster" -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Kunde inte hitta paketet %s" -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "\"Package\"-filer:" -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Cachen är inte synkroniserad, kan inte korsreferera en paketfil" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "Fastnålade paket:" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(hittades inte)" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr " Installerad: " -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr " Kandidat: " -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(ingen)" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr " Paketnålning: " #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr " Versionstabell:" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s för %s kompilerad den %s %s\n" -#: cmdline/apt-cache.cc:1730 +#: cmdline/apt-cache.cc:1760 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -294,83 +294,101 @@ msgstr "" " -c=? Läs denna konfigurationsfil.\n" " -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +msgid "[Y/n]" +msgstr "[J/n]" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "[j/N]" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" msgstr "" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Fel vid kompilering av reguljärt uttryck - %s" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "Följande paket har beroenden som inte kan tillfredsställas:" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "men %s är installerat" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "men %s kommer att installeras" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "men det kan inte installeras" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "men det är ett virtuellt paket" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "men det är inte installerat" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "men det kommer inte att installeras" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr " eller" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "Följande NYA paket kommer att installeras:" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "Följande paket kommer att TAS BORT:" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 msgid "The following packages have been kept back:" msgstr "Följande paket har hållits tillbaka:" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "Följande paket kommer att uppgraderas:" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "Följande paket kommer att NEDGRADERAS:" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "Följande tillbakahållna paket kommer att ändras:" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s (på grund av %s) " -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -378,59 +396,59 @@ msgstr "" "VARNING: Följande systemkritiska paket kommer att tas bort.\n" "Detta bör INTE genomföras såvida du inte vet exakt vad du gör!" -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu att uppgradera, %lu att nyinstallera, " -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "%lu att installera om, " -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "%lu att nedgradera, " -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu att ta bort och %lu att inte uppgradera.\n" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu är inte helt installerade eller borttagna.\n" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "Observera, väljer \"%s\" för funktionen \"%s\"\n" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, 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:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Paketet %s är ett virtuellt paket som tillhandahålls av:\n" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr " [Installerat]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 msgid " [Not candidate version]" msgstr " [Inte kandidatversion]" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "Du bör uttryckligen ange ett att installera." -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -441,135 +459,135 @@ msgstr "" "Det kan betyda att paketet saknas, har blivit föråldrat eller endast\n" "är tillgängligt från andra källor\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "Dock kan följande paket ersätta det:" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, c-format msgid "Package '%s' has no installation candidate" msgstr "Paketet \"%s\" har ingen installationskandidat" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "Virtuella paket som \"%s\" kan inte tas bort\n" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "Paketet %s är inte installerat, så det tas inte bort\n" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "Paketet %s är inte installerat, så det tas inte bort\n" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "Observera, väljer \"%s\" istället för \"%s\"\n" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Hoppar över %s, det är redan installerat och uppgradering har inte valts.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "" "Hoppar över %s, det är inte installerat och endast uppgraderingar har " "begärts.\n" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Ominstallation av %s är inte möjlig, det kan inte hämtas.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "%s är redan den senaste versionen.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s är satt till manuellt installerad.\n" -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:913 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "Valde version \"%s\" (%s) för \"%s\"\n" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, fuzzy, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "Valde version \"%s\" (%s) för \"%s\"\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "Korrigerar beroenden...." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr " misslyckades." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "Kunde inte korrigera beroenden" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "Kunde inte minimera uppgraderingsuppsättningen" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr " Färdig" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Du bör köra \"apt-get -f install\" för att korrigera dessa." -#: cmdline/apt-get.cc:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "Otillfredsställda beroenden. Prova med -f." -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 msgid "WARNING: The following packages cannot be authenticated!" msgstr "VARNING: Följande paket kunde inte autentiseras!" -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "Autentiseringsvarning åsidosatt.\n" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " -msgstr "Installera dessa paket utan verifiering [j/N]? " +#: cmdline/apt-get.cc:1108 +msgid "Install these packages without verification?" +msgstr "Installera dessa paket utan verifiering?" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" msgstr "Några av paketen kunde inte autentiseras" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "Problem har uppstått och -y användes utan --force-yes" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Internt fel. InstallPackages anropades med trasiga paket!" -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 msgid "Packages need to be removed but remove is disabled." msgstr "Paketen måste tas bort men \"Remove\" är inaktiverat." -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 msgid "Internal error, Ordering didn't finish" msgstr "Internt fel. Sorteringen färdigställdes inte" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Konstigt.. storlekarna stämde inte överens, skicka e-post till apt@packages." @@ -577,21 +595,21 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Behöver hämta %sB/%sB arkiv.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Behöver hämta %sB arkiv.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" @@ -599,33 +617,33 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, c-format 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:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunde inte fastställa ledigt utrymme i %s" -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, 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:1257 cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "\"Trivial Only\" angavs, men detta är inte en trivial handling." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "Ja, gör som jag säger!" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -637,28 +655,28 @@ msgstr "" " ?] " # Visas då man svarar nej -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "Avbryter." -#: cmdline/apt-get.cc:1284 -msgid "Do you want to continue [Y/n]? " -msgstr "Vill du fortsätta [J/n]? " +#: cmdline/apt-get.cc:1313 +msgid "Do you want to continue?" +msgstr "Vill du fortsätta?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Misslyckades med att hämta %s %s\n" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "Misslyckades med att hämta vissa filer" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "Hämtningen färdig i \"endast-hämta\"-läge" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -666,19 +684,19 @@ msgstr "" "Vissa arkiv kunte inte hämtas. Prova att köra \"apt-get update\" eller med --" "fix-missing." -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing och mediabyte stöds inte för tillfället" -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "Kunde inte korrigera saknade paket." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "Avbryter installationen." -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -692,36 +710,36 @@ msgstr[1] "" "Följande paket har försvunnit från ditt system eftersom\n" "alla filer har skrivits över av andra paket:" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Observera: Detta sker med automatik och vid behov av dpkg." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Ignorera otillgängliga målutgåvan \"%s\" av paketet \"%s\"" -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Väljer \"%s\" som källkodspaket istället för \"%s\"\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Ignorera otillgängliga versionen \"%s\" av paketet \"%s\"" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr "Uppdateringskommandot tar inga argument" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 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:1817 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -739,15 +757,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 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:1824 +#: cmdline/apt-get.cc:1853 msgid "Internal Error, AutoRemover broke stuff" msgstr "Internt fel, AutoRemover förstörde något" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -758,7 +776,7 @@ msgstr[0] "" msgstr[1] "" "Följande paket har installerats automatiskt och är inte längre nödvändiga:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -768,22 +786,22 @@ msgstr[0] "" msgstr[1] "" "%lu paket blev installerade automatiskt och är inte längre nödvändiga.\n" -#: cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1866 #, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Använd \"apt-get autoremove\" för att ta bort dem." msgstr[1] "Använd \"apt-get autoremove\" för att ta bort dem." -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internt fel, AllUpgrade förstörde något" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1984 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Du bör köra \"apt-get -f install\" för att korrigera dessa:" -#: cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -791,7 +809,7 @@ msgstr "" "Otillfredsställda beroenden. Prova med \"apt-get -f install\" utan paket " "(eller ange en lösning)." -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:2002 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" @@ -803,78 +821,78 @@ msgstr "" "att några nödvändiga paket ännu inte har skapats eller flyttats\n" "ut från \"Incoming\"." -#: cmdline/apt-get.cc:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "Trasiga paket" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "Följande ytterligare paket kommer att installeras:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "Föreslagna paket:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "Rekommenderade paket:" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "Kunde inte hitta paketet %s" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s är satt till automatiskt installerad.\n" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "Beräknar uppgradering... " -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "Misslyckades" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "Färdig" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 msgid "Internal error, problem resolver broke stuff" msgstr "Internt fel, problemlösaren förstörde någonting" -#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "Kunde inte låsa hämtningskatalogen" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 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:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, 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:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -884,7 +902,7 @@ msgstr "" "på:\n" "%s\n" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, fuzzy, c-format msgid "" "Please use:\n" @@ -895,85 +913,85 @@ msgstr "" "bzr get %s\n" "för att hämta senaste (möjligen inte utgivna) uppdateringar av paketet.\n" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hoppar över redan hämtade filen \"%s\"\n" -#: cmdline/apt-get.cc:2604 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har inte tillräckligt mycket ledigt utrymme i %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2644 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Behöver hämta %sB/%sB källkodsarkiv.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2649 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Behöver hämta %sB källkodsarkiv.\n" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "Hämtar källkoden %s\n" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "Misslyckades med att hämta vissa arkiv." -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, 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:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uppackningskommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, 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:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggkommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "Barnprocessen misslyckades" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 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:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, 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:2839 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr "%s har inga byggberoenden.\n" -#: cmdline/apt-get.cc:3009 +#: cmdline/apt-get.cc:3040 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -982,7 +1000,7 @@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan " "hittas" -#: cmdline/apt-get.cc:3027 +#: cmdline/apt-get.cc:3058 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -991,14 +1009,14 @@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan " "hittas" -#: cmdline/apt-get.cc:3050 +#: cmdline/apt-get.cc:3081 #, 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:3089 +#: cmdline/apt-get.cc:3120 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1007,7 +1025,7 @@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom inga tillgängliga " "versioner av paketet %s tillfredsställer versionskraven" -#: cmdline/apt-get.cc:3095 +#: cmdline/apt-get.cc:3126 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1016,31 +1034,31 @@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan " "hittas" -#: cmdline/apt-get.cc:3118 +#: cmdline/apt-get.cc:3149 #, 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:3133 +#: cmdline/apt-get.cc:3164 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggberoenden för %s kunde inte tillfredsställas." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "Misslyckades med att behandla byggberoenden" # Felmeddelande för misslyckad chdir -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Ansluter till %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "Moduler som stöds:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1128,7 +1146,7 @@ msgstr "" "för mer information och flaggor.\n" " Denna APT har Speciella Ko-Krafter.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1208,8 +1226,8 @@ msgid "%s was already not hold.\n" msgstr "%s är redan den senaste versionen.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Väntade på %s men den fanns inte där" @@ -1276,7 +1294,7 @@ msgstr "Kunde inte avmontera cd-rom:en i %s, den kanske fortfarande används." msgid "Disk not found." msgstr "Skivan hittades inte." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "Filen hittades inte" @@ -1339,7 +1357,7 @@ msgstr "Kommandot \"%s\" i inloggningsskriptet misslyckades, servern sade: %s" msgid "TYPE failed, server said: %s" msgstr "TYPE misslyckades, servern sade: %s" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "Tidsgränsen för anslutningen överskreds" @@ -1347,8 +1365,8 @@ msgstr "Tidsgränsen för anslutningen överskreds" msgid "Server closed the connection" msgstr "Servern stängde anslutningen" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "Läsfel" @@ -1360,87 +1378,87 @@ msgstr "Ett svar spillde bufferten." msgid "Protocol corruption" msgstr "Protokollet skadat" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "Skrivfel" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "Kunde inte skapa ett uttag (socket)" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "Kunde inte ansluta datauttaget (socket), inget svar inom tidsgräns" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "Kunde inte ansluta passivt uttag (socket)." -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo kunde inte få tag i ett lyssnande uttag (socket)" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "Kunde inte binda ett uttag (socket)" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "Kunde inte lyssna på uttaget (socket)" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "Kunde inte fastställa uttagets namn (socket)" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "Kunde inte sända PORT-kommando" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Okänd adressfamilj %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT misslyckades, servern sade: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgränsen" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "Kunde inte ta emot anslutningen" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "Problem med att lägga filen till hashtabellen" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Kunde inte hämta filen, servern sade \"%s\"" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "Datauttag (socket) fick inte svar inom tidsgränsen" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Dataöverföringen misslyckades, servern sade \"%s\"" # Statusmeddelande, byter från substantiv till verb #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "Frågar" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "Kunde inte starta " @@ -1478,7 +1496,7 @@ msgstr "Kunde inte ansluta till %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "Ansluter till %s" @@ -1510,39 +1528,39 @@ msgstr "Något konstigt hände när \"%s:%s\" slogs upp (%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "Kunde inte ansluta till %s:%s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:167 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:170 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Minst en ogiltig signatur träffades på." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:173 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Kunde inte köra \"gpgv\" för att verifiera signatur (är gpgv installerad?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "Okänt fel vid körning av gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 msgid "The following signatures were invalid:\n" msgstr "Följande signaturer är ogiltiga:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1582,51 +1600,51 @@ msgstr "Den här http-serverns stöd för delvis hämtning fungerar inte" msgid "Unknown date format" msgstr "Okänt datumformat" -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "\"Select\" misslyckades" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "Anslutningen överskred tidsgränsen" -#: methods/http.cc:855 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "Fel vid skrivning till utdatafil" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "Fel vid skrivning till fil" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "Fel vid skrivning till filen" -#: methods/http.cc:928 +#: methods/http.cc:927 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:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "Fel vid läsning från server" -#: methods/http.cc:1198 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "Felaktiga data i huvud" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "Anslutningen misslyckades" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "Internt fel" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format @@ -1634,8 +1652,8 @@ msgid "Unable to read %s" msgstr "Kunde inte läsa %s" # Felmeddelande för misslyckad chdir -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1688,7 +1706,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "Misslyckades med att skapa IPC-rör till underprocess" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "Anslutningen stängdes i förtid" @@ -2174,11 +2192,11 @@ msgstr "Ogiltig arkivdelsrubrik %s" msgid "Invalid archive member header" msgstr "Ogiltigt arkivdelsrubrik" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "Arkivet är för kort" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "Misslyckades med att läsa arkivrubriker" @@ -2507,7 +2525,7 @@ msgstr "Felaktig åtgärd %s" msgid "Unable to stat the mount point %s" msgstr "Kunde inte ta status på monteringspunkten %s." -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "Kunde inte ta status på cd-romen." @@ -2526,101 +2544,101 @@ msgstr "Använder inte låsning för skrivskyddade låsfilen %s" msgid "Could not open lock file %s" msgstr "Kunde inte öppna låsfilen %s" -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Använder inte låsning för nfs-monterade låsfilen %s" -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "Kunde inte erhålla låset %s" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Underprocessen %s råkade ut för ett segmenteringsfel." -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, c-format msgid "Sub-process %s received signal %u." msgstr "Underprocessen %s tog emot signal %u." -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Underprocessen %s svarade med en felkod (%u)" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Underprocessen %s avslutades oväntat" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "Kunde inte öppna filen %s" -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, c-format msgid "Could not open file descriptor %d" msgstr "Kunde inte öppna filhandtag %d" -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "Misslyckades med att skapa underprocess-IPC" -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "Misslyckades med att starta komprimerare " -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "läsning, har fortfarande %lu att läsa men ingenting finns kvar" -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "skrivning, har fortfarande %lu att skriva men kunde inte" -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, c-format msgid "Problem closing the file %s" msgstr "Problem med att stänga filen %s" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problem med att byta namn på filen %s till %s" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, c-format msgid "Problem unlinking the file %s" msgstr "Problem med att avlänka filen %s" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "Problem med att synkronisera filen" @@ -2821,7 +2839,7 @@ msgstr "Rad %u i källistan %s har fel format (typ)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ \"%s\" är inte känd på rad %u i listan över källor %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2830,12 +2848,12 @@ msgstr "" "Kunde inte genomföra omedelbar konfiguration på \"%s\". Se man 5 apt.conf " "under APT::Immediate-Configure för information. (%d)" -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Kunde inte öppna filen \"%s\"" -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2859,7 +2877,7 @@ msgid "" msgstr "" "Paketet %s måste installeras om, men jag kan inte hitta något arkiv för det." -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2867,11 +2885,11 @@ msgstr "" "Fel, pkgProblemResolver::Resolve genererade avbrott; detta kan bero på " "tillbakahållna paket." -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "Kunde inte korrigera problemen, du har hållit tillbaka trasiga paket." -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3045,40 +3063,40 @@ msgstr "namnbyte misslyckades, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "MD5-kontrollsumman stämmer inte" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 msgid "Hash Sum mismatch" msgstr "Hash-kontrollsumman stämmer inte" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Kunde inte tolka \"Release\"-filen %s" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "Det finns ingen öppen nyckel tillgänglig för följande nyckel-id:n:\n" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konflikt i distribution: %s (förväntade %s men fick %s)" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3089,12 +3107,12 @@ msgstr "" "%s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-fel: %s: %s" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3103,7 +3121,7 @@ msgstr "" "Jag kunde inte hitta någon fil för paketet %s. Detta kan betyda att du " "manuellt måste reparera detta paket (på grund av saknad arkitektur)." -#: apt-pkg/acquire-item.cc:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3112,13 +3130,13 @@ msgstr "" "Jag kunde inte hitta någon fil för paketet %s. Detta kan betyda att du " "manuellt måste reparera detta paket." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Paketindexfilerna är skadede. Inget \"Filename:\"-fält för paketet %s." -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "Storleken stämmer inte" @@ -3242,22 +3260,22 @@ msgstr "Skriver ny källista\n" msgid "Source list entries for this disc are:\n" msgstr "Poster i källistan för denna skiva:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "Skrev %i poster.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Skrev %i poster med %i saknade filer.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Skrev %i poster med %i filer som inte stämmer\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Skrev %i poster med %i saknade filer och %i filer som inte stämmer\n" @@ -3353,12 +3371,12 @@ msgstr "" msgid "Installing %s" msgstr "Installerar %s" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr "Konfigurerar %s" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr "Tar bort %s" @@ -3379,79 +3397,79 @@ msgid "Running post-installation trigger %s" msgstr "Kör efterinstallationsutlösare %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, c-format msgid "Directory '%s' missing" msgstr "Katalogen \"%s\" saknas" -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, c-format msgid "Could not open file '%s'" msgstr "Kunde inte öppna filen \"%s\"" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr "Förbereder %s" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr "Packar upp %s" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "Förbereder konfigurering av %s" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr "Installerade %s" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "Förbereder borttagning av %s" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr "Tog bort %s" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "Förbereder borttagning av hela %s" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr "Tog bort hela %s" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Kan inte skriva loggfil, openpty() misslyckades (/dev/pts inte monterad?)\n" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "Kör dpkg" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "Ingen apport-rapport skrevs därför att MaxReports redan har uppnåtts" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "beroendeproblem - lämnar okonfigurerad" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3459,7 +3477,7 @@ msgstr "" "Ingen apport-rapport skrevs därför att felmeddelandet indikerar att det är " "ett efterföljande fel från ett tidigare problem." -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3467,7 +3485,7 @@ msgstr "" "Ingen apport-rapport skrevs därför att felmeddelandet indikerar att " "diskutrymmet är slut" -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3475,7 +3493,7 @@ msgstr "" "Ingen apport-rapport skrevs därför att felmeddelandet indikerar att minnet " "är slut" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/th.po b/po/th.po index c5c480595..bb85ebc72 100644 --- a/po/th.po +++ b/po/th.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2012-10-27 22:44+0700\n" "Last-Translator: Theppitak Karoonboonyanan \n" "Language-Team: Thai \n" @@ -91,77 +91,77 @@ msgstr "พื้นที่สำรองทั้งหมด: " msgid "Total space accounted for: " msgstr "พื้นที่ที่นับรวมทั้งหมด: " -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "ข้อมูลแฟ้ม Package %s ไม่ตรงกับความเป็นจริง" -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "ไม่พบแพกเกจ" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 msgid "You must give at least one search pattern" msgstr "คุณต้องระบุแพตเทิร์นสำหรับค้นหาอย่างน้อยหนึ่งแพตเทิร์น" -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "คำสั่งนี้ไม่แนะนำให้ใช้แล้ว กรุณาใช้ 'apt-mark showauto' แทน" -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "ไม่พบแพกเกจ %s" -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "แฟ้มแพกเกจ:" -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 msgid "Cache is out of sync, can't x-ref a package file" msgstr "ข้อมูลแคชไม่ตรงกับความเป็นจริงแล้ว ไม่สามารถอ้างอิงไขว้ระหว่างแฟ้มแพกเกจ" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "แพกเกจที่ถูกตรึง:" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(ไม่พบ)" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr " ที่ติดตั้งอยู่: " -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr " รุ่นที่ติดตั้งได้: " -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(ไม่มี)" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr " การตรึงแพกเกจ: " #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr " ตารางรุ่น:" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s สำหรับ %s คอมไพล์เมื่อ %s %s\n" -#: cmdline/apt-cache.cc:1730 +#: cmdline/apt-cache.cc:1760 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -288,83 +288,101 @@ msgstr "" " -c=? อ่านแฟ้มค่าตั้งที่กำหนด\n" " -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +msgid "[Y/n]" +msgstr "" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" -msgstr "Y" +msgstr "" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" -msgstr "N" +msgstr "" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "คอมไพล์นิพจน์เรกิวลาร์ไม่สำเร็จ - %s" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "แพกเกจต่อไปนี้ขาดแพกเกจที่ต้องใช้:" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "แต่รุ่นที่ติดตั้งไว้คือ %s" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "แต่รุ่นที่จะติดตั้งคือ %s" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "แต่ไม่สามารถติดตั้งได้" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "แต่แพกเกจนี้เป็นแพกเกจเสมือน" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "แต่ได้ติดตั้งไว้" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "แต่แพกเกจนี้จะไม่ถูกติดตั้ง" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr " หรือ" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "จะติดตั้งแพกเกจ *ใหม่* ต่อไปนี้:" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "จะ *ลบ* แพกเกจต่อไปนี้:" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 msgid "The following packages have been kept back:" msgstr "จะคงรุ่นแพกเกจต่อไปนี้:" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ขึ้น:" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ *ลง*:" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "จะเปลี่ยนแปลงรายการคงรุ่นแพกเกจต่อไปนี้:" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s (เนื่องจาก %s) " -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -372,59 +390,59 @@ msgstr "" "*คำเตือน*: แพกเกจที่จำเป็นต่อไปนี้จะถูกถอดถอน\n" "คุณ *ไม่ควร* ทำเช่นนี้ นอกจากคุณเข้าใจสิ่งที่จะทำ!" -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "ปรับรุ่นขึ้น %lu, ติดตั้งใหม่ %lu, " -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "ติดตั้งซ้ำ %lu, " -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "ปรับรุ่นลง %lu, " -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "ถอดถอน %lu และไม่ปรับรุ่น %lu\n" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "ติดตั้งหรือถอดถอนไม่ครบ %lu\n" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "หมายเหตุ: จะเลือก '%s' สำหรับงานติดตั้ง '%s'\n" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "หมายเหตุ: จะเลือก '%s' สำหรับนิพจน์เรกิวลาร์ '%s'\n" -#: cmdline/apt-get.cc:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "แพกเกจ %s เป็นแพกเกจเสมือนที่ตระเตรียมโดย:\n" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr " [ติดตั้งอยู่]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 msgid " [Not candidate version]" msgstr " [ไม่ใช่รุ่นสำหรับติดตั้ง]" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "คุณควรเจาะจงเลือกแพกเกจใดแพกเกจหนึ่งเพื่อติดตั้ง" -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -434,185 +452,185 @@ msgstr "" "ไม่มีแพกเกจ %s ให้ใช้ติดตั้ง แต่ถูกอ้างถึงโดยแพกเกจอื่น\n" "แพกเกจนี้อาจขาดหายไป หรือตกรุ่นไปแล้ว หรืออยู่ในแหล่งอื่น\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "อย่างไรก็ดี แพกเกจต่อไปนี้ได้แทนที่แพกเกจดังกล่าวไปแล้ว:" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, c-format msgid "Package '%s' has no installation candidate" msgstr "แพกเกจ '%s' ไม่มีรุ่นที่จะใช้ติดตั้ง" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "แพกเกจเสมือนอย่าง '%s' ไม่สามารถถอดถอนได้\n" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "แพกเกจ '%s' ไม่ได้ติดตั้งไว้ จึงไม่มีการถอดถอน คุณหมายถึง '%s' หรือเปล่า?\n" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "แพกเกจ '%s' ไม่ได้ติดตั้งไว้ จึงไม่มีการถอดถอน\n" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "หมายเหตุ: จะเลือก '%s' แทน '%s'\n" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "จะข้าม %s เนื่องจากแพกเกจติดตั้งไว้แล้ว และไม่มีการกำหนดให้ปรับรุ่น\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "จะข้าม %s เนื่องจากแพกเกจไม่ได้ติดตั้งไว้ และคำสั่งมีเพียงการปรับรุ่นเท่านั้น\n" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "ไม่สามารถติดตั้ง %s ซ้ำได้ เนื่องจากไม่สามารถดาวน์โหลดได้\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "%s เป็นรุ่นใหม่ล่าสุดอยู่แล้ว\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "กำหนด %s ให้เป็นการติดตั้งแบบเลือกเองแล้ว\n" -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:913 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "เลือกรุ่น '%s' (%s) สำหรับ '%s' แล้ว\n" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "เลือกรุ่น '%s' (%s) สำหรับ '%s' แล้ว อันเนื่องมาจาก '%s'\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "กำลังแก้ปัญหาความขึ้นต่อกันระหว่างแพกเกจ..." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr " ล้มเหลว" -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "ไม่สามารถแก้ปัญหาความขึ้นต่อกันระหว่างแพกเกจได้" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "ไม่สามารถจำกัดรายการปรับรุ่นให้น้อยที่สุดได้" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr " เสร็จแล้ว" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "คุณอาจต้องเรียก 'apt-get -f install' เพื่อแก้ปัญหาเหล่านี้" -#: cmdline/apt-get.cc:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "รายการแพกเกจที่ต้องใช้ไม่ครบ กรุณาลองใช้ตัวเลือก -f" -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 msgid "WARNING: The following packages cannot be authenticated!" msgstr "*คำเตือน*: แพกเกจต่อไปนี้ไม่สามารถยืนยันแหล่งต้นตอได้!" -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "จะข้ามการเตือนเกี่ยวกับการยืนยันแหล่งต้นตอ\n" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " -msgstr "จะติดตั้งแพกเกจเหล่านี้โดยไม่ตรวจสอบหรือไม่ [y/N]? " +#: cmdline/apt-get.cc:1108 +msgid "Install these packages without verification?" +msgstr "จะติดตั้งแพกเกจเหล่านี้โดยไม่ตรวจสอบหรือไม่?" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" msgstr "มีบางแพกเกจไม่สามารถยืนยันแหล่งต้นตอได้" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "มีปัญหาบางประการ และมีการใช้ -y โดยไม่ระบุ --force-yes" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "เกิดข้อผิดพลาดภายใน: มีการเรียก InstallPackages ด้วยแพกเกจที่เสีย!" -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 msgid "Packages need to be removed but remove is disabled." msgstr "มีแพกเกจที่จำเป็นต้องถอดถอน แต่ถูกห้ามการถอดถอนไว้" -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 msgid "Internal error, Ordering didn't finish" msgstr "ข้อผิดพลาดภายใน: การเรียงลำดับไม่เสร็จสิ้น" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "แปลกประหลาด.. ขนาดไม่ตรงกัน กรุณาอีเมลแจ้ง apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "ต้องดาวน์โหลดแพกเกจ %sB/%sB\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "ต้องดาวน์โหลดแพกเกจ %sB\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "หลังจากการกระทำนี้ ต้องใช้เนื้อที่บนดิสก์อีก %sB\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "หลังจากการกระทำนี้ เนื้อที่บนดิสก์จะว่างเพิ่มอีก %sB\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Couldn't determine free space in %s" msgstr "ไม่สามารถคำนวณพื้นที่ว่างใน %s" -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, c-format msgid "You don't have enough free space in %s." msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s" -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Trivial Only ถูกกำหนดไว้ แต่คำสั่งนี้ไม่ใช่คำสั่งเล็กน้อย" #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -623,28 +641,28 @@ msgstr "" "หากต้องการดำเนินการต่อ ให้พิมพ์ประโยค '%s'\n" " ?] " -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "เลิกทำ" -#: cmdline/apt-get.cc:1284 -msgid "Do you want to continue [Y/n]? " -msgstr "คุณต้องการจะดำเนินการต่อไปหรือไม่ [Y/n]?" +#: cmdline/apt-get.cc:1313 +msgid "Do you want to continue?" +msgstr "คุณต้องการจะดำเนินการต่อไปหรือไม่?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "ไม่สามารถดาวน์โหลด %s %s\n" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "ดาวน์โหลดบางแฟ้มไม่สำเร็จ" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "ดาวน์โหลดสำเร็จแล้ว และอยู่ในโหมดดาวน์โหลดอย่างเดียว" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -652,19 +670,19 @@ msgstr "" "ดาวน์โหลดบางแพกเกจไม่สำเร็จ บางที การเรียก apt-get update หรือลองใช้ตัวเลือก --fix-" "missing อาจช่วยได้" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "ยังไม่รองรับ --fix-missing พร้อมกับการเปลี่ยนแผ่น" -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "ไม่สามารถแก้ปัญหาแพกเกจที่ขาดหายได้" -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "จะล้มเลิกการติดตั้ง" -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -675,35 +693,35 @@ msgstr[0] "" "แพกเกจต่อไปนี้ได้หายไปจากระบบของคุณ เพราะแฟ้มทั้งหมดได้ถูกแทนที่\n" "โดยแพกเกจอื่นแล้ว:" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "หมายเหตุ: นี่เป็นสิ่งที่ dpkg ทำโดยอัตโนมัติโดยเจตนา" -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "จะละเลยรุ่นเป้าหมาย '%s' ซึ่งไม่มีอยู่ของแพกเกจ '%s'" -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "จะเลือก '%s' เป็นแพกเกจซอร์สแทน '%s'\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "จะละเลยรุ่น '%s' ที่ไม่มีอยู่ของแพกเกจ '%s'" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr "คำสั่ง update ไม่รับอาร์กิวเมนต์เพิ่ม" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "apt ถูกกำหนดไม่ให้มีการลบใดๆ จึงไม่สามารถดำเนินการถอดถอนอัตโนมัติได้" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -721,15 +739,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 msgid "The following information may help to resolve the situation:" msgstr "ข้อมูลต่อไปนี้อาจช่วยแก้ปัญหาได้:" -#: cmdline/apt-get.cc:1824 +#: cmdline/apt-get.cc:1853 msgid "Internal Error, AutoRemover broke stuff" msgstr "เกิดข้อผิดพลาดภายใน: AutoRemover ทำความเสียหาย" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -737,27 +755,27 @@ msgid_plural "" "required:" msgstr[0] "แพกเกจต่อไปนี้ถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" "%lu packages were automatically installed and are no longer required.\n" msgstr[0] "มีแพกเกจ %lu แพกเกจถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว\n" -#: cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1866 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "ใช้ 'apt-get autoremove' เพื่อถอดถอนแพกเกจดังกล่าวได้" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "เกิดข้อผิดพลาดภายใน: AllUpgrade ทำความเสียหาย" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1984 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "คุณอาจเรียก 'apt-get -f install' เพื่อแก้ปัญหานี้ได้:" -#: cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -765,7 +783,7 @@ msgstr "" "มีปัญหาความขึ้นต่อกันระหว่างแพกเกจ กรุณาลองใช้ 'apt-get -f install' โดยไม่ระบุแพกเกจ " "(หรือจะระบุทางแก้ก็ได้)" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:2002 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" @@ -776,78 +794,78 @@ msgstr "" "หรือถ้าคุณกำลังใช้รุ่น unstable ก็เป็นไปได้ว่าแพกเกจที่จำเป็นบางรายการ\n" "ยังไม่ถูกสร้างขึ้น หรือถูกย้ายออกจาก Incoming" -#: cmdline/apt-get.cc:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "แพกเกจมีปัญหา" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "จะติดตั้งแพกเกจเพิ่มเติมต่อไปนี้:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "แพกเกจที่แนะนำ:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "แพกเกจที่ควรใช้ร่วมกัน:" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "ไม่พบแพกเกจ %s" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "กำหนด %s ให้เป็นการติดตั้งแบบอัตโนมัติแล้ว\n" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "คำสั่งนี้ไม่แนะนำให้ใช้แล้ว กรุณาใช้ 'apt-mark auto' และ 'apt-mark manual' แทน" -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "กำลังคำนวณการปรับรุ่น... " -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "ล้มเหลว" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "เสร็จแล้ว" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 msgid "Internal error, problem resolver broke stuff" msgstr "เกิดข้อผิดพลาดภายใน: กลไกการแก้ปัญหาทำความเสียหาย" -#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "ไม่สามารถล็อคไดเรกทอรีดาวน์โหลด" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "ไม่พบแหล่งที่จะดาวน์โหลดรุ่น '%s' ของ '%s' ได้" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "กำลังดาวน์โหลด %s %s" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 msgid "Must specify at least one package to fetch source for" msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะดาวน์โหลดซอร์สโค้ด" -#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, c-format msgid "Unable to find a source package for %s" msgstr "ไม่พบแพกเกจซอร์สโค้ดสำหรับ %s" -#: cmdline/apt-get.cc:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -856,7 +874,7 @@ msgstr "" "ข้อสังเกต: การจัดทำแพกเกจ '%s' พัฒนาผ่านระบบควบคุมรุ่น '%s' อยู่ที่:\n" "%s\n" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, c-format msgid "" "Please use:\n" @@ -867,68 +885,68 @@ msgstr "" "bzr branch %s\n" "เพื่อดึงรุ่นล่าสุด (ที่อาจยังไม่ปล่อยออกมา) ของตัวแพกเกจ\n" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "จะข้ามแฟ้ม '%s' ที่ดาวน์โหลดไว้แล้ว\n" -#: cmdline/apt-get.cc:2604 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2644 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB/%sB\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2649 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB\n" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "ดาวน์โหลดซอร์ส %s\n" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "ไม่สามารถดาวน์โหลดบางแฟ้ม" -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "จะข้ามการแตกซอร์สของซอร์สที่แตกไว้แล้วใน %s\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "คำสั่งแตกแฟ้ม '%s' ล้มเหลว\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "กรุณาตรวจสอบว่าได้ติดตั้งแพกเกจ 'dpkg-dev' แล้ว\n" -#: cmdline/apt-get.cc:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "คำสั่ง build '%s' ล้มเหลว\n" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "โพรเซสลูกล้มเหลว" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 msgid "Must specify at least one package to check builddeps for" msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะตรวจสอบสิ่งที่ต้องการสำหรับการ build" -#: cmdline/apt-get.cc:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -936,17 +954,17 @@ msgid "" msgstr "" "ไม่มีข้อมูลสถาปัตยกรรมสำหรับ %s ดูวิธีตั้งค่าที่หัวข้อ APT::Architectures ของ apt.conf(5)" -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "ไม่สามารถอ่านข้อมูลสิ่งที่ต้องการสำหรับการ build ของ %s" -#: cmdline/apt-get.cc:2839 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr "%s ไม่ต้องการสิ่งใดสำหรับ build\n" -#: cmdline/apt-get.cc:3009 +#: cmdline/apt-get.cc:3040 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -954,19 +972,19 @@ msgid "" msgstr "" "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่สามารถใช้ %s กับแพกเกจ '%s' ได้" -#: cmdline/apt-get.cc:3027 +#: cmdline/apt-get.cc:3058 #, 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:3050 +#: cmdline/apt-get.cc:3081 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: แพกเกจ %s ที่ติดตั้งไว้ใหม่เกินไป" -#: cmdline/apt-get.cc:3089 +#: cmdline/apt-get.cc:3120 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -975,37 +993,37 @@ msgstr "" "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่มีแพกเกจ %s " "รุ่นที่จะสอดคล้องกับความต้องการรุ่นของแพกเกจได้" -#: cmdline/apt-get.cc:3095 +#: cmdline/apt-get.cc:3126 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะ %s ไม่มีรุ่นที่ติดตั้งได้" -#: cmdline/apt-get.cc:3118 +#: cmdline/apt-get.cc:3149 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3164 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "ไม่สามารถติดตั้งสิ่งที่จำเป็นสำหรับการ build ของ %s ได้" -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "ติดตั้งสิ่งที่จำเป็นสำหรับการ build ไม่สำเร็จ" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, c-format msgid "Changelog for %s (%s)" msgstr "ปูมการแก้ไขสำหรับ %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "มอดูลที่รองรับ:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1092,7 +1110,7 @@ msgstr "" "และ apt.conf(5)\n" " APT นี้มีพลังของ Super Cow\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1167,8 +1185,8 @@ msgid "%s was already not hold.\n" msgstr "%s ไม่ได้คงรุ่นอยู่ก่อนแล้ว\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr "รอโพรเซส %s แต่ตัวโพรเซสไม่อยู่" @@ -1251,7 +1269,7 @@ msgstr "ไม่สามารถเลิกเมานท์ซีดีร msgid "Disk not found." msgstr "ไม่พบแผ่น" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "ไม่พบแฟ้ม" @@ -1312,7 +1330,7 @@ msgstr "คำสั่งสคริปต์เข้าระบบ '%s' ล msgid "TYPE failed, server said: %s" msgstr "TYPE ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "หมดเวลารอเชื่อมต่อ" @@ -1320,8 +1338,8 @@ msgstr "หมดเวลารอเชื่อมต่อ" msgid "Server closed the connection" msgstr "เซิร์ฟเวอร์ปิดการเชื่อมต่อ" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "การอ่านข้อมูลผิดพลาด" @@ -1333,86 +1351,86 @@ msgstr "คำตอบท่วมบัฟเฟอร์" msgid "Protocol corruption" msgstr "มีความเสียหายของโพรโทคอล" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "การเขียนข้อมูลผิดพลาด" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "ไม่สามารถสร้างซ็อกเก็ต" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "ไม่สามารถเชื่อมต่อซ็อกเก็ตข้อมูล เนื่องจากหมดเวลาคอย" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "ไม่สามารถเชื่อมต่อซ็อกเกตแบบ passive" -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo ไม่สามารถนำซ็อกเก็ตที่รอรับการเชื่อมต่อมาใช้" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "ไม่สามารถ bind ซ็อกเก็ต" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "ไม่สามารถ listen ที่ซ็อกเก็ต" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "ไม่สามารถระบุชื่อซ็อกเก็ต" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "ไม่สามารถส่งคำสั่ง PORT" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "ไม่รู้จักตระกูลที่อยู่ %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "หมดเวลารอเชื่อมต่อซ็อกเก็ตข้อมูล" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "ไม่สามารถรับการเชื่อมต่อ" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "เกิดปัญหาขณะคำนวณค่าแฮชของแฟ้ม" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "ไม่สามารถดาวน์โหลดแฟ้ม เซิร์ฟเวอร์ตอบว่า: '%s'" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "หมดเวลาคอยที่ซ็อกเก็ตข้อมูล" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "ถ่ายโอนข้อมูลไม่สำเร็จ เซิร์ฟเวอร์ตอบว่า '%s'" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "สอบถาม" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "ไม่สามารถเรียก " @@ -1448,7 +1466,7 @@ msgstr "ไม่สามารถเชื่อมต่อไปยัง %s #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "เชื่อมต่อไปยัง %s" @@ -1478,36 +1496,36 @@ msgstr "เกิดปัญหาร้ายแรงบางอย่าง msgid "Unable to connect to %s:%s:" msgstr "ไม่สามารถเชื่อมต่อไปยัง %s:%s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:167 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "ข้อผิดพลาดภายใน: ลายเซ็นใช้การได้ แต่ไม่สามารถระบุลายนิ้วมือของกุญแจ?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "พบลายเซ็นที่ใช้การไม่ได้อย่างน้อยหนึ่งรายการ" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:173 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "ไม่สามารถเรียก 'gpgv' เพื่อตรวจสอบลายเซ็น (ได้ติดตั้ง gpgv ไว้หรือไม่?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุขณะเรียก gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 msgid "The following signatures were invalid:\n" msgstr "ลายเซ็นต่อไปนี้ใช้การไม่ได้:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1545,59 +1563,59 @@ msgstr "การสนับสนุน Content-Range ที่เซิร์ msgid "Unknown date format" msgstr "พบรูปแบบวันที่ที่ไม่รู้จัก" -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "select ไม่สำเร็จ" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "หมดเวลารอเชื่อมต่อ" -#: methods/http.cc:855 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้มผลลัพธ์" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม" -#: methods/http.cc:928 +#: methods/http.cc:927 msgid "Error reading from server. Remote end closed connection" msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์ ปลายทางอีกด้านหนึ่งปิดการเชื่อมต่อ" -#: methods/http.cc:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์" -#: methods/http.cc:1198 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "ข้อมูลส่วนหัวผิดพลาด" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "เชื่อมต่อไม่สำเร็จ" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "ข้อผิดพลาดภายใน" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "ไม่สามารถอ่าน %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1647,7 +1665,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "ไม่สามารถสร้างไปป์ IPC ไปยังโพรเซสย่อย" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "การเชื่อมต่อถูกปิดก่อนเวลาอันควร" @@ -2118,11 +2136,11 @@ msgstr "ข้อมูลส่วนหัว %s ของสมาชิก msgid "Invalid archive member header" msgstr "ข้อมูลส่วนหัวของสมาชิกแฟ้มจัดเก็บไม่ถูกต้อง" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "แฟ้มจัดเก็บสั้นเกินไป" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "อ่านข้อมูลส่วนหัวของแฟ้มจัดเก็บไม่สำเร็จ" @@ -2446,7 +2464,7 @@ msgstr "ไม่รู้จักคำสั่ง %s" msgid "Unable to stat the mount point %s" msgstr "ไม่สามารถ stat จุดเมานท์ %s" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "ไม่สามารถ stat ซีดีรอม" @@ -2465,101 +2483,101 @@ msgstr "จะไม่ใช้การล็อคกับแฟ้มล็ msgid "Could not open lock file %s" msgstr "ไม่สามารถเปิดแฟ้มล็อค %s" -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "จะไม่ใช้การล็อคกับแฟ้มล็อค %s ที่เมานท์ผ่าน nfs" -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "ไม่สามารถล็อค %s" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "ไม่สามารถสร้างรายชื่อแฟ้มได้ เนื่องจาก '%s' ไม่ใช่ไดเรกทอรี" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "จะละเลย '%s' ในไดเรกทอรี '%s' เนื่องจากไม่ใช่แฟ้มธรรมดา" -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "จะละเลย '%s' ในไดเรกทอรี '%s' เนื่องจากไม่มีส่วนขยายในชื่อแฟ้ม" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "จะละเลย '%s' ในไดเรกทอรี '%s' เนื่องจากส่วนขยายในชื่อแฟ้มไม่สามารถใช้การได้" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "โพรเซสย่อย %s เกิดข้อผิดพลาดของการใช้ย่านหน่วยความจำ (segmentation fault)" -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, c-format msgid "Sub-process %s received signal %u." msgstr "โพรเซสย่อย %s ได้รับสัญญาณ %u" -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "โพรเซสย่อย %s คืนค่าข้อผิดพลาด (%u)" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "โพรเซสย่อย %s จบการทำงานกะทันหัน" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "ไม่สามารถเปิดแฟ้ม %s" -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, c-format msgid "Could not open file descriptor %d" msgstr "ไม่สามารถเปิด file destriptor %d" -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "สร้าง IPC ของโพรเซสย่อยไม่สำเร็จ" -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "เรียกทำงานตัวบีบอัดไม่สำเร็จ" -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, c-format msgid "read, still have %llu to read but none left" msgstr "read: ยังเหลือ %llu ที่ยังไม่ได้อ่าน แต่ข้อมูลหมดแล้ว" -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "write: ยังเหลือ %llu ที่ยังไม่ได้เขียน แต่ไม่สามารถเขียนได้" -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, c-format msgid "Problem closing the file %s" msgstr "เกิดปัญหาขณะปิดแฟ้ม %s" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, c-format msgid "Problem renaming the file %s to %s" msgstr "เกิดปัญหาขณะเปลี่ยนชื่อแฟ้ม %s ไปเป็น %s" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, c-format msgid "Problem unlinking the file %s" msgstr "เกิดปัญหาขณะลบแฟ้ม %s" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "เกิดปัญหาขณะ sync แฟ้ม" @@ -2756,7 +2774,7 @@ msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล msgid "Type '%s' is not known on line %u in source list %s" msgstr "ไม่รู้จักชนิด '%s' ที่บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2765,12 +2783,12 @@ msgstr "" "ไม่สามารถตั้งค่า '%s' แบบทันทีได้ กรุณาอ่านรายละเอียดเพิ่มเติมจาก man 5 apt.conf ที่หัวข้อ " "APT::Immediate-Configure (%d)" -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, c-format msgid "Could not configure '%s'. " msgstr "ไม่สามารถตั้งค่า '%s'" -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2793,7 +2811,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "จำเป็นต้องติดตั้งแพกเกจ %s ซ้ำ แต่หาตัวแพกเกจไม่พบ" -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2801,11 +2819,11 @@ msgstr "" "ข้อผิดพลาด: pkgProblemResolver::Resolve สร้างคำตอบที่ทำให้เกิดแพกเกจเสีย " "อาจเกิดจากแพกเกจที่ถูกกำหนดให้คงรุ่นไว้" -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "ไม่สามารถแก้ปัญหาได้ คุณได้คงรุ่นแพกเกจที่เสียอยู่ไว้" -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2971,12 +2989,12 @@ msgstr "เปลี่ยนชื่อไม่สำเร็จ: %s (%s -> msgid "MD5Sum mismatch" msgstr "MD5Sum ไม่ตรงกัน" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 msgid "Hash Sum mismatch" msgstr "ผลรวมแฮชไม่ตรงกัน" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -2985,16 +3003,16 @@ msgstr "" "ไม่พบรายการ '%s' ที่ต้องการในแฟ้ม Release (รายการ sources.list ไม่ถูกต้อง " "หรือแฟ้มผิดรูปแบบ)" -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "ไม่พบผลรวมแฮชสำหรับ '%s' ในแฟ้ม Release" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "ไม่มีกุญแจสาธารณะสำหรับกุญแจหมายเลขต่อไปนี้:\n" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3003,12 +3021,12 @@ msgstr "" "แฟ้ม Release สำหรับ %s หมดอายุแล้ว (ตั้งแต่ %s ที่แล้ว) จะไม่ใช้รายการปรับรุ่นต่างๆ " "ของคลังแพกเกจนี้" -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "ชุดจัดแจกขัดแย้งกัน: %s (ต้องการ %s แต่พบ %s)" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3018,32 +3036,32 @@ msgstr "" "ข้อผิดพลาดจาก GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "ข้อผิดพลาดจาก GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "ไม่พบแฟ้มสำหรับแพกเกจ %s คุณอาจต้องแก้ปัญหาแพกเกจนี้เอง (ไม่มี arch)" -#: apt-pkg/acquire-item.cc:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package." msgstr "ไม่พบแฟ้มสำหรับแพกเกจ %s คุณอาจต้องแก้ปัญหาแพกเกจนี้เอง" -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "แฟ้มดัชนีแพกเกจเสียหาย ไม่มีข้อมูล Filename: (ชื่อแฟ้ม) สำหรับแพกเกจ %s" -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "ขนาดไม่ตรงกัน" @@ -3165,22 +3183,22 @@ msgstr "กำลังเขียนรายชื่อแหล่งแพ msgid "Source list entries for this disc are:\n" msgstr "บรรทัดรายชื่อแหล่งแพกเกจสำหรับแผ่นนี้คือ:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "เขียนแล้ว %i ระเบียน\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มขาดหาย %i แฟ้ม\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มผิดขนาด %i แฟ้ม\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มขาดหาย %i แฟ้ม และแฟ้มผิดขนาด %i แฟ้ม\n" @@ -3268,12 +3286,12 @@ msgstr "เรียกกลไกการแก้ปัญหาภายน msgid "Installing %s" msgstr "กำลังติดตั้ง %s" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr "กำลังตั้งค่า %s" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr "กำลังถอดถอน %s" @@ -3294,99 +3312,99 @@ msgid "Running post-installation trigger %s" msgstr "กำลังเรียกการสะกิด %s หลังการติดตั้ง" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, c-format msgid "Directory '%s' missing" msgstr "ไม่มีไดเรกทอรี '%s'" -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, c-format msgid "Could not open file '%s'" msgstr "ไม่สามารถเปิดแฟ้ม '%s'" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr "กำลังเตรียม %s" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr "กำลังแตกแพกเกจ %s" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "กำลังเตรียมตั้งค่า %s" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr "ติดตั้ง %s แล้ว" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "กำลังเตรียมถอดถอน %s" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr "ถอดถอน %s แล้ว" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "กำลังเตรียมถอดถอน %s อย่างสมบูรณ์" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr "ถอดถอน %s อย่างสมบูรณ์แล้ว" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "ไม่สามารถเขียนบันทึกปฏิบัติการ เนื่องจาก openpty() ล้มเหลว (ไม่ได้เมานท์ /dev/pts " "หรือเปล่า?)\n" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "กำลังเรียก dpkg" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "ปฏิบัติการถูกขัดจังหวะก่อนที่จะสามารถทำงานเสร็จ" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "ไม่มีการเขียนรายงาน apport เพราะถึงขีดจำกัด MaxReports แล้ว" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "มีปัญหาความขึ้นต่อกัน - จะทิ้งไว้โดยไม่ตั้งค่า" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเป็นสิ่งที่ตามมาจากข้อผิดพลาดก่อนหน้า" -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากดิสก์เต็ม" -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากหน่วยความจำเต็ม" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/tl.po b/po/tl.po index f5059f3e8..e2cb94d3f 100644 --- a/po/tl.po +++ b/po/tl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2007-03-29 21:36+0800\n" "Last-Translator: Eric Pareja \n" "Language-Team: Tagalog \n" @@ -96,78 +96,78 @@ msgstr "Kabuuan ng Hindi Nagamit na puwang: " msgid "Total space accounted for: " msgstr "Kabuuan ng puwang na napag-tuosan: " -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "Wala sa sync ang talaksan ng paketeng %s." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Walang nahanap na mga pakete" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 #, fuzzy msgid "You must give at least one search pattern" msgstr "Kailangan niyong magbigay ng isa lamang na pattern" -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Hindi mahanap ang paketeng %s" -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "Talaksang Pakete:" -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Wala sa sync ang cache, hindi ma-x-ref ang talaksang pakete" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "Mga naka-Pin na Pakete:" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(hindi nahanap)" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr " Nakaluklok: " -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr " Kandidato: " -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(wala)" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr " Naka-Pin na Pakete: " #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr " Talaang Bersyon:" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format 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:1730 +#: cmdline/apt-cache.cc:1760 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -301,83 +301,101 @@ msgstr "" " -c=? Basahin itong talaksang pagkaayos\n" " -o=? Itakda ang isang option sa pagkaayos, hal. -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +msgid "[Y/n]" +msgstr "[O/h]" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "[o/H]" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" msgstr "O" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" -msgstr "" +msgstr "H" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Error sa pag-compile ng regex - %s" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "Ang sumusunod na mga pakete ay may kulang na dependensiya:" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "ngunit ang %s ay nakaluklok" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "ngunit ang %s ay iluluklok" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "ngunit hindi ito maaaring iluklok" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "ngunit ito ay birtwal na pakete" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "ngunit ito ay hindi nakaluklok" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "ngunit ito ay hindi iluluklok" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr " o" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "Ang sumusunod na mga pakete ay TATANGGALIN:" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 msgid "The following packages have been kept back:" msgstr "Ang sumusunod na mga pakete ay hinayaang maiwanan:" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "Ang susunod na mga pakete ay iu-upgrade:" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "Ang susunod na mga pakete ay ida-DOWNGRADE:" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "Ang susunod na mga hinawakang mga pakete ay babaguhin:" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s (dahil sa %s) " -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -385,60 +403,60 @@ msgstr "" "BABALA: Ang susunod na mga paketeng esensyal ay tatanggalin.\n" "HINDI ito dapat gawin kung hindi niyo alam ng husto ang inyong ginagawa!" -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu na nai-upgrade, %lu na bagong luklok, " -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "%lu iniluklok muli, " -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "%lu nai-downgrade, " -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu na tatanggalin at %lu na hindi inupgrade\n" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, fuzzy, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "Paunawa, pinili ang %s para sa regex '%s'\n" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, fuzzy, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "Paunawa, pinili ang %s para sa regex '%s'\n" -#: cmdline/apt-get.cc:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Ang paketeng %s ay paketeng birtwal na bigay ng:\n" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr " [Nakaluklok]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 #, fuzzy msgid " [Not candidate version]" msgstr "Bersyong Kandidato" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "Dapat kayong mamili ng isa na iluluklok." -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -449,138 +467,138 @@ msgstr "" "Maaaring nawawala ang pakete, ito'y laos na, o ito'y makukuha lamang\n" "sa ibang pinagmulan.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "Gayunpaman, ang sumusunod na mga pakete ay humahalili sa kanya:" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, fuzzy, c-format msgid "Package '%s' has no installation candidate" msgstr "Ang paketeng %s ay walang kandidatong maaaring instolahin" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "Hindi nakaluklok ang paketeng %s, kaya't hindi ito tinanggal\n" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "Hindi nakaluklok ang paketeng %s, kaya't hindi ito tinanggal\n" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, fuzzy, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "Paunawa, pinili ang %s imbes na %s\n" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Linaktawan ang %s, ito'y nakaluklok na at hindi nakatakda ang upgrade.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, fuzzy, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "" "Linaktawan ang %s, ito'y nakaluklok na at hindi nakatakda ang upgrade.\n" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Ang pagluklok muli ng %s ay hindi maaari, hindi ito makuha.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ay pinakabagong bersyon na.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ngunit ang %s ay iluluklok" -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:913 #, fuzzy, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "Ang napiling bersyon %s (%s) para sa %s\n" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, fuzzy, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "Ang napiling bersyon %s (%s) para sa %s\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "Inaayos ang mga dependensiya..." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr " ay bigo." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "Hindi maayos ang mga dependensiya" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "Hindi mai-minimize ang upgrade set" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr " Tapos" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Maaari ninyong patakbuhin ang 'apt-get -f install' upang ayusin ito." -#: cmdline/apt-get.cc:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "May mga kulang na dependensiya. Subukan niyong gamitin ang -f." -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" "BABALA: Ang susunod na mga pakete ay hindi matiyak ang pagka-awtentiko!" -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "" "Ipina-walang-bisa ang babala tungkol sa pagka-awtentiko ng mga pakete.\n" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " -msgstr "Iluklok ang mga paketeng ito na walang beripikasyon [o/H]? " +#: cmdline/apt-get.cc:1108 +msgid "Install these packages without verification?" +msgstr "Iluklok ang mga paketeng ito na walang beripikasyon?" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" msgstr "May mga paketeng hindi matiyak ang pagka-awtentiko" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "May mga problema at -y ay ginamit na walang --force-yes" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "Error na internal, tinawagan ang InstallPackages na may sirang mga pakete!" -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 msgid "Packages need to be removed but remove is disabled." msgstr "" "May mga paketeng kailangang tanggalin ngunit naka-disable ang Tanggal/Remove." -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 msgid "Internal error, Ordering didn't finish" msgstr "Error na internal, hindi natapos ang pagsaayos na pagkasunud-sunod" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Nakapagtataka.. Hindi magkatugma ang laki, mag-email sa apt@packages.debian." @@ -588,21 +606,21 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Kailangang kumuha ng %sB/%sB ng arkibo.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Kailangang kumuha ng %sB ng arkibo.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, fuzzy, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" @@ -610,33 +628,33 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, fuzzy, c-format 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:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Couldn't determine free space in %s" msgstr "Hindi matantsa ang libreng puwang sa %s" -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, c-format msgid "You don't have enough free space in %s." msgstr "Kulang kayo ng libreng puwang sa %s." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Tinakdang Trivial Only ngunit hindi ito operasyong trivial." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "Oo, gawin ang sinasabi ko!" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -647,28 +665,28 @@ msgstr "" "Upang magpatuloy, ibigay ang pariralang '%s'\n" " ?] " -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "Abort." -#: cmdline/apt-get.cc:1284 -msgid "Do you want to continue [Y/n]? " -msgstr "Nais niyo bang magpatuloy [O/h]? " +#: cmdline/apt-get.cc:1313 +msgid "Do you want to continue?" +msgstr "Nais niyo bang magpatuloy?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Bigo sa pagkuha ng %s %s\n" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "May mga talaksang hindi nakuha" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -676,19 +694,19 @@ msgstr "" "Hindi nakuha ang ilang mga arkibo, maaaring patakbuhin ang apt-get update o " "subukang may --fix-missing?" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing at pagpalit ng media ay kasalukuyang hindi suportado" -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "Hindi maayos ang mga kulang na pakete." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "Ina-abort ang pag-instol." -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -698,35 +716,35 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Hindi ma-stat ang talaan ng pagkukunan ng pakete %s" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -742,17 +760,17 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 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:1824 +#: cmdline/apt-get.cc:1853 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Error na internal, may nasira ang problem resolver" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -762,7 +780,7 @@ msgid_plural "" msgstr[0] "Ang sumusunod na mga paketeng BAGO ay iluluklok:" msgstr[1] "Ang sumusunod na mga paketeng BAGO ay iluluklok:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -770,22 +788,22 @@ msgid_plural "" msgstr[0] "Ang sumusunod na mga paketeng BAGO ay iluluklok:" msgstr[1] "Ang sumusunod na mga paketeng BAGO ay iluluklok:" -#: cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1866 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1984 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:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -793,7 +811,7 @@ msgstr "" "May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang " "mga pakete (o magtakda ng solusyon)." -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:2002 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" @@ -804,85 +822,85 @@ 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:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "Sirang mga pakete" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "Ang mga sumusunod na extra na pakete ay luluklokin:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "Mga paketeng mungkahi:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "Mga paketeng rekomendado:" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "Hindi mahanap ang paketeng %s" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "ngunit ang %s ay iluluklok" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "Sinusuri ang pag-upgrade... " -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "Bigo" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "Tapos" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 msgid "Internal error, problem resolver broke stuff" msgstr "Error na internal, may nasira ang problem resolver" -#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "Hindi maaldaba ang directory ng download" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 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:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, c-format msgid "Unable to find a source package for %s" msgstr "Hindi mahanap ang paketeng source para sa %s" -#: cmdline/apt-get.cc:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, c-format msgid "" "Please use:\n" @@ -890,85 +908,85 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Linaktawan ang nakuha na na talaksan '%s'\n" -#: cmdline/apt-get.cc:2604 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr "Kulang kayo ng libreng puwang sa %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2644 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Kailangang kumuha ng %sB/%sB ng arkibong source.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2649 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Kailangang kumuha ng %sB ng arkibong source.\n" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "Kunin ang Source %s\n" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "Bigo sa pagkuha ng ilang mga arkibo." -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, 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:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Bigo ang utos ng pagbuklat '%s'.\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, 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:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "Utos na build '%s' ay bigo.\n" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "Bigo ang prosesong anak" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 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:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, 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:2839 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr "Walang build depends ang %s.\n" -#: cmdline/apt-get.cc:3009 +#: cmdline/apt-get.cc:3040 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -977,7 +995,7 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi " "mahanap" -#: cmdline/apt-get.cc:3027 +#: cmdline/apt-get.cc:3058 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -986,14 +1004,14 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi " "mahanap" -#: cmdline/apt-get.cc:3050 +#: cmdline/apt-get.cc:3081 #, 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:3089 +#: cmdline/apt-get.cc:3120 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1002,7 +1020,7 @@ 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:3095 +#: cmdline/apt-get.cc:3126 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1011,30 +1029,30 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi " "mahanap" -#: cmdline/apt-get.cc:3118 +#: cmdline/apt-get.cc:3149 #, 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:3133 +#: cmdline/apt-get.cc:3164 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Hindi mabuo ang build-dependencies para sa %s." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "Bigo sa pagproseso ng build dependencies" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Kumokonekta sa %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "Suportadong mga Module:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1119,7 +1137,7 @@ msgstr "" "para sa karagdagang impormasyon at mga option.\n" " Ang APT na ito ay may Kapangyarihan Super Kalabaw.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1190,8 +1208,8 @@ msgid "%s was already not hold.\n" msgstr "%s ay pinakabagong bersyon na.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Naghintay, para sa %s ngunit wala nito doon" @@ -1258,7 +1276,7 @@ msgstr "Hindi mai-unmount ang CD-ROM sa %s, maaaring ginagamit pa ito." msgid "Disk not found." msgstr "Hindi nahanap ang Disk." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "Hindi Nahanap ang Talaksan" @@ -1321,7 +1339,7 @@ msgstr "Bigo ang utos sa login script '%s', sabi ng server ay: %s" msgid "TYPE failed, server said: %s" msgstr "Bigo ang TYPE, sabi ng server ay: %s" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "Lumipas ang koneksyon" @@ -1329,8 +1347,8 @@ msgstr "Lumipas ang koneksyon" msgid "Server closed the connection" msgstr "Sinarhan ng server ang koneksyon" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "Error sa pagbasa" @@ -1342,86 +1360,86 @@ msgstr "May sagot na bumubo sa buffer." msgid "Protocol corruption" msgstr "Sira ang protocol" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "Error sa pagsulat" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "Hindi maka-likha ng socket" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "Hindi maka-konekta sa socket ng datos, nag-time-out ang koneksyon" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "Hindi maka-konekta sa socket na passive." -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "di makakuha ang getaddrinfo ng socket na nakikinig" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "Hindi maka-bind ng socket" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "Hindi makarinig sa socket" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "Hindi malaman ang pangalan ng socket" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "Hindi makapagpadala ng utos na PORT" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Di kilalang pamilya ng address %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "Bigo ang EPRT, sabi ng server ay: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "Nag-timeout ang socket ng datos" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "Hindi makatanggap ng koneksyon" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "Problema sa pag-hash ng talaksan" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Hindi makakuha ng talaksan, sabi ng server ay '%s'" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "Nag-timeout ang socket ng datos" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Bigo ang paglipat ng datos, sabi ng server ay '%s'" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "Tanong" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "Hindi ma-invoke " @@ -1457,7 +1475,7 @@ msgstr "Hindi maka-konekta sa %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "Kumokonekta sa %s" @@ -1487,40 +1505,40 @@ 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:166 +#: methods/gpgv.cc:167 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:170 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Hindi kukulang sa isang hindi tanggap na lagda ang na-enkwentro." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:173 #, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Hindi maitakbo ang '%s' upang maberipika ang lagda (nakaluklok ba ang gpgv?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "Hindi kilalang error sa pag-execute ng gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 msgid "The following signatures were invalid:\n" msgstr "Ang sumusunod na mga lagda ay imbalido:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1560,59 +1578,59 @@ msgstr "Sira ang range support ng HTTP server na ito" msgid "Unknown date format" msgstr "Di kilalang anyo ng petsa" -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "Bigo ang pagpili" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "Nag-timeout ang koneksyon" -#: methods/http.cc:855 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "Error sa pagsulat ng talaksang output" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "Error sa pagsulat sa talaksan" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "Error sa pagsusulat sa talaksan" -#: methods/http.cc:928 +#: methods/http.cc:927 msgid "Error reading from server. Remote end closed connection" msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon" -#: methods/http.cc:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "Error sa pagbasa mula sa server" -#: methods/http.cc:1198 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "Maling datos sa panimula" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "Bigo ang koneksyon" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "Internal na error" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "Hindi mabasa ang %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1661,7 +1679,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "Bigo sa paglikha ng IPC pipe sa subprocess" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "Nagsara ng maaga ang koneksyon" @@ -2149,11 +2167,11 @@ msgstr "Hindi tanggap na header ng miyembro ng arkibo" msgid "Invalid archive member header" msgstr "Hindi tanggap na header ng miyembro ng arkibo" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "Bitin ang arkibo. Sobrang iksi." -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "Bigo ang pagbasa ng header ng arkibo" @@ -2483,7 +2501,7 @@ msgstr "Di tanggap na operasyon %s" msgid "Unable to stat the mount point %s" msgstr "Di mai-stat ang mount point %s" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "Bigo sa pag-stat ng cdrom" @@ -2503,103 +2521,103 @@ msgstr "" msgid "Could not open lock file %s" msgstr "Hindi mabuksan ang talaksang aldaba %s" -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Hindi gumagamit ng pag-aldaba para sa talaksang aldaba %s na naka-mount sa " "nfs" -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "hindi makuha ang aldaba %s" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Nakatanggap ang sub-process %s ng segmentation fault." -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Nakatanggap ang sub-process %s ng segmentation fault." -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Naghudyat ang sub-process %s ng error code (%u)" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Ang sub-process %s ay lumabas ng di inaasahan" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "Hindi mabuksan ang talaksang %s" -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "Hindi makapag-bukas ng pipe para sa %s" -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "Bigo ang paglikha ng subprocess IPC" -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "Bigo ang pag-exec ng taga-compress" -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "pagbasa, mayroong %lu na babasahin ngunit walang natira" -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "pagsulat, mayroon pang %lu na isusulat ngunit hindi makasulat" -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Problema sa pagsara ng talaksan" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Problema sa pag-sync ng talaksan" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Problema sa pag-unlink ng talaksan" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "Problema sa pag-sync ng talaksan" @@ -2798,19 +2816,19 @@ msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (uri)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Hindi mabuksan ang talaksang %s" -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2835,7 +2853,7 @@ msgstr "" "Kailangan ma-instol muli ang paketeng %s, ngunit hindi ko mahanap ang arkibo " "para dito." -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2843,12 +2861,12 @@ msgstr "" "Error, pkgProblemResolver::Resolve ay naghudyat ng mga break, maaaring dulot " "ito ng mga paketeng naka-hold." -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Hindi maayos ang mga problema, mayroon kayong sirang mga pakete na naka-hold." -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3024,41 +3042,41 @@ msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "Di tugmang MD5Sum" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 #, fuzzy msgid "Hash Sum mismatch" msgstr "Di tugmang MD5Sum" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Hindi ma-parse ang talaksang pakete %s (1)" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "Walang public key na magamit para sa sumusunod na key ID:\n" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3066,12 +3084,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3080,7 +3098,7 @@ msgstr "" "Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin " "niyong ayusin ng de kamay ang paketeng ito. (dahil sa walang arch)" -#: apt-pkg/acquire-item.cc:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3089,7 +3107,7 @@ msgstr "" "Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin " "niyong ayusin ng de kamay ang paketeng ito." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3097,7 +3115,7 @@ msgstr "" "Sira ang talaksang index ng mga pakete. Walang Filename: field para sa " "paketeng %s." -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "Di tugmang laki" @@ -3220,22 +3238,22 @@ msgstr "Sinusulat ang bagong listahan ng pagkukunan\n" msgid "Source list entries for this disc are:\n" msgstr "Mga nakatala sa Listahan ng Source para sa Disc na ito ay:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "Nagsulat ng %i na record.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Nagsulat ng %i na record na may %i na talaksang kulang.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Nagsulat ng %i na record na may %i na talaksang mismatch\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3324,12 +3342,12 @@ msgstr "" msgid "Installing %s" msgstr "Iniluklok ang %s" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr "Isasaayos ang %s" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr "Tinatanggal ang %s" @@ -3350,96 +3368,96 @@ msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Nawawala ang directory ng talaan %spartial." -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Hindi mabuksan ang talaksang %s" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr "Hinahanda ang %s" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr "Binubuklat ang %s" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "Hinahanda ang %s upang isaayos" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr "Iniluklok ang %s" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "Naghahanda para sa pagtanggal ng %s" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr "Tinanggal ang %s" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "Naghahanda upang tanggalin ng lubusan ang %s" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr "Natanggal ng lubusan ang %s" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/tr.po b/po/tr.po index 6a804edc0..90e453e54 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2013-02-18 03:41+0200\n" "Last-Translator: Mert Dirik \n" "Language-Team: Debian l10n Turkish\n" @@ -93,79 +93,79 @@ msgstr "Toplam serbest alan: " msgid "Total space accounted for: " msgstr "Hesaplanan toplam alan: " -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "%s paket dosyası eşzamansız." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Hiç paket bulunamadı" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1265 msgid "You must give at least one search pattern" msgstr "En az bir arama örüntüsü vermelisiniz" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" "Bu komutun kullanımı bırakılmıştır. Lütfen bunun yerine 'apt-mark showauto' " "komutunu kullanın." -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "%s paketi bulunamadı" -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "Paket dosyaları:" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Önbellek eşzamanlı değil, paket dosyası 'x-ref' yapılamıyor." #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1507 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "Sabitlenmiş paketler:" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(bulunamadı)" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr " Kurulu: " -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr " Aday: " -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(hiçbiri)" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr " Paket sabitleme: " #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr " Sürüm çizelgesi:" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s (%s için) %s %s tarihinde derlendi\n" -#: cmdline/apt-cache.cc:1690 +#: cmdline/apt-cache.cc:1760 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -237,20 +237,28 @@ msgstr "" "Ayrıntılı bilgi için apt-cache(8) ve apt.conf(5) rehber sayfalarına göz " "atın.\n" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" +"cdrom' for more information about the CD-ROM auto-detection and mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:85 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Lütfen bu CD/DVD'ye bir isim verin, örneğin 'Debian 5.0.3 Disk 1'" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" msgstr "Lütfen sürücüye bir Disk yerleştirin ve giriş tuşuna (Enter) basın" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "'%s', '%s' konumuna bağlanamadı" -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Kalan CD'leriniz için bu işlemi yineleyin." @@ -287,83 +295,101 @@ msgstr "" " -o=? İsteğe bağlı ayar seçeneği belirtmenizi sağlar, örneğin -o dir::" "cache=/tmp\n" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +msgid "[Y/n]" +msgstr "[E/h]" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "[e/H]" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" msgstr "E" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" msgstr "H" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Regex derleme hatası - %s" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "Aşağıdaki paketler karşılanmamış bağımlılıklara sahip:" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "ama %s kurulu" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "ama %s kurulacak" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "ama kurulabilir değil" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "ama o bir sanal paket" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "ama kurulu değil" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "ama kurulmayacak" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr " ya da" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "Aşağıdaki YENİ paketler kurulacak:" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "Aşağıdaki paketler KALDIRILACAK:" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 msgid "The following packages have been kept back:" msgstr "Aşağıdaki paketlerin mevcut durumları korunacak:" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "Aşağıdaki paketler yükseltilecek:" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "Aşağıdaki paketlerin SÜRÜMLERİ DÜŞÜRÜLECEK:" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "Aşağıdaki eski sürümlerinde tutulan paketler değiştirilecek:" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s (%s nedeniyle) " -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -371,59 +397,59 @@ msgstr "" "UYARI: Aşağıdaki temel paketler kaldırılacak.\n" "Bu işlem ne yaptığınızı tam olarak bilmediğiniz takdirde YAPILMAMALIDIR!" -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu paket yükseltilecek, %lu yeni paket kurulacak, " -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "%lu paket yeniden kurulacak, " -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "%lu paketin sürümü düşürülecek, " -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu paket kaldırılacak ve %lu paket yükseltilmeyecek.\n" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu paket tam olarak kurulmayacak ya da kaldırılmayacak.\n" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "Bilgi, '%2$s' görevi için '%1$s' seçiliyor\n" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "Bilgi, '%2$s' düzenli ifadesi için '%1$s' seçiliyor\n" -#: cmdline/apt-get.cc:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "%s paketi sanal bir pakettir, bu paketi sağlayan:\n" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr " [Kuruldu]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 msgid " [Not candidate version]" msgstr " [Aday sürüm değil]" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "Kurmak için adaylardan birini açıkça seçmelisiniz." -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -434,141 +460,141 @@ msgstr "" "Bu durum bu paketin kayıp, eskidiği için bırakılmış, ya da başka bir\n" "yazılım kaynağında bulunduğu anlamına gelebilir.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "Yine de aşağıdaki paketler onun yerine geçecek:" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, c-format msgid "Package '%s' has no installation candidate" msgstr "'%s' paketi için kurulum adayı yok" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "'%s' gibi sanal paketler kaldırılamaz\n" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "" "'%s' kurulu değildi, dolayısıyla kaldırılmadı. Bunu mu demek istediniz: " "'%s'?\n" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "'%s' kurulu değildi, dolayısıyla kaldırılmadı.\n" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "Bilgi, '%2$s' yerine '%1$s' seçiliyor\n" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "%s atlanıyor, bu paket zaten kurulu ve yükseltme seçilmemiş.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "" "%s atlanıyor, bu paket kurulu değil ve sadece yükseltmeler isteniyor.\n" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "%s paketinin yeniden kurulumu mümkün değil, çünkü paket internetten " "indirilemedi.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "%s zaten en yeni sürümde.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s elle kurulmuş olarak ayarlı.\n" -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:913 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "'%3$s' paketinin '%1$s' (%2$s) sürümü seçildi\n" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "'%4$s' nedeniyle '%3$s' paketinin '%1$s' (%2$s) sürümü seçildi\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "Bağımlılıklar düzeltiliyor..." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr " başarısız oldu." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "Bağımlılıklar düzeltilemedi" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "Yükseltme kümesi küçültülemiyor" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr " Tamamlandı" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" "Bu sorunları düzeltmek için 'apt-get -f install' komutunu çalıştırmanız " "gerekebilir." -#: cmdline/apt-get.cc:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "Karşılanmayan bağımlılıklar. -f kullanmayı deneyin." -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 msgid "WARNING: The following packages cannot be authenticated!" msgstr "UYARI: Aşağıdaki paketler doğrulanamıyor!" -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "Kimlik denetimi uyarısı görmezden geliniyor.\n" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " -msgstr "Paketler doğrulanmadan kurulsun mu [e/H]? " +#: cmdline/apt-get.cc:1108 +msgid "Install these packages without verification?" +msgstr "Paketler doğrulanmadan kurulsun mu?" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" msgstr "Bazı paketlerin kimlik denetimi yapılamadı" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "Bazı sorunlar çıktı ve -y seçeneği, --force-yes olmadan kullanıldı" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "İç hata, InstallPackages bozuk paketler ile çağrıldı!" -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 msgid "Packages need to be removed but remove is disabled." msgstr "" "Paketlerin kaldırılması gerekiyor ancak kaldırma işlemi devre dışı " "bırakılmış." -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 msgid "Internal error, Ordering didn't finish" msgstr "İç hata, Sıralama tamamlanamadı" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Ne kadar ilginç.. Boyutlar eşleşmedi, apt@packages.debian.org adresine " @@ -576,53 +602,55 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "%sB/%sB arşiv dosyası indirilecek.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "%sB arşiv dosyası indirilecek.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Bu işlem tamamlandıktan sonra %sB ek disk alanı kullanılacak.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Bu işlem tamamlandıktan sonra %sB disk alanı boşalacak.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s içindeki boş alan miktarı belirlenemedi" -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, c-format msgid "You don't have enough free space in %s." msgstr "%s içinde yeterli boş alanınız yok." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "Yalnızca Önemsiz seçeneği ayarlandı, fakat bu önemsiz bir işlem bir değil." -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "Evet, söylediğim şekilde yap!" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1292 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -633,28 +661,28 @@ msgstr "" "Devam etmek için '%s' ifadesini yazınız\n" " ?] " -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "Vazgeç." -#: cmdline/apt-get.cc:1282 -msgid "Do you want to continue [Y/n]? " -msgstr "Devam etmek istiyor musunuz [E/h]? " +#: cmdline/apt-get.cc:1313 +msgid "Do you want to continue?" +msgstr "Devam etmek istiyor musunuz?" -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s ağdan alınamadı. %s\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "Bazı dosyalar indirilemedi" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "İndirme işlemi tamamlandı ve sadece indirme kipinde" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -662,19 +690,19 @@ msgstr "" "Bazı arşivler alınamıyor, apt-get update'i çalıştırmayı ya da --fix-missing " "seçeneğini ekleyerek düzeltmeyi deneyin." -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing seçeneği ve ortam takası şu an için desteklenmiyor" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "Eksik paketler düzeltilemedi." -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "Kurulum iptal ediliyor." -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -688,35 +716,35 @@ msgstr[1] "" "Tüm dosyalarının üzerine yazıldığı için aşağıdaki paketler\n" "sisteminizden kayboldu:" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Not: Bu eylem dpkg tarafından otomatik ve kasıtlı olarak yapılmıştır." -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Mevcut olmayan hedef '%s' sürüm '%s' paketini ihmal et" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1622 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Kaynak paket olarak '%s' yerine '%s' kullanılacak\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "'%2$s' paketinin mevcut olmayan '%1$s' sürümünü görmezden gel" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr "'update' komutu bağımsız değişken almamaktadır" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1742 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Nesneleri silmemiz beklenemez, AutoRemover çalıştırılamıyor" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -734,15 +762,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 msgid "The following information may help to resolve the situation:" msgstr "Aşağıdaki bilgiler durumu çözmenize yardımcı olabilir:" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1853 msgid "Internal Error, AutoRemover broke stuff" msgstr "İç hata, AutoRemover bazı şeyleri bozdu" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1860 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -754,7 +782,7 @@ msgstr[1] "" "Aşağıdaki paketler otomatik olarak kurulmuş ve artık bu paketlere gerek " "duyulmuyor:" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1864 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -762,23 +790,23 @@ msgid_plural "" msgstr[0] "%lu paket otomatik olarak kurulmuş ve artık gerekli değil.\n" msgstr[1] "%lu paket otomatik olarak kurulmuş ve artık gerekli değil.\n" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1866 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Bu paketi kaldırmak için 'apt-get autoremove' komutunu kullanın." msgstr[1] "Bu paketleri kaldırmak için 'apt-get autoremove' komutunu kullanın." -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "İç hata, AllUpgrade bazı şeyleri bozdu" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1984 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "Bunları düzeltmek için 'apt-get -f install' komutunu çalıştırmanız " "gerekebilir:" -#: cmdline/apt-get.cc:1957 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -786,7 +814,7 @@ msgstr "" "Karşılanmamış bağımlılıklar. 'apt-get -f install' komutunu paket seçeneği " "vermeden deneyin (ya da bir çözüm belirtin)." -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:2002 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" @@ -798,33 +826,33 @@ msgstr "" "bazı paketlerin henüz oluşturulamamış ya da oluşturulmakta\n" "olduğunu gösterir." -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "Bozuk paketler" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "Aşağıdaki ek paketler de kurulacak:" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "Önerilen paketler:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "Tavsiye edilen paketler:" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "%s paketi bulunamadı" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s otomatik olarak kurulmuş şekilde ayarlandı.\n" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -832,46 +860,46 @@ msgstr "" "Bu komut artık kullanılmamaktadır. Bunun yerine 'apt-mark auto' ve 'apt-mark " "manual' kullanın." -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "Yükseltme hesaplanıyor... " -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "Başarısız" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "Bitti" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 msgid "Internal error, problem resolver broke stuff" msgstr "İç hata, sorun çözücü nesneyi bozdu" -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "İndirme dizini kilitlenemiyor" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "'%2$s' paketinin '%1$s' sürümü hiçbir kaynakta bulunamadı" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "İndiriliyor %s %s" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2483 msgid "Must specify at least one package to fetch source for" msgstr "Kaynağının indirileceği en az bir paket seçilmeli" -#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, c-format msgid "Unable to find a source package for %s" msgstr "%s paketinin kaynak paketi bulunamadı" -#: cmdline/apt-get.cc:2508 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -881,7 +909,7 @@ msgstr "" "yapılmaktadır:\n" "%s\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2545 #, c-format msgid "" "Please use:\n" @@ -893,68 +921,68 @@ msgstr "" "bzr branch %s\n" "komutunu kullanın.\n" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2598 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Zaten indirilmiş olan '%s' dosyası atlanıyor\n" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr "%s üzerinde yeterli boş alan yok" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2644 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB/%sB kaynak arşivi indirilecek.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2649 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB kaynak arşivi indirilecek.\n" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "%s kaynağını al\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "Bazı arşivler alınamadı." -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2724 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s için zaten açılmış bazı paketlerin açılması atlanıyor.\n" -#: cmdline/apt-get.cc:2704 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Paket açma komutu '%s' başarısız.\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2737 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev' paketinin kurulu olduğundan emin olun.\n" -#: cmdline/apt-get.cc:2727 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "İnşa komutu '%s' başarısız oldu.\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "Alt süreç başarısız" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2798 msgid "Must specify at least one package to check builddeps for" msgstr "İnşa bağımlılıklarının denetleneceği en az bir paket belirtilmedilir" -#: cmdline/apt-get.cc:2791 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -963,17 +991,17 @@ msgstr "" "%s mimarisine uygun mimari bilgileri mevcut değil. Kurulumu için apt.conf(5) " "rehber sayfasındaki APT::Architectures kısmına göz atın." -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s paketinin inşa-bağımlılığı bilgisi alınamıyor" -#: cmdline/apt-get.cc:2838 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr "%s paketinin hiç inşa bağımlılığı yok.\n" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3040 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -982,7 +1010,7 @@ msgstr "" "'%4$s' paketlerinde %3$s paketine izin verilmediği için %2$s kaynağının %1$s " "bağımlılığı karşılanamıyor." -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3058 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -990,12 +1018,12 @@ msgid "" msgstr "" "%2$s için %1$s bağımlılığı, %3$s paketi bulunamadığı için karşılanamadı." -#: cmdline/apt-get.cc:3049 +#: cmdline/apt-get.cc:3081 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "%2$s için %1$s bağımlılığı karşılanamadı: Kurulu %3$s paketi çok yeni." -#: cmdline/apt-get.cc:3088 +#: cmdline/apt-get.cc:3120 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1004,7 +1032,7 @@ msgstr "" "%2$s için %1$s bağımlılığı sağlanamıyor, çünkü %3$s paketinin aday sürümü " "gerekli sürüm şartlarını karşılamıyor" -#: cmdline/apt-get.cc:3094 +#: cmdline/apt-get.cc:3126 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1012,30 +1040,30 @@ msgid "" msgstr "" "%2$s için %1$s bağımlılığı sağlanamıyor, çünkü %3$s paketinin aday sürümü yok" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3149 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s için %1$s bağımlılığı karşılanamadı: %3$s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3164 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s için inşa bağımlılıkları karşılanamadı." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "İnşa bağımlılıklarını işleme başarısız oldu" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, c-format msgid "Changelog for %s (%s)" msgstr "%s (%s) paketinin değişim günlüğü" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "Desteklenen birimler:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1125,7 +1153,7 @@ msgstr "" "sayfalarına bakabilirsiniz.\n" " Bu APT'nin Süper İnek Güçleri vardır.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1200,7 +1228,8 @@ msgid "%s was already not hold.\n" msgstr "%s zaten tutulmayacak şekilde ayarlanmış.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s için beklenildi ama o gelmedi" @@ -1286,7 +1315,7 @@ msgstr "%s konumundaki CD-ROM çıkarılamıyor, hala kullanımda olabilir." msgid "Disk not found." msgstr "Disk bulunamadı." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "Dosya bulunamadı" @@ -1349,7 +1378,7 @@ msgstr "Oturum açma betiği komutu '%s' başarısız oldu, sunucunun iletisi: % msgid "TYPE failed, server said: %s" msgstr "TYPE başarısız, sunucunun iletisi: %s" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "Bağlantı zaman aşımına uğradı" @@ -1357,8 +1386,8 @@ msgstr "Bağlantı zaman aşımına uğradı" msgid "Server closed the connection" msgstr "Sunucu bağlantıyı kesti" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 -#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "Okuma hatası" @@ -1370,168 +1399,181 @@ msgstr "Bir yanıt arabelleği taşırdı." msgid "Protocol corruption" msgstr "İletişim kuralları bozulması" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 -#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "Yazma hatası" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "Bir soket oluşturulamadı" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "Veri soketine bağlanılamadı, bağlantı zaman aşımına uğradı" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "Edilgen sokete bağlanılamadı." -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo bir dinleme soketi alamıyor" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "Bir sokete bağlanılamadı" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "Soket dinlenemedi" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "Soketin adı belirlenemedi" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "PORT komutu gönderilemedi" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Bilinmeyen adres ailesi %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT başarısız, sunucunun iletisi: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "Veri soketi bağlantısı zaman aşımına uğradı" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "Bağlantı kabul edilemiyor" -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "Dosya sağlaması yapılamadı" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Dosya alınamıyor, sunucunun iletisi: '%s'" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "Veri soketi zaman aşımına uğradı" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Veri aktarımı başarısız, sunucunun iletisi: '%s'" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "Sorgu" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "Çağrılamıyor " -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "Bağlanılıyor %s (%s)" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "%s için bir soket oluşturulamadı (f=%u t=%u p=%u)" -#: methods/connect.cc:99 +#: methods/connect.cc:100 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "%s:%s bağlantısı başlatılamıyor (%s)." -#: methods/connect.cc:107 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Adrese bağlanılamadı: %s:%s (%s), bağlantı zaman aşımına uğradı" -#: methods/connect.cc:125 +#: methods/connect.cc:126 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Adrese bağlanılamadı: %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "Bağlanılıyor: %s" -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "'%s' çözümlenemedi" -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "'%s' çözümlenirken geçici bir sorunla karşılaşıldı" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, fuzzy, c-format +msgid "System error resolving '%s:%s'" +msgstr "'%s' çözümlenirken geçici bir sorunla karşılaşıldı" + +#: methods/connect.cc:211 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "'%s:%s' (%i - %s) adresi çözümlenirken bir şeyler kötü gitti" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, c-format msgid "Unable to connect to %s:%s:" msgstr "Bağlanılamıyor %s:%s:" -#: methods/gpgv.cc:180 +#: methods/gpgv.cc:167 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "İç hata: İmza iyi, ancak anahtar parmak izi belirlenemedi?!" -#: methods/gpgv.cc:185 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "En az bir geçersiz imza ile karşılaşıldı." -#: methods/gpgv.cc:189 +#: methods/gpgv.cc:173 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "İmza doğrulama için 'gpgv' çalıştırılamadı (gpgv kurulu mu?)" -#: methods/gpgv.cc:194 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:179 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "gpgv çalıştırılırken bilinmeyen hata" -#: methods/gpgv.cc:228 methods/gpgv.cc:235 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 msgid "The following signatures were invalid:\n" msgstr "Aşağıdaki imzalar geçersiz:\n" -#: methods/gpgv.cc:242 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1569,59 +1611,59 @@ msgstr "HTTP sunucusunun aralık desteği bozuk" msgid "Unknown date format" msgstr "Bilinmeyen tarih biçimi" -#: methods/http.cc:818 +#: methods/http.cc:826 msgid "Select failed" msgstr "Seçme başarısız" -#: methods/http.cc:823 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "Bağlantı zaman aşımına uğradı" -#: methods/http.cc:846 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "Çıktı dosyasına yazılırken hata" -#: methods/http.cc:877 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "Dosyaya yazılamadı" -#: methods/http.cc:905 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "Dosyaya yazılamadı" -#: methods/http.cc:919 +#: methods/http.cc:927 msgid "Error reading from server. Remote end closed connection" msgstr "Sunucundan okunurken hata. Uzak sonlu kapalı bağlantı" -#: methods/http.cc:921 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "Sunucundan okunurken hata" -#: methods/http.cc:1194 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "Kötü başlık verisi" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "Bağlantı başarısız" -#: methods/http.cc:1358 +#: methods/http.cc:1361 msgid "Internal error" msgstr "İç hata" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:465 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 -#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: methods/mirror.cc:95 apt-inst/extract.cc:464 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "%s okunamıyor" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1642,7 +1684,12 @@ msgstr "'%s' yansı dosyası bulunamadı " msgid "Can not read mirror file '%s'" msgstr "Yansı dosyası %s okunamıyor" -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "Yansı dosyası %s okunamıyor" + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "[Yansı: %s]" @@ -1668,7 +1715,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "Altsürece IPC borusu oluşturulamadı" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "Bağlantı vaktinden önce kapandı" @@ -1740,7 +1787,7 @@ msgstr "" " -c=? Belirtilen ayar dosyasını kullanır\n" " -o=? Ayar seçeneği belirtmeyi sağlar, ör -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "%s dosyasına yazılamıyor" @@ -1749,31 +1796,31 @@ msgstr "%s dosyasına yazılamıyor" msgid "Cannot get debconf version. Is debconf installed?" msgstr "debconf sürümü alınamıyor. debconf kurulu mu?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 msgid "Package extension list is too long" msgstr "Paket uzantı listesi çok uzun" #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format msgid "Error processing directory %s" msgstr "%s dizinini işlemede hata" -#: ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:262 msgid "Source extension list is too long" msgstr "Kaynak uzantı listesi çok uzun" -#: ftparchive/apt-ftparchive.cc:378 +#: ftparchive/apt-ftparchive.cc:379 msgid "Error writing header to contents file" msgstr "İçindekiler dosyasına üstbilgi yazmada hata" -#: ftparchive/apt-ftparchive.cc:408 +#: ftparchive/apt-ftparchive.cc:409 #, c-format msgid "Error processing contents %s" msgstr "%s içeriğini işlemede hata" -#: ftparchive/apt-ftparchive.cc:596 +#: ftparchive/apt-ftparchive.cc:597 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -1856,11 +1903,11 @@ msgstr "" " -c=? Belirtilen yapılandırma dosyası kullan\n" " -o=? Yapılandırma seçeneği ayarla" -#: ftparchive/apt-ftparchive.cc:802 +#: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" msgstr "Hiçbir seçim eşleşmedi" -#: ftparchive/apt-ftparchive.cc:880 +#: ftparchive/apt-ftparchive.cc:881 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "'%s' paket dosyası grubunda bazı dosyalar eksik" @@ -1888,8 +1935,8 @@ msgstr "" msgid "Unable to open DB file %s: %s" msgstr "Veritabanı dosyası %s açılamadı: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "%s durum bilgisi alınamadı" @@ -1902,87 +1949,87 @@ msgstr "Arşivin denetim kaydı yok" msgid "Unable to get a cursor" msgstr "İmleç alınamıyor" -#: ftparchive/writer.cc:80 +#: ftparchive/writer.cc:82 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: %s dizini okunamıyor\n" -#: ftparchive/writer.cc:85 +#: ftparchive/writer.cc:87 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: %s durum bilgisi alınamıyor\n" -#: ftparchive/writer.cc:141 +#: ftparchive/writer.cc:143 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:145 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:150 +#: ftparchive/writer.cc:152 msgid "E: Errors apply to file " msgstr "E: Hatalar şu dosya için geçerli: " -#: ftparchive/writer.cc:168 ftparchive/writer.cc:200 +#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 #, c-format msgid "Failed to resolve %s" msgstr "%s çözümlenemedi" -#: ftparchive/writer.cc:181 +#: ftparchive/writer.cc:183 msgid "Tree walking failed" msgstr "Ağaçta gezinme başarısız" -#: ftparchive/writer.cc:208 +#: ftparchive/writer.cc:210 #, c-format msgid "Failed to open %s" msgstr "%s açılamadı" -#: ftparchive/writer.cc:267 +#: ftparchive/writer.cc:269 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:275 +#: ftparchive/writer.cc:277 #, c-format msgid "Failed to readlink %s" msgstr "%s bağlantı okuması başarılamadı" -#: ftparchive/writer.cc:279 +#: ftparchive/writer.cc:281 #, c-format msgid "Failed to unlink %s" msgstr "%s bağlantı koparma başarılamadı" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:288 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** %s, %s konumuna bağlanamadı" -#: ftparchive/writer.cc:296 +#: ftparchive/writer.cc:298 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " %sB'lik bağlantı koparma (DeLink) sınırına ulaşıldı.\n" -#: ftparchive/writer.cc:401 +#: ftparchive/writer.cc:403 msgid "Archive had no package field" msgstr "Arşivde paket alanı yok" -#: ftparchive/writer.cc:409 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr " %s için geçersiz kılma girdisi yok\n" -#: ftparchive/writer.cc:477 ftparchive/writer.cc:827 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s geliştiricisi %s, %s değil\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:711 #, c-format msgid " %s has no source override entry\n" msgstr " '%s' paketinin yerine geçecek bir kaynak paket yok\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:715 #, c-format msgid " %s has no binary override entry either\n" msgstr " '%s' paketinin yerine geçecek bir ikili paket de yok\n" @@ -2056,7 +2103,7 @@ msgstr "MD5 hesaplanırken okunamadı" msgid "Problem unlinking %s" msgstr "%s bağı koparılırken sorun çıktı" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "%s, %s olarak yeniden adlandırılamadı" @@ -2115,23 +2162,23 @@ msgstr "" " -o=? Herhangi bir yapılandırma seçeneği ayarla, örneğin -o dir::cache=/" "tmp\n" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "Boru oluşturulamadı" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "Gzip çalıştırılamadı " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "Bozuk arşiv" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "Tar sağlama toplamı başarısız, arşiv bozulmuş" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Bilinmeyen TAR başlığı türü %u, üye %s" @@ -2153,11 +2200,11 @@ msgstr "Geçerşiz arşiv üyesi başlığı %s" msgid "Invalid archive member header" msgstr "Geçersiz arşiv üyesi başlığı" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "Arşiv çok kısa" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "Arşiv başlıkları okunamadı" @@ -2202,54 +2249,54 @@ msgstr "%s dosyasına yazılamadı" msgid "Failed to close file %s" msgstr "%s dosyası kapatılamadı" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "%s yolu çok uzun" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "%s paketi bir çok kez açıldı" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "%s dizini yönlendirilmiş" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Bu paket yönlendirme hedefine (%s/%s) yazmayı deniyor" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" msgstr "Yönlendirme yolu çok uzun" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "%s dizini dizin olmayan bir öğeyle değiştirildi" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "Düğüm sağlama kovasında bulunamadı" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "Yol çok uzun" -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "%s paketinin sürümü yok" -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "%s/%s dosyası %s paketindeki aynı adlı dosyanın üzerine yazmak istiyor" -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "%s durum bilgisi alınamadı" @@ -2330,30 +2377,30 @@ msgstr "" "artırılamadı." #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:372 +#: apt-pkg/contrib/strutl.cc:378 #, c-format msgid "%lid %lih %limin %lis" msgstr "%li gün %li saat %li dk. %li sn." #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:379 +#: apt-pkg/contrib/strutl.cc:385 #, c-format msgid "%lih %limin %lis" msgstr "%li saat %li dk. %li sn." #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:386 +#: apt-pkg/contrib/strutl.cc:392 #, c-format msgid "%limin %lis" msgstr "%li dk. %li sn." #. s means seconds -#: apt-pkg/contrib/strutl.cc:391 +#: apt-pkg/contrib/strutl.cc:397 #, c-format msgid "%lis" msgstr "%li sn." -#: apt-pkg/contrib/strutl.cc:1166 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "%s seçimi bulunamadı" @@ -2425,6 +2472,16 @@ msgstr "%c%s... Hata!" msgid "%c%s... Done" msgstr "%c%s... Bitti" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Bitti" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2478,7 +2535,7 @@ msgstr "Geçersiz işlem: %s" msgid "Unable to stat the mount point %s" msgstr "Bağlama noktasının (%s) durum bilgisi alınamadı" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "Cdrom durum bilgisi alınamadı" @@ -2487,44 +2544,44 @@ msgstr "Cdrom durum bilgisi alınamadı" msgid "Problem closing the gzip file %s" msgstr "Gzip dosyası %s kapatılamadı" -#: apt-pkg/contrib/fileutl.cc:225 +#: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Kilitleme dosyası %s salt okunur olduğu için kilitleme kullanılmıyor" -#: apt-pkg/contrib/fileutl.cc:230 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "Kilit dosyası %s açılamadı" -#: apt-pkg/contrib/fileutl.cc:248 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "nfs ile bağlanmış kilit dosyası %s için kilitleme kullanılmıyor" -#: apt-pkg/contrib/fileutl.cc:252 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "%s kilidi alınamadı" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "'%s' dizin olmadığı için dosya listeli oluşturulamıyor" -#: apt-pkg/contrib/fileutl.cc:426 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" "'%2$s' dizinindeki '%1$s' normal bir dosya olmadığı için görmezden geliniyor." -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" "'%2$s' dizinindeki '%1$s' dosyası uzantısı olmadığı için görmezden geliniyor." -#: apt-pkg/contrib/fileutl.cc:453 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" @@ -2532,73 +2589,79 @@ msgstr "" "'%2$s' dizinindeki '%1$s' dosyası geçersiz bir dosya uzantısı olduğu için " "yok sayılıyor." -#: apt-pkg/contrib/fileutl.cc:840 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "%s altsüreci bir bölümleme hatası aldı (segmentation fault)." -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:846 #, c-format msgid "Sub-process %s received signal %u." msgstr "%s altsüreci %u sinyali aldı" -#: apt-pkg/contrib/fileutl.cc:846 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "%s altsüreci bir hata kodu gönderdi (%u)" -#: apt-pkg/contrib/fileutl.cc:848 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "%s altsüreci beklenmeyen bir şekilde sona erdi" -#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "%s dosyası açılamadı" -#: apt-pkg/contrib/fileutl.cc:1046 +#: apt-pkg/contrib/fileutl.cc:1065 #, c-format msgid "Could not open file descriptor %d" msgstr "Dosya tanımlayıcı %d açılamadı" -#: apt-pkg/contrib/fileutl.cc:1136 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "Altsüreç IPC'si oluşturulamadı" -#: apt-pkg/contrib/fileutl.cc:1192 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "Sıkıştırma programı çalıştırılamadı " -#: apt-pkg/contrib/fileutl.cc:1289 +#: apt-pkg/contrib/fileutl.cc:1298 #, c-format msgid "read, still have %llu to read but none left" msgstr "read, %llu bayt okunması gerekli fakat hiç kalmamış" -#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "write, yazılması gereken %llu bayt yazılamıyor" -#: apt-pkg/contrib/fileutl.cc:1716 +#: apt-pkg/contrib/fileutl.cc:1695 #, c-format msgid "Problem closing the file %s" msgstr "%s dosyası kapatılamadı" -#: apt-pkg/contrib/fileutl.cc:1728 +#: apt-pkg/contrib/fileutl.cc:1707 #, c-format msgid "Problem renaming the file %s to %s" msgstr "%s dosyası %s olarak yeniden adlandırılamadı" -#: apt-pkg/contrib/fileutl.cc:1739 +#: apt-pkg/contrib/fileutl.cc:1718 #, c-format msgid "Problem unlinking the file %s" msgstr "%s dosyasından bağ kaldırma sorunu" -#: apt-pkg/contrib/fileutl.cc:1754 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "Dosya eşitlenirken sorun çıktı" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:76 +#, c-format +msgid "No keyring installed in %s." +msgstr "%s dizininde kurulu bir anahtar yok." + #: apt-pkg/pkgcache.cc:148 msgid "Empty package cache" msgstr "Boş paket önbelleği" @@ -2624,59 +2687,59 @@ msgstr "Bu APT '%s' sürümleme sistemini desteklemiyor." msgid "The package cache was built for a different architecture" msgstr "Paket önbelleği farklı bir mimarı için yapılmış" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "Bağımlılıklar" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "ÖnBağımlılıklar" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "Önerdikleri" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "Tavsiye ettikleri" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "Çakışmalar" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "Değiştirilenler" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "Eskiyenler" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "Bozdukları" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "Geliştirdikleri" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "önemli" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "gerekli" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "standart" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "seçimlik" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "ilave" @@ -2787,17 +2850,17 @@ msgstr "%s Açılıyor" msgid "Line %u too long in source list %s." msgstr "Kaynak listesinin (%2$s) %1$u numaralı satırı çok uzun." -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Kaynak listesinin (%2$s) %1$u numaralı satırı hatalı (tür)" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:293 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "'%s' türü bilinmiyor. (Satır: %u, Kaynak Listesi: %s)" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2806,12 +2869,12 @@ msgstr "" "\"%s\" paketinin anında yapılandırması başarısız oldu. Ayrıntılar için apt." "conf(5) rehber sayfasının APT::Immediate-Configure kısmına bakın. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, c-format msgid "Could not configure '%s'. " msgstr "'%s' paketi yapılandırılamadı. " -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2836,7 +2899,7 @@ msgstr "" "%s paketinin tekrar kurulması gerekli, ancak gereken arşiv dosyası " "bulunamıyor." -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2844,11 +2907,11 @@ msgstr "" "Hata, pkgProblemResolver::Resolve bozuk paketlere yol açtı, bu sorunun " "nedeni tutulan paketler olabilir." -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "Sorunlar giderilemedi, tutulan bozuk paketleriniz var." -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2856,7 +2919,7 @@ msgstr "" "Bazı indeks dosyaları indirilemedi. Bu dosyalar yok sayıldılar ya da önceki " "sürümleri kullanıldı." -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, c-format msgid "List directory %spartial is missing." msgstr "Liste dizini %spartial bulunamadı." @@ -2893,7 +2956,7 @@ msgstr "Yöntem sürücüsü %s bulunamadı." msgid "Method %s did not start correctly" msgstr "%s yöntemi düzgün şekilde başlamadı" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -2961,14 +3024,14 @@ msgstr "Önbelleğin uyumsuz bir sürümleme sistemi var" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "%s paketi işlenirken sorunlarla karşılaşıldı (%s%d)" @@ -2989,26 +3052,26 @@ msgstr "Vay canına, bu APT'nin alabileceği açıklama sayısını aştınız." msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Vay canına, bu APT'nin alabileceği bağımlılık sayısını aştınız." -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Dosya bağımlılıkları işlenirken %s %s paketi bulunamadı" -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kaynak listesinin (%s) dosya bilgisi alınamadı" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" msgstr "Paket listeleri okunuyor" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "Dosya Sağlananları Toplanıyor" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "Kaynak önbelleği kaydedilirken GÇ Hatası" @@ -3021,12 +3084,12 @@ msgstr "yeniden adlandırma başarısız, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "MD5 toplamı eşleşmiyor" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859 -#: apt-pkg/acquire-item.cc:2002 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 msgid "Hash Sum mismatch" msgstr "Sağlama toplamları eşleşmiyor" -#: apt-pkg/acquire-item.cc:1370 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3035,17 +3098,17 @@ msgstr "" "'Release' dosyasında olması beklenilen '%s' girdisi bulunamadı (sources.list " "dosyasındaki girdi ya da satır hatalı)" -#: apt-pkg/acquire-item.cc:1386 +#: apt-pkg/acquire-item.cc:1404 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "'Release' dosyasında '%s' için uygun bir sağlama toplamı bulunamadı" -#: apt-pkg/acquire-item.cc:1428 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Aşağıdaki anahtar kimlikleri için kullanılır hiçbir genel anahtar yok:\n" -#: apt-pkg/acquire-item.cc:1466 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3054,12 +3117,12 @@ msgstr "" "%s konumundaki 'Release' dosyasının vâdesi dolmuş (%s önce). Bu deponun " "güncelleştirmeleri uygulanmayacak." -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Dağıtım çakışması: %s (beklenen %s ama eldeki %s)" -#: apt-pkg/acquire-item.cc:1521 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3069,12 +3132,12 @@ msgstr "" "indeks dosyaları kullanılacak. GPG hatası: %s:%s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "GPG hatası: %s: %s" -#: apt-pkg/acquire-item.cc:1635 +#: apt-pkg/acquire-item.cc:1663 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3083,7 +3146,7 @@ msgstr "" "%s paketindeki dosyalardan biri konumlandırılamadı. Bu durum, bu paketi elle " "düzeltmeniz gerektiği anlamına gelebilir. (eksik mimariden dolayı)" -#: apt-pkg/acquire-item.cc:1694 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3092,37 +3155,37 @@ msgstr "" "%s paketindeki dosyalardan biri konumlandırılamadı. Bu durum, bu paketi elle " "düzeltmeniz gerektiği anlamına gelebilir." -#: apt-pkg/acquire-item.cc:1753 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Paket indeks dosyaları bozuk. %s paketinin 'Filename:' alanı yok." -#: apt-pkg/acquire-item.cc:1851 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "Boyutlar eşleşmiyor" -#: apt-pkg/indexrecords.cc:64 +#: apt-pkg/indexrecords.cc:68 #, c-format msgid "Unable to parse Release file %s" msgstr "'Release' dosyası (%s) ayrıştırılamadı" -#: apt-pkg/indexrecords.cc:74 +#: apt-pkg/indexrecords.cc:78 #, c-format msgid "No sections in Release file %s" msgstr "'Release' dosyası %s içinde hiç bölüm yok" -#: apt-pkg/indexrecords.cc:108 +#: apt-pkg/indexrecords.cc:112 #, c-format msgid "No Hash entry in Release file %s" msgstr "'Release' dosyasında (%s) sağlama girdisi yok" -#: apt-pkg/indexrecords.cc:121 +#: apt-pkg/indexrecords.cc:125 #, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "'Release' dosyasında (%s) geçersiz 'Valid-Until' girdisi" -#: apt-pkg/indexrecords.cc:140 +#: apt-pkg/indexrecords.cc:144 #, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "'Release' dosyasında (%s) geçersiz 'Date' girdisi" @@ -3150,7 +3213,7 @@ msgstr "Tanımlanıyor... " msgid "Stored label: %s\n" msgstr "Kayıtlı etiket: %s\n" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 msgid "Unmounting CD-ROM...\n" msgstr "CD-ROM ayrılıyor...\n" @@ -3214,30 +3277,30 @@ msgstr "" msgid "Copying package lists..." msgstr "Paket listeleri kopyalanıyor.." -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "Yeni kaynak listesi yazılıyor\n" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "Bu disk için olan kaynak listesi girdileri:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "%i kayıt yazıldı.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%2$i eksik dosyayla %1$i kayıt yazıldı.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%2$i eşleşmeyen dosyayla %1$i kayıt yazıldı\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "%2$i eksik dosya ve %3$i eşleşmeyen dosyayla %1$i kayıt yazıldı\n" @@ -3252,17 +3315,6 @@ msgstr "%s için kimlik doğrulama kaydı bulunamadı." msgid "Hash mismatch for: %s" msgstr "Sağlama yapılamadı: %s" -#: apt-pkg/indexcopy.cc:665 -#, c-format -msgid "File %s doesn't start with a clearsigned message" -msgstr "%s dosyası açıkimzalı bir iletiyle başlamıyor" - -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/indexcopy.cc:696 -#, c-format -msgid "No keyring installed in %s." -msgstr "%s dizininde kurulu bir anahtar yok." - #: apt-pkg/cacheset.cc:403 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3328,7 +3380,7 @@ msgstr "Çözüm almak için hazırlan" msgid "External solver failed without a proper error message" msgstr "Harici çözücü düzgün bir hata iletisi göstermeden başarısız oldu" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "Harici çözücüyü çalıştır" @@ -3337,12 +3389,12 @@ msgstr "Harici çözücüyü çalıştır" msgid "Installing %s" msgstr "%s kuruluyor" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr "%s yapılandırılıyor" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr "%s kaldırılıyor" @@ -3363,80 +3415,80 @@ msgid "Running post-installation trigger %s" msgstr "Kurulum sonrası tetikleyicisi %s çalıştırılıyor" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, c-format msgid "Directory '%s' missing" msgstr "'%s' dizini bulunamadı" -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, c-format msgid "Could not open file '%s'" msgstr "'%s' dosyası açılamadı" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr "%s hazırlanıyor" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr "%s paketi açılıyor" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "%s paketini yapılandırmaya hazırlanılıyor" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr "%s kuruldu" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "%s paketinin kaldırılmasına hazırlanılıyor" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr "%s kaldırıldı" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "%s paketinin tamamen kaldırılmasına hazırlanılıyor" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr "%s tamamen kaldırıldı" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Günlük yazılamadı, openpty() başarısız oldu (/dev/pts bağlanmadı mı?)\n" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "dpkg çalıştırılıyor" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "İşlem yarıda kesildi" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "" "En fazla rapor miktarına (MaxReports) ulaşıldığı için apport raporu yazılmadı" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "bağımlılık sorunları - yapılandırılmamış durumda bırakılıyor" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3444,14 +3496,14 @@ msgstr "" "Apport raporu yazılmadı çünkü hata iletisi bu durumun bir önceki hatadan " "kaynaklanan bir hata olduğunu belirtiyor." -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" "Hata iletisi diskin dolu olduğunu belirttiği için apport raporu yazılamadı" -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3459,7 +3511,7 @@ msgstr "" "Hata iletisi bir bellek yetersizliği hatasına işaret ettiği için apport " "raporu yazılamadı" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -3492,3 +3544,6 @@ msgstr "" #: apt-pkg/deb/debsystem.cc:121 msgid "Not locked" msgstr "Kilitlenmemiş" + +#~ msgid "File %s doesn't start with a clearsigned message" +#~ msgstr "%s dosyası açıkimzalı bir iletiyle başlamıyor" diff --git a/po/uk.po b/po/uk.po index f42773acd..dbb764c4c 100644 --- a/po/uk.po +++ b/po/uk.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-all\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2012-09-25 20:19+0300\n" "Last-Translator: A. Bondarenko \n" "Language-Team: Українська \n" @@ -100,77 +100,77 @@ msgstr "Порожнього місця в кеші: " msgid "Total space accounted for: " msgstr "Загальний простір полічений для: " -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "Перелік пакунків %s розсинхронізований." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Не знайдено жодного пакунка" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 msgid "You must give at least one search pattern" msgstr "Ви повинні задати не менше одного шаблону пошуку" -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "Ця команда є застарілою. Будь-ласка використовуйте 'apt-mark showauto'" -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Не можу знайти пакунок %s" -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "Переліки пакунків:" -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Кеш не синхронізований, неможливо знайти посилання на перелік пакунків" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "Зафіксовані пакунки:" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(не знайдено)" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr " Встановлено: " -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr " Кандидат: " -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(відсутній)" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr " Фіксатор(pin) пакунка: " #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr " Таблиця версій:" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s для %s скомпільовано %s %s\n" -#: cmdline/apt-cache.cc:1730 +#: cmdline/apt-cache.cc:1760 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -297,83 +297,101 @@ msgstr "" " -с=? Читати зазначений конфігураційний файл.\n" " -o=? Встановити умовну опцію, наприклад, -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +msgid "[Y/n]" +msgstr "" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" -msgstr "Y" +msgstr "" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" -msgstr "N" +msgstr "" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Помилка компіляції регулярного виразу - %s" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "Пакунки, що мають незадоволені залежності:" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "але %s вже встановлений" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "але %s буде встановлений" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "але він не може бути встановлений" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "але це віртуальний пакунок" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "але він не встановлений" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "але він не буде встановлений" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr " чи" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "НОВІ пакунки, які будуть встановлені:" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "Пакунки, які будуть ВИДАЛЕНІ:" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 msgid "The following packages have been kept back:" msgstr "Пакунки, які залишені в незмінному стані:" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "Пакунки, які будуть ОНОВЛЕНІ:" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "Пакунки, які будуть замінені на СТАРІШІ версії:" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "Пакунки, які мали б залишитися без змін, але будуть замінені:" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s (внаслідок %s) " -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -381,59 +399,59 @@ msgstr "" "УВАГА: Наступні важливі пакунки будуть вилучені.\n" "НЕ РОБІТЬ цього, якщо ви НЕ уявляєте собі всі можливі наслідки!" -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "оновлено %lu, встановлено %lu нових, " -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "%lu перевстановлено, " -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "%lu замінено на старіші версії, " -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu відмічено для видалення і %lu не оновлено.\n" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "не встановлено(видалено) до кінця %lu пакунків.\n" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "Помітьте, вибирається '%s' для завдання '%s'\n" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "Помітьте, вибирається '%s' для регулярного виразу '%s'\n" -#: cmdline/apt-get.cc:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Пакунок %s - віртуальний, його функції надаються пакунками:\n" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr " [Встановлено]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 msgid " [Not candidate version]" msgstr " [Версія не кандидат]" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "Ви повинні явно вказати, який саме ви хочете встановити." -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -445,159 +463,159 @@ msgstr "" "Це може означати, що пакунок відсутній, застарів, або доступний з джерел, не " "згаданих в sources.list\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "Однак наступні пакунки заміняють його:" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, c-format msgid "Package '%s' has no installation candidate" msgstr "Для пакунка '%s' не знайдено кандидатів на встановлення" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "Віртуальні пакунки як '%s' не можуть бути видаленими\n" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "" "Пакунок '%s' не встановлений, тому не видалений. Можливо ви мали на увазі " "'%s'?\n" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "Пакунок '%s' не встановлений, тому не видалений\n" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "Помітьте, вибирається '%s' замість '%s'\n" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Пропускається %s, пакунок вже встановлений і опція ОНОВИТИ не встановлена.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "" "Пропускається %s, пакунок не встановлений, а запитуються тільки оновлення.\n" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Перевстановлення %s неможливе, бо він не може бути завантаженим.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "Вже встановлена найновіша версія %s.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s позначений як встановлений вручну.\n" -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:913 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "Обрана версія '%s' (%s) для '%s'\n" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "Обрана версія '%s' (%s) для '%s' через '%s'\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "Виправлення залежностей..." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr " невдача." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "Неможливо скоригувати залежності" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "Неможливо мінімізувати набір оновлень" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr " Виконано" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" "Для виправлення цих помилок ви можете скористатися 'apt-get -f install'." -#: cmdline/apt-get.cc:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "Незадоволені залежності. Спробуйте використати -f." -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 msgid "WARNING: The following packages cannot be authenticated!" msgstr "УВАГА: Наступні пакунки неможливо автентифікувати!" -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "Автентифікаційне попередження не прийнято до уваги.\n" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " -msgstr "Встановити ці пакунки без перевірки [y/N]? " +#: cmdline/apt-get.cc:1108 +msgid "Install these packages without verification?" +msgstr "Встановити ці пакунки без перевірки?" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" msgstr "Деякі пакунки неможливо автентифікувати" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "Виявлено проблеми, а опція -y була використана без --force-yes" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "Внутрішня помилка, InstallPackages була викликана з непрацездатними " "пакунками!" -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 msgid "Packages need to be removed but remove is disabled." msgstr "Необхідно видалити пакунки, але видалення заборонене." -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 msgid "Internal error, Ordering didn't finish" msgstr "Внутрішня помилка, Ordering не завершилася" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "Дивно.. Розбіжність розмірів, напишіть на apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Необхідно завантажити %sB/%sB архівів.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Необхідно завантажити %sB архівів.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" @@ -605,35 +623,35 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "" "Після цієї операції об'єм зайнятого дискового простору зменшиться на %sB.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Couldn't determine free space in %s" msgstr "Не вдалося визначити кількість вільного місця в %s" -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, c-format msgid "You don't have enough free space in %s." msgstr "Недостатньо вільного місця в %s." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "Вказано виконання тільки тривіальних операцій, але це не тривіальна операція." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "Так, робити, як я скажу!" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -644,28 +662,28 @@ msgstr "" "Щоб продовжити, введіть фразу: '%s'\n" " ?] " -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "Перервано." -#: cmdline/apt-get.cc:1284 -msgid "Do you want to continue [Y/n]? " -msgstr "Бажаєте продовжити [Y/n]? " +#: cmdline/apt-get.cc:1313 +msgid "Do you want to continue?" +msgstr "Бажаєте продовжити?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Не вдалося завантажити %s %s\n" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "Деякі файли не вдалося завантажити" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "Завантаження завершено в режимі \"тільки завантаження\"" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -673,19 +691,19 @@ msgstr "" "Неможливо завантажити деякі архіви, імовірно треба виконати apt-get update " "або спробувати повторити запуск з ключем --fix-missing?" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing і зміна носія в даний момент не підтримується" -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "Неможливо виправити втрачені пакунки." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "Переривається встановлення." -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -702,35 +720,35 @@ msgstr[2] "" "Вказані пакунки зникли з вашої системи, так як\n" "усі файли були перезаписані іншими пакунками:" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Увага: це зроблено автоматично і умисно dpkg'ем." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Ігнорувати недоступний випуск '%s' пакунку '%s'" -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Обираю '%s' як пакунок вихідних текстів, замість '%s'\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Ігнорувати недоступну версію '%s' пакунку '%s'" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr "Команді update не потрібні аргументи" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Нам не дозволено видаляти, неможливо запустити AutoRemover" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -748,15 +766,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 msgid "The following information may help to resolve the situation:" msgstr "Наступна інформація можливо допоможе Вам виправити ситуацію:" -#: cmdline/apt-get.cc:1824 +#: cmdline/apt-get.cc:1853 msgid "Internal Error, AutoRemover broke stuff" msgstr "Внутрішня Помилка, AutoRemover щось поламав" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -767,7 +785,7 @@ msgstr[0] "" msgstr[1] "Наступні пакунки були встановлені автоматично і більше не потрібні:" msgstr[2] "Наступні пакунки були встановлені автоматично і більше не потрібні:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -778,24 +796,24 @@ msgstr[1] "" msgstr[2] "" "%lu пакунків було встановлено автоматично і вони більше не потрібні.\n" -#: cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1866 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Використовуйте 'apt-get autoremove' щоб видалити його." msgstr[1] "Використовуйте 'apt-get autoremove' щоб видалити їх." msgstr[2] "Використовуйте 'apt-get autoremove' щоб видалити їх." -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "Внутрішня помилка, AllUpgrade щось поламав" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1984 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "Можливо, для виправлення цих помилок Ви захочете скористатися 'apt-get -f " "install':" -#: cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -803,7 +821,7 @@ msgstr "" "Незадоволені залежності. Спробуйте виконати 'apt-get -f install', не " "вказуючи назв пакунків (або вкажіть рішення)." -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:2002 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" @@ -814,33 +832,33 @@ msgstr "" "або ж використовуєте нестабільний дистрибутив, і запитані Вами пакунки\n" "ще не створені або були вилучені з Incoming." -#: cmdline/apt-get.cc:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "Зламані пакунки" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "Будуть встановлені наступні додаткові пакунки:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "Пропоновані пакунки:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "Рекомендовані пакунки:" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "Не можу знайти пакунок %s" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s позначений як автоматично встановлений.\n" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -848,48 +866,48 @@ msgstr "" "Ця команда застаріла. Будь-ласка, використовуйте замість неї 'apt-mark auto' " "і 'apt-mark manual'." -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "Обчислення оновлень... " -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "Невдача" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "Виконано" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 msgid "Internal error, problem resolver broke stuff" msgstr "Внутрішня помилка, вирішувач проблем щось поламав" -#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "Неможливо заблокувати директорію для завантаження" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Неможливо знайти джерело для завантаження версії '%s' для '%s'" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "Завантаження %s %s" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 msgid "Must specify at least one package to fetch source for" msgstr "" "Вкажіть як мінімум один пакунок, для якого необхідно завантажити вихідні " "тексти" -#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, c-format msgid "Unable to find a source package for %s" msgstr "Неможливо знайти пакунок з вихідними текстами для %s" -#: cmdline/apt-get.cc:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -898,7 +916,7 @@ msgstr "" "УВАГА: Пакування '%s' відбувається в системі контролю версій '%s' на:\n" "%s\n" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, c-format msgid "" "Please use:\n" @@ -909,71 +927,71 @@ msgstr "" "bzr branch %s\n" "щоб отримати найновіші (потенційно не випущені) оновлення до пакунку.\n" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускаємо вже завантажений файл '%s'\n" -#: cmdline/apt-get.cc:2604 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr "Недостатньо місця в %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2644 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необхідно завантажити %sB/%sB з архівів вихідних текстів.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2649 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Потрібно завантажити %sB архівів з вихідними текстами.\n" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "Завантаження вихідних текстів %s\n" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "Деякі архіви не вдалося завантажити." -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Пропускається розпакування вихідних текстів, тому що вже розпаковано в %s\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Команда розпакування '%s' завершилася невдало.\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "Команда побудови '%s' закінчилася невдало.\n" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "Породжений процес завершився невдало" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 msgid "Must specify at least one package to check builddeps for" msgstr "" "Для перевірки залежностей для побудови необхідно вказати як мінімум один " "пакунок" -#: cmdline/apt-get.cc:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -982,17 +1000,17 @@ msgstr "" "Відсутня інформація про архітектуру для %s. Дивись apt.conf(5) APT::" "Архітектури для налащтування" -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Неможливо одержати інформацію про залежності для побудови %s" -#: cmdline/apt-get.cc:2839 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr "%s не має залежностей для побудови.\n" -#: cmdline/apt-get.cc:3009 +#: cmdline/apt-get.cc:3040 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -1001,7 +1019,7 @@ msgstr "" "Залежність типу %s для %s не може бути задоволена, бо %s не є дозволеним на " "'%s' пакунках" -#: cmdline/apt-get.cc:3027 +#: cmdline/apt-get.cc:3058 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1009,14 +1027,14 @@ msgid "" msgstr "" "Залежність типу %s для %s не може бути задоволена, бо пакунок %s не знайдено" -#: cmdline/apt-get.cc:3050 +#: cmdline/apt-get.cc:3081 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Не вдалося задовольнити залежність типу %s для %s: Встановлений пакунок %s " "новіше, аніж треба" -#: cmdline/apt-get.cc:3089 +#: cmdline/apt-get.cc:3120 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1025,7 +1043,7 @@ msgstr "" "Залежність типу %s для %s не може бути задоволена, бо версія пакунку-" "кандидата %s не задовольняє умови по версіям" -#: cmdline/apt-get.cc:3095 +#: cmdline/apt-get.cc:3126 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1034,30 +1052,30 @@ msgstr "" "Залежність типу %s для %s не може бути задоволена, бо немає пакунку-" "кандидата %s потрібної версії" -#: cmdline/apt-get.cc:3118 +#: cmdline/apt-get.cc:3149 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Неможливо задовольнити залежність типу %s для пакунка %s: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3164 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Залежності для побудови %s не можуть бути задоволені." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "Обробка залежностей для побудови закінчилася невдало" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, c-format msgid "Changelog for %s (%s)" msgstr "Журнал змін для %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "Підтримувані модулі:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1149,7 +1167,7 @@ msgstr "" "містять більше інформації і опцій.\n" " Цей APT має Супер-Коров'ячу Силу.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1224,8 +1242,8 @@ msgid "%s was already not hold.\n" msgstr "%s вже був незафіксований.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Очікував на %s, але його там не було" @@ -1312,7 +1330,7 @@ msgstr "" msgid "Disk not found." msgstr "Диск не знайдено." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "Файл не знайдено" @@ -1376,7 +1394,7 @@ msgstr "Команда '%s' у скрипті логіна не вдалася, msgid "TYPE failed, server said: %s" msgstr "TYPE невдало, сервер мовив: %s" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "Час з'єднання вичерпався" @@ -1384,8 +1402,8 @@ msgstr "Час з'єднання вичерпався" msgid "Server closed the connection" msgstr "Сервер закрив з'єднання" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "Помилка зчитування" @@ -1397,86 +1415,86 @@ msgstr "Відповідь переповнила буфер." msgid "Protocol corruption" msgstr "Спотворений протокол" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "Помилка запису" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "Неможливо створити сокет (socket)" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "Неможливо під'єднати сокет (socket) з даними, час з'єднання вичерпався" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "Неможливо під'єднати пасивний сокет (passive socket)." -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "Виклик getaddrinfo не зміг отримати слухаючий сокет" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "Неможливо приєднатися до сокета" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "Неможливо прослухати на сокеті" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "Не вдалося визначити назву сокета" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "Неможливо відіслати команду PORT" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Невідоме адресове сімейство %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT невдало, сервер мовив: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "Час з'єднання з сокетом даних вичерпався" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "Неможливо прийняти з'єднання" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "Проблема хешування файла" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Неможливо завантажити файл, сервер мовив: '%s'" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "Час з'єднання з сокетом (socket) з даними вичерпався" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Передача даних обірвалася, сервер мовив '%s'" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "Черга" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "Неможливо викликати " @@ -1512,7 +1530,7 @@ msgstr "Неможливо під'єднатися до %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "З'єднання з %s" @@ -1542,38 +1560,38 @@ msgstr "Сталося щось дивне при спробі отримати msgid "Unable to connect to %s:%s:" msgstr "Неможливо під'єднатися до %s:%s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:167 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Внутрішня помилка: Вірний підпис (signature), але не можливо визначити його " "відбиток?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "Знайдено як мінімум один невірний підпис." -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:173 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "Неможливо виконати 'gpgv' для перевірки підпису (чи встановлено gpgv?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "Невідома помилка виконання gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 msgid "The following signatures were invalid:\n" msgstr "Наступні підписи були невірними:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1613,59 +1631,59 @@ msgstr "Цей HTTP сервер має поламану підтримку 'ran msgid "Unknown date format" msgstr "Невідомий формат дати" -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "Вибір провалився" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "Час очікування з'єднання вийшов" -#: methods/http.cc:855 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "Помилка запису у вихідний файл" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "Помилка запису у файл" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "Помилка запису у файл" -#: methods/http.cc:928 +#: methods/http.cc:927 msgid "Error reading from server. Remote end closed connection" msgstr "Помилка зчитування з сервера. Віддалена сторона закрила з'єднання" -#: methods/http.cc:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "Помилка зчитування з сервера" -#: methods/http.cc:1198 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "Погана заголовкова інформація" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "З'єднання не вдалося" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "Внутрішня помилка" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "Неможливо прочитати %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1718,7 +1736,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "Не вдалося створити IPC канал для підпроцесу" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "З'єднання завершено передчасно" @@ -2212,11 +2230,11 @@ msgstr "Невірний заголовок 'member' %s в архіві" msgid "Invalid archive member header" msgstr "Невірний заголовок 'member' в архіві" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "Архів занадто малий" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "Не вдалося прочитати заголовки в архіві" @@ -2551,7 +2569,7 @@ msgstr "Невірна дія %s" msgid "Unable to stat the mount point %s" msgstr "Неможливо прочитати атрибути точки монтування %s" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "Не вдалося прочитати атрибути cdrom" @@ -2572,104 +2590,104 @@ msgstr "" msgid "Could not open lock file %s" msgstr "Неможливо відкрити 'lock' файл %s" -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Блокування не використовується, так як файл блокування %s знаходиться на " "файловій системі nfs" -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "Неможливо отримати замок %s" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "Неможливо створити перелік файлів, так як '%s' не є директорією" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "Ігнорується '%s' у директорії '%s', так як не є звичайним файлом" -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "Ігнорується файл '%s' у директорії '%s', так як він не має розширення" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" "Ігнорується файл '%s' у директорії '%s', так як він має невірне розширення" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Підпроцес %s отримав 'segmentation fault' (фатальна помилка)." -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, c-format msgid "Sub-process %s received signal %u." msgstr "Підпроцес %s отримав сигнал %u." -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Підпроцес %s повернув код помилки (%u)" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Підпроцес %s раптово завершився" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "Неможливо відкрити файл %s" -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, c-format msgid "Could not open file descriptor %d" msgstr "Неможливо відкрити файловий дескриптор %d" -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "Не вдалося створити IPC з породженим процесом" -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "Не вдалося виконати компресор " -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, c-format msgid "read, still have %llu to read but none left" msgstr "зчитування, повинен зчитати ще %llu байт, але нічого більше нема" -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "записування, повинен був записати ще %llu байт, але не вдалося" -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, c-format msgid "Problem closing the file %s" msgstr "Проблема з закриттям файла %s" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Проблема з перейменуванням файла %s на %s" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, c-format msgid "Problem unlinking the file %s" msgstr "Проблема з роз'єднанням файла %s" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "Проблема з синхронізацією файла" @@ -2868,7 +2886,7 @@ msgstr "Спотворений рядок %u у переліку джерел %s msgid "Type '%s' is not known on line %u in source list %s" msgstr "Невідомий тип '%s' на рядку %u в переліку джерел %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2877,12 +2895,12 @@ msgstr "" "Неможливо прямо налаштувати конфігурацію на '%s'. Будь-ласка, дивіться man 5 " "apt.conf, нижче APT::Immediate-Configure для деталей. (%d)" -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, c-format msgid "Could not configure '%s'. " msgstr "Неможливо налаштувати '%s'." -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2906,7 +2924,7 @@ msgid "" msgstr "" "Пакунок %s повинен бути перевстановленим, але я не можу знайти його архів." -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2914,11 +2932,11 @@ msgstr "" "Помилка, pkgProblemResolver::Resolve згенерував зупинку, це може бути " "пов'язано з зафіксованими пакунками." -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "Неможливо усунути проблеми, ви маєте поламані зафіксовані пакунки." -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3090,12 +3108,12 @@ msgstr "не вдалося перейменувати, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "Невідповідність MD5Sum" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 msgid "Hash Sum mismatch" msgstr "Невідповідність хешу MD5Sum" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3104,16 +3122,16 @@ msgstr "" "Неможливо знайти очікуваний запис '%s' у 'Release' файлі (Невірний запис у " "sources.list, або пошкоджений файл)" -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Неможливо знайти хеш-суму для '%s' у 'Release' файлі" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "Відсутній публічний ключ для заданих ідентифікаторів (ID) ключа:\n" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3122,12 +3140,12 @@ msgstr "" "Файл 'Release' для %s застарів (недійсний з %s). Оновлення для цього " "репозиторія не будуть застосовані." -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Конфліктуючий дистрибутив: %s (очікувався %s, але є %s)" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3137,12 +3155,12 @@ msgstr "" "попередні індексні файли будуть використані. Помилка GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "Помилка GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3151,7 +3169,7 @@ msgstr "" "Я не зміг знайти файл для пакунку %s. Можливо, це значить, що вам потрібно " "власноруч виправити цей пакунок. (через відсутність 'arch')" -#: apt-pkg/acquire-item.cc:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3160,14 +3178,14 @@ msgstr "" "Я не зміг знайти файл для пакунку %s. Можливо, це значить, що вам потрібно " "власноруч виправити цей пакунок." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Індексні файли пакунків пошкоджені. Немає поля 'Filename' для пакунку %s." -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "Невідповідність розміру" @@ -3291,22 +3309,22 @@ msgstr "Записується новий перелік вихідних тек msgid "Source list entries for this disc are:\n" msgstr "Перелік вихідних текстів для цього диска:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "Записано %i записів.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Записано %i записів з %i відсутніми файлами.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Записано %i записів з %i невідповідними файлам\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Записано %i записів з %i відсутніми і %i невідповідними файлами\n" @@ -3405,12 +3423,12 @@ msgstr "Виконати зовнішній розв'язувач" msgid "Installing %s" msgstr "Встановлюється %s" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr "Налаштовується %s" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr "Видаляється %s" @@ -3431,81 +3449,81 @@ msgid "Running post-installation trigger %s" msgstr "Виконується післяустановочний ініціатор %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, c-format msgid "Directory '%s' missing" msgstr "Директорія '%s' відсутня" -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, c-format msgid "Could not open file '%s'" msgstr "Неможливо відкрити файл '%s'" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr "Підготовка %s" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr "Розпакування %s" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "Підготовка до конфігурації %s" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr "Встановлено %s" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "Підготовка до видалення %s" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr "Видалено %s" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "Підготовка до повного видалення %s" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr "Повністю видалено %s" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Неможливо записати в лог, проблема з openpty() (не змонтовано /dev/pts?)\n" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "Виконується dpkg" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "Операцію було перервано до того, як вона мала завершитися" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "" "Звіт apport не був записаний, тому що параметр MaxReports вже досягнув " "максимальної величини" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "проблеми з залежностями - залишено неналаштованим" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3513,7 +3531,7 @@ msgstr "" "Звіт apport не був записаний, тому що повідомлення про помилку вказує на те, " "що ця помилка є наслідком попередньої невдачі." -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3521,7 +3539,7 @@ msgstr "" "Звіт apport не був записаний, тому що повідомлення про помилку вказує на " "відсутність вільного місця на диску" -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3529,7 +3547,7 @@ msgstr "" "Звіт apport не був записаний, тому що повідомлення про помилку вказує на " "відсутність вільного місця у пам'яті" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/vi.po b/po/vi.po index 6b11b6d53..f124f01a9 100644 --- a/po/vi.po +++ b/po/vi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-0.9.9.1\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2013-07-16 08:10+0700\n" "Last-Translator: Trần Ngọc Quân \n" "Language-Team: Vietnamese \n" @@ -94,79 +94,79 @@ msgstr "Tổng chỗ nghỉ: " msgid "Total space accounted for: " msgstr "Tổng chỗ đã tính dành cho: " -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "Tập tin gói %s không đồng bộ được." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Không tìm thấy gói" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 msgid "You must give at least one search pattern" msgstr "Bạn phải đưa ra ít nhất một chuỗi tìm kiếm" -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" "Lệnh này đã bị loại bỏ. Xin hãy dùng lệnh 'apt-mark showauto' để thay thế." -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Không thể định vị gói %s" -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "Tập tin gói:" -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Bộ nhớ tạm không đồng bộ được nên không thể tham chiếu chéo tập tin gói" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "Các gói đã ghim:" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(không tìm thấy)" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr " Đã cài đặt: " -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr " Ứng cử: " -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(không có)" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr " Ghim gói: " #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr " Bảng phiên bản:" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s dành cho %s được biên dịch trên %s %s\n" -#: cmdline/apt-cache.cc:1730 +#: cmdline/apt-cache.cc:1760 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -303,83 +303,101 @@ msgstr "" " -c=? Đọc tập tin cấu hình này\n" " -o=? Đặt một tùy chọn cấu hình nhiệm ý, v.d. “-o dir::cache=/tmp”\n" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +msgid "[Y/n]" +msgstr "[C/k]" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "[c/K]" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" msgstr "C" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" msgstr "K" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Lỗi biên dịch biểu thức chính quy - %s" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "Những gói theo đây có phần phụ thuộc chưa có:" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "nhưng mà %s đã được cài đặt" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "nhưng mà %s sẽ được cài đặt" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "nhưng mà nó không có khả năng cài đặt" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "nhưng mà nó là gói ảo" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "nhưng mà nó chưa được cài đặt" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "nhưng mà nó sẽ không được cài đặt" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr " hay" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "Theo đây có những gói MỚI sẽ được cài đặt:" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "Theo đây có những gói sẽ bị GỠ BỎ:" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 msgid "The following packages have been kept back:" msgstr "Theo đây có những gói đã được giữ lại:" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "Theo đây có những gói sẽ được nâng cấp:" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "Theo đây có những gói sẽ được HẠ CẤP:" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "Theo đây có những gói sẽ được thay đổi:" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s (bởi vì %s) " -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -387,59 +405,59 @@ msgstr "" "CẢNH BÁO: Có những gói chủ yếu sau đây sẽ bị gỡ bỏ.\n" "ĐỪNG làm như thế trừ khi bạn biết chính xác mình đang làm gì!" -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu đã nâng cấp, %lu mới được cài đặt, " -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "%lu được cài đặt lại, " -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "%lu được hạ cấp, " -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu cần gỡ bỏ, và %lu chưa được nâng cấp.\n" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu chưa được cài đặt toàn bộ hay được gỡ bỏ.\n" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "Ghi chú: đang chọn “%s” cho tác vụ “%s”\n" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, 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:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Gói %s là gói ảo được cung cấp do:\n" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr " [Đã cài đặt]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 msgid " [Not candidate version]" msgstr " [Không phải phiên bản ứng cử]" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "Bạn nên chọn một rõ ràng gói cần cài." -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -450,179 +468,179 @@ msgstr "" "đã tham chiếu đến nó. Có lẽ có gói còn thiếu,\n" "không còn dùng nữa, hay chỉ sẵn sàng từ một nguồn khác.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "Tuy nhiên, những gói theo đây thay thế nó:" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, c-format msgid "Package '%s' has no installation candidate" msgstr "Gói “%s” không có ứng cử cài đặt" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "Không thể gỡ bỏ được gói ảo như “%s”\n" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "Chưa cài đặt gói %s nên không thể gỡ bỏ nó. Có phải ý bạn là '%s'?\n" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "Gói %s chưa được cài đặt, thế nên không thể gỡ bỏ nó\n" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "Ghi chú: đang chọn “%s” thay cho “%s”\n" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Đang bỏ qua %s vì nó đã được cài đặt và chưa lập tùy chọn Nâng cấp.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "" "Đang bỏ qua %s vì nó chưa được cài đặt và chỉ Nâng cấp là được yêu cầu.\n" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Không thể cài đặt lại %s vì không thể tải về nó.\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "%s là phiên bản mới nhất.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, 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:884 +#: cmdline/apt-get.cc:913 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "Đã chọn phiên bản “%s” (%s) cho “%s”\n" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "Đã chọn phiên bản '%s' (%s) cho '%s' vì '%s'\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "Đang sửa chữa quan hệ phụ thuộc..." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr " gặp lỗi." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "Không thể sửa phần phụ thuộc" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "Không thể tối thiểu hóa tập hợp nâng cấp" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr " Xong" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Bạn có thể chạy lệnh “apt-get -f install” để sửa những lỗi trên." -#: cmdline/apt-get.cc:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "" "Còn có cách phụ thuộc vào phần mềm chưa có. Như thế thì bạn hãy cố dùng tùy " "chọn “-f”." -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 msgid "WARNING: The following packages cannot be authenticated!" msgstr "CẢNH BÁO: Không thể xác thực những gói theo đây!" -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "Cảnh báo xác thực bị đè.\n" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " -msgstr "Cài đặt những gói này mà không cần thẩm tra không? [y/N] [c/K] " +#: cmdline/apt-get.cc:1108 +msgid "Install these packages without verification?" +msgstr "Cài đặt những gói này mà không cần thẩm tra không?" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" msgstr "Một số gói không thể được xác thực" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "Gập lỗi và đã dùng tùy chọn “-y” mà không có “--force-yes”" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Lỗi nội bộ: InstallPackages (cài đặt gói) được gọi với gói bị hỏng!" -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 msgid "Packages need to be removed but remove is disabled." msgstr "Cần phải gỡ bỏ một số gói, nhưng mà khả năng Gỡ bỏ (Remove) đã bị tắt." -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 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:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Lạ nhỉ... Kích cỡ không khớp nhau. Hãy gửi thư cho " #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Cần phải lấy %sB/%sB từ kho chứa.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Cần phải lấy %sB từ kho chứa.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Sau thao tác này, %sB dung lượng đĩa thêm sẽ được dùng thêm.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Sau thao tác này, %sB dung lượng đĩa sẽ được giải phóng.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Couldn't determine free space in %s" msgstr "Không thể tìm được chỗ trống trong %s" -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, c-format msgid "You don't have enough free space in %s." msgstr "Bạn không có đủ dung lượng đĩa còn trống trong %s." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "Đã đưa ra “Chỉ không đáng kể” (Trivial Only) nhưng mà thao tác này là đáng " @@ -630,11 +648,11 @@ msgstr "" #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "Có, làm đi!" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -645,28 +663,28 @@ msgstr "" "Nếu vẫn muốn tiếp tục thì hãy gõ cụm từ “%s”\n" "?]" -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "Hủy bỏ." -#: cmdline/apt-get.cc:1284 -msgid "Do you want to continue [Y/n]? " -msgstr "Bạn có muốn tiếp tục không? [C/k] " +#: cmdline/apt-get.cc:1313 +msgid "Do you want to continue?" +msgstr "Bạn có muốn tiếp tục không?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Gặp lỗi khi lấy %s %s\n" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "Một số tập tin không tải về được" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "Mới tải về xong và trong chế độ chỉ tải về" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -675,20 +693,20 @@ msgstr "" "nhật)\n" "hay dùng tùy chọn “--fix-missing” (sửa thiếu sót) không?" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "" "Chưa hỗ trợ tùy chọn “--fix-missing” (sửa khi thiếu) và trao đổi phương tiện." -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "Không thể sửa những gói còn thiếu." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "Đang hủy bỏ tiến trình cài đặt." -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -699,35 +717,35 @@ msgstr[0] "" "Những gói theo đây không còn nằm trên hệ thống này vì mọi tập tin đều bị gói " "khác ghi đè:" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Ghi chú: Thay đổi này được tự động thực hiện bởi dpkg." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Bỏ qua bản phát hành đích không sẵn sàng “%s” của gói “%s”" -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Đang chọn “%s” làm gói nguồn, thay thế cho “%s”\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Bỏ qua phiên bản không sẵn sàng “%s” của gói “%s”" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr "Lệnh cập nhật không chấp nhận đối số" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 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:1817 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -745,15 +763,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 msgid "The following information may help to resolve the situation:" msgstr "Có lẽ thông tin theo đây sẽ giúp đỡ bạn giải quyết tình trạng này:" -#: cmdline/apt-get.cc:1824 +#: cmdline/apt-get.cc:1853 msgid "Internal Error, AutoRemover broke stuff" msgstr "Lỗi nội bộ: Bộ Gỡ bỏ Tự động đã làm hỏng một thứ gì đó" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -762,27 +780,27 @@ msgid_plural "" msgstr[0] "" "(Các) gói sau đây đã được tự động cài đặt nên không còn cần thiết lại:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" "%lu packages were automatically installed and are no longer required.\n" msgstr[0] "%lu gói đã được tự động cài đặt nên không còn cần thiết lại.\n" -#: cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1866 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Hãy dùng lệnh `apt-get autoremove' để gỡ bỏ chúng." -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "Lỗi nội bộ: AllUpgrade (toàn bộ nâng cấp) đã làm hỏng thứ gì đó" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1984 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Có lẽ bạn cần chạy lệnh “apt-get -f install” để sửa những cái đó:" -#: cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -790,7 +808,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 chỉ định cách thức giải quyết)." -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:2002 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" @@ -802,33 +820,33 @@ msgstr "" "chưa ổn định cái mà yêu cầu các gói mà nó chưa được tạo\n" "hoặc di chuyển chúng ra khỏi phần Incoming (Đến)." -#: cmdline/apt-get.cc:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "Gói bị hỏng" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 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:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "Các gói đề nghị:" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "Gói khuyến khích:" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "Không tìm thấy gói %s" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s được đặt thành “được tự động cài đặt”.\n" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -836,46 +854,46 @@ msgstr "" "Lệnh này đã bị loại bỏ. Xin hãy dùng lệnh 'apt-mark auto' và 'apt-mark " "manual' để thay thế." -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "Đang tính bước nâng cấp... " -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "Gặp lỗi" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "Xong" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 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:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "Không thể khoá thư mục tải về" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Không tìm thấy nguồn cho việc tải về phiên bản '%s' of '%s'" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "Đang tải về %s %s" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 msgid "Must specify at least one package to fetch source for" msgstr "Phải chỉ định ít nhất một gói để mà lấy mã nguồn về cho nó" -#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, 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:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -885,7 +903,7 @@ msgstr "" "“%s” tại:\n" "%s\n" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, c-format msgid "" "Please use:\n" @@ -896,69 +914,69 @@ msgstr "" "bzr branch %s\n" "để lấy các gói mới nhất (có thể là chưa phát hành).\n" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, 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:2604 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr "Không đủ chỗ trống trên %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2644 #, 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" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2649 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Cần phải lấy %sB từ kho nguồn.\n" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "Lấy mã nguồn %s\n" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "Gặp lỗi lkhi lấy một số kho." -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, 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:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Lệnh giải nén “%s” bị lỗi.\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, 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ài đặt chưa.\n" -#: cmdline/apt-get.cc:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "Lệnh xây dựng “%s” bị lỗi.\n" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "Tiến trình con bị lỗi" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 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:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -967,17 +985,17 @@ msgstr "" "Không có thông tin kiến trúc sẵn sàng cho %s. Xem apt.conf(5) APT::" "Architectures để cài đặt" -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, 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:2839 +#: cmdline/apt-get.cc:2870 #, 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:3009 +#: cmdline/apt-get.cc:3040 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -985,20 +1003,20 @@ msgid "" msgstr "" "phụ thuộc %s cho %s không ổn thỏa bởi vì %s không được cho phép trên gói '%s'" -#: cmdline/apt-get.cc:3027 +#: cmdline/apt-get.cc:3058 #, 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:3050 +#: cmdline/apt-get.cc:3081 #, 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 là quá mới" -#: cmdline/apt-get.cc:3089 +#: cmdline/apt-get.cc:3120 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1007,7 +1025,7 @@ msgstr "" "cách phụ thuộc %s cho %s không thể được thỏa mãn phiên bản ứng cử của gói %s " "có thể thỏa mãn điều kiện phiên bản" -#: cmdline/apt-get.cc:3095 +#: cmdline/apt-get.cc:3126 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1016,30 +1034,30 @@ msgstr "" "cách phụ thuộc %s cho %s không thể được thỏa mãn bởi vì gói %s không có bản " "ứng cử" -#: cmdline/apt-get.cc:3118 +#: cmdline/apt-get.cc:3149 #, 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:3133 +#: cmdline/apt-get.cc:3164 #, 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:3138 +#: cmdline/apt-get.cc:3169 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:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, c-format msgid "Changelog for %s (%s)" msgstr "Changelog cho %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "Mô-đun đã hỗ trợ:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1132,7 +1150,7 @@ msgstr "" " apt-get(8), sources.list(5) và apt.conf(5).\n" " Trình APT này có năng lực của siêu bò.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1207,8 +1225,8 @@ msgid "%s was already not hold.\n" msgstr "%s đã sẵn được đặt là không giữ lại.\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Cần %s nhưng mà không thấy nó ở đây" @@ -1296,7 +1314,7 @@ msgstr "Không thể bỏ gắn đĩa CD-ROM trong %s. Có lẽ nó vẫn đang msgid "Disk not found." msgstr "Không tìm thấy đĩa." -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "Không tìm thấy tập tin" @@ -1359,7 +1377,7 @@ msgstr "Văn lệnh đăng nhập “%s” đã thất bại: máy chủ nói: % msgid "TYPE failed, server said: %s" msgstr "Lệnh TYPE (kiểu) đã thất bại: máy chủ nói: %s" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "Thời hạn kết nối" @@ -1367,8 +1385,8 @@ msgstr "Thời hạn kết nối" msgid "Server closed the connection" msgstr "Máy phục vụ đã đóng kết nối" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "Lỗi đọc" @@ -1380,86 +1398,86 @@ msgstr "Một trả lời đã tràn bộ đệm." msgid "Protocol corruption" msgstr "Giao thức bị hỏng" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "Lỗi ghi" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "Không thể tạo ổ cắm" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "Không thể kết nối ổ cắm dữ liệu, kết nối đã quá giờ" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "Không thể kết nối ổ cắm bị động." -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo (lấy thông tin địa chỉ) không thể lấy ổ cắm lắng nghe" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "Không thể đóng kết ổ cắm" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "Không thể lắng nghe trên ổ cắm đó" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "Không thể quyết định tên ổ cắm đó" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "Không thể gửi lệnh PORT (cổng)" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Không biết họ địa chỉ %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "Lệnh EPRT (thông báo lỗi) đã thất bại: máy chủ nói: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "Quá giờ kết nối ổ cắm dữ liệu" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "Không thể chấp nhận kết nối" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "Gặp vấn đề băm tập tin" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Không thể lấy tập tin: máy phục vụ nói “%s”" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "Ổ cắm dữ liệu đã quá giờ" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Việc truyền dữ liệu bị lỗi: máy phục vụ nói “%s”" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "Truy vấn" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "Không thể gọi " @@ -1495,7 +1513,7 @@ msgstr "Không thể kết nối đến %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "Đang kết nối đến %s" @@ -1525,22 +1543,22 @@ msgstr "Một số hư hỏng đã xảy ra khi phân giải “%s:%s” (%i - % msgid "Unable to connect to %s:%s:" msgstr "Không thể kết nối đến %s: %s:" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:167 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ể xác định vân tay của khóa?!" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:171 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:172 +#: methods/gpgv.cc:173 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Không thể thực hiện “gpgv” để thẩm tra chữ ký (gpgv đã được cài đặt chưa?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " @@ -1549,15 +1567,15 @@ msgstr "" "Tập tin Clearsigned không hợp lệ, nhận được '%s' (mạng yêu cầu xác nhận " "phải không?)" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "Gặp lỗi không rõ khi thực hiện gpgv" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 msgid "The following signatures were invalid:\n" msgstr "Những chữ ký theo đây không hợp lệ:\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1600,59 +1618,59 @@ msgstr "Máy phục vụ HTTP đã ngắt cách hỗ trợ phạm vi" msgid "Unknown date format" msgstr "Không rõ định dạng ngày" -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "Việc chọn bị lỗi" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "Kết nối đã quá giờ" -#: methods/http.cc:855 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "Gặp lỗi khi ghi vào tập tin xuất" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "Gặp lỗi khi ghi vào tập tin" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "Gặp lỗi khi ghi vào tập tin" -#: methods/http.cc:928 +#: methods/http.cc:927 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:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "Gặp lỗi khi đọc từ máy phục vụ" -#: methods/http.cc:1198 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "Dữ liệu dòng đầu sai" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "Kết nối bị ngắt" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "Gặp lỗi nội bộ" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "Không thể đọc %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1704,7 +1722,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "Việc tạo ống IPC đến tiến trình con bị lỗi" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "Kết nối bị đóng quá sớm." @@ -2204,11 +2222,11 @@ msgstr "Phần đầu bộ phận kho lưu không hợp lệ %s" msgid "Invalid archive member header" msgstr "Phần đầu bộ phận kho không hợp lê" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "Kho quá ngắn" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "Việc đọc phần đầu kho bị lỗi" @@ -2539,7 +2557,7 @@ msgstr "Thao tác không hợp lệ %s" msgid "Unable to stat the mount point %s" msgstr "Không thể lấy các thông tin cho điểm gắn kết %s" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "Việc lấy các thông tin thống kê đĩa CD-ROM bị lỗi" @@ -2558,34 +2576,34 @@ msgstr "Không dùng khả năng khóa cho tập tin khóa chỉ đọc %s" msgid "Could not open lock file %s" msgstr "Không thể mở tập tin khóa %s" -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Không dùng khả năng khóa cho tập tin khóa đã lắp kiểu NFS %s" -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "Không thể lấy khóa %s" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" "Liệt kê các tập tin không thể được tạo ra vì '%s' không phải là một thư mục" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "Bỏ qua '%s' trong thư mục '%s'vì nó không phải là tập tin bình thường" -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" "Bỏ qua tập tin '%s' trong thư mục '%s' vì nó không có phần đuôi mở rộng" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" @@ -2593,70 +2611,70 @@ msgstr "" "Bỏ qua tập tin '%s' trong thư mục '%s' vì nó có phần đuôi mở rộng không hợp " "lệ" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Tiến trình phụ %s đã nhận một lỗi chia ra từng đoạn." -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, c-format msgid "Sub-process %s received signal %u." msgstr "Tiến trình con %s đã nhận tín hiệu %u." -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Tiến trình con %s đã trả về một mã lỗi (%u)" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Tiến trình con %s đã thoát bất thường" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "Không thể mở tập tin %s" -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, c-format msgid "Could not open file descriptor %d" msgstr "Không thể mở bộ mô tả tập tin %d" -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "Việc tạo tiến trình con IPC bị lỗi" -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "Gặp lỗi khi thực hiện nén" -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, c-format msgid "read, still have %llu to read but none left" msgstr "đọc, còn cần đọc %llu nhưng mà không có gì còn lại cả" -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "ghi, còn cần ghi %llu nhưng mà không thể" -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, c-format msgid "Problem closing the file %s" msgstr "Gặp vấn đề khi đóng tập tin %s" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Gặp vấn đề khi đổi tên tập tin %s thành %s" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, c-format msgid "Problem unlinking the file %s" msgstr "Gặp vấn đề khi bỏ liên kết tập tin %s" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "Gặp vấn đề khi đồng bộ hóa tập tin" @@ -2862,7 +2880,7 @@ msgstr "Gặp dòng dạng sai %u trong danh sách nguồn %s (kiểu)." msgid "Type '%s' is not known on line %u in source list %s" msgstr "Không biết kiểu “%s” trên dòng %u trong danh sách nguồn %s." -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2871,12 +2889,12 @@ msgstr "" "Không thể thực hiện ngay lập tức tiến trình cấu hình “%s”. Xem “man 5 apt." "conf ” dưới “APT::Immediate-Configure” để tìm chi tiết. (%d)" -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, c-format msgid "Could not configure '%s'. " msgstr "Không thể cấu hình '%s'. " -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2899,7 +2917,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Cần phải cài đặt lại gói %s, nhưng mà không thể tìm kho cho nó." -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2907,11 +2925,11 @@ msgstr "" "Lỗi: “pkgProblemResolver::Resolve” (bộ tháo gỡ vấn đề gọi::tháo gỡ) đã tạo " "ra nhiều chỗ ngắt, có lẽ một số gói đã giữ lại đã gây ra trường hợp này." -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "Không thể sửa vấn đề, bạn đã giữ lại một số gói bị ngắt." -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3084,12 +3102,12 @@ msgstr "gặp lỗi khi đổi tên, %s (%s → %s)." msgid "MD5Sum mismatch" msgstr "Mã băm tổng kiểm MD5Sum không khớp" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 msgid "Hash Sum mismatch" msgstr "Mã băm tổng kiểm tra (hash sum) không khớp" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3098,16 +3116,16 @@ msgstr "" "Không tìm thấy mục cần thiết '%s' trong tập tin Phát hành (Sai mục trong " "sources.list hoặc tập tin bị hỏng)" -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Không thể tìm thấy mã băm tổng kiểm tra cho tập tin Phát hành %s" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "Không có khóa công sẵn sàng cho những mã số khoá theo đây:\n" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3116,12 +3134,12 @@ msgstr "" "Tập tin phát hành %s đã hết hạn (không hợp lệ kể từ %s). Cập nhật cho kho " "này sẽ không được áp dụng." -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Bản phát hành xung đột: %s (cần %s nhưng lại nhận được %s)" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3132,12 +3150,12 @@ msgstr "" "Lỗi GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "Lỗi GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3146,7 +3164,7 @@ msgstr "" "Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói " "này, do thiếu kiến trúc." -#: apt-pkg/acquire-item.cc:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3155,7 +3173,7 @@ msgstr "" "Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói " "này." -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3163,7 +3181,7 @@ msgstr "" "Các tập tin chỉ mục của gói này bị hỏng. Không có trường Filename: (Tên tập " "tin:) cho gói %s." -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "Kích cỡ không khớp nhau" @@ -3289,22 +3307,22 @@ msgstr "Đang ghi danh sách nguồn mới\n" msgid "Source list entries for this disc are:\n" msgstr "Các mục nhập danh sách nguồn cho đĩa này:\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "Đã ghi %i bản ghi.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Đã ghi %i bản ghi với %i tập tin còn thiếu.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Đã ghi %i bản ghi với %i tập tin không khớp với nhau\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3397,12 +3415,12 @@ msgstr "Thi hành bộ phân giải từ bên ngoài" msgid "Installing %s" msgstr "Đang cài đặt %s" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr "Đang cấu hình %s" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr "Đang gỡ bỏ %s" @@ -3423,79 +3441,79 @@ msgid "Running post-installation trigger %s" msgstr "Đang chạy bẫy sau-cài-đặt %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, c-format msgid "Directory '%s' missing" msgstr "Thiếu thư mục “%s”" -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, c-format msgid "Could not open file '%s'" msgstr "Không thể mở tập tin “%s”" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr "Đang chuẩn bị %s" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr "Đang mở gói %s" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "Đang chuẩn bị cấu hình %s" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr "Đã cài đặt %s" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "Đang chuẩn bị gỡ bỏ %s" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr "Đã gỡ bỏ %s" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "Đang chuẩn bị gỡ bỏ hoàn toàn %s" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr "Gỡ bỏ hoàn toàn %s" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "Không thể ghi nhật ký, openpty() bị lỗi (“/dev/pts” chưa gắn?)\n" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "Đang chạy dpkg" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "Hệ điều hành đã ngắt trước khi nó kịp hoàn thành" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "" "Không ghi báo cáo apport, vì đã tới giới hạn số các báo cáo (MaxReports)" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "gặp vấn đề về quan hệ phụ thuộc nên để lại không cấu hình" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3503,14 +3521,14 @@ msgstr "" "Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi kế tiếp " "do một sự thất bại trước đó." -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" "Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “đĩa đầy”" -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3518,7 +3536,7 @@ msgstr "" "Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “không đủ " "bộ nhớ”" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 51bfebd4f..ebccc335e 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.0~pre1\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2010-08-26 14:42+0800\n" "Last-Translator: Aron Xu \n" "Language-Team: Chinese (simplified) \n" @@ -92,77 +92,77 @@ msgstr "Slack 空间共计：" msgid "Total space accounted for: " msgstr "总占用空间：" -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, c-format msgid "Package file %s is out of sync." msgstr "软件包文件 %s 尚未同步。" -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 -#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 +#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "没有发现匹配的软件包" -#: cmdline/apt-cache.cc:1243 +#: cmdline/apt-cache.cc:1265 msgid "You must give at least one search pattern" msgstr "您必须明确地给出至少一个表达式" -#: cmdline/apt-cache.cc:1401 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "未发现软件包 %s" -#: cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1556 msgid "Package files:" msgstr "软件包文件：" -#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 msgid "Cache is out of sync, can't x-ref a package file" msgstr "缓存尚未同步，无法交差引证(x-ref)一个软件包文件" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1577 msgid "Pinned packages:" msgstr "被锁定的软件包：" -#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(没有找到)" -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr " 已安装：" -#: cmdline/apt-cache.cc:1568 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr " 候选软件包：" -#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(无)" -#: cmdline/apt-cache.cc:1601 +#: cmdline/apt-cache.cc:1631 msgid " Package pin: " msgstr " 软件包锁：" #. Show the priority tables -#: cmdline/apt-cache.cc:1610 +#: cmdline/apt-cache.cc:1640 msgid " Version table:" msgstr " 版本列表：" -#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s，用于 %s 构架，编译于 %s %s\n" -#: cmdline/apt-cache.cc:1730 +#: cmdline/apt-cache.cc:1760 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -293,83 +293,101 @@ msgstr "" " -c=? 读取指定的配置文件\n" " -o=? 设置任意指定的配置选项，例如：-o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:135 +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:146 +msgid "[Y/n]" +msgstr "" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: cmdline/apt-get.cc:152 +msgid "[y/N]" +msgstr "" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: cmdline/apt-get.cc:163 msgid "Y" -msgstr "Y" +msgstr "" -#: cmdline/apt-get.cc:140 +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: cmdline/apt-get.cc:169 msgid "N" msgstr "" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "编译正则表达式时出错 - %s" -#: cmdline/apt-get.cc:260 +#: cmdline/apt-get.cc:289 msgid "The following packages have unmet dependencies:" msgstr "下列软件包有未满足的依赖关系：" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "但是 %s 已经安装" -#: cmdline/apt-get.cc:352 +#: cmdline/apt-get.cc:381 #, c-format msgid "but %s is to be installed" msgstr "但是 %s 正要被安装" -#: cmdline/apt-get.cc:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "但无法安装它" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "但是它是虚拟软件包" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "但是它还没有被安装" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not going to be installed" msgstr "但是它将不会被安装" -#: cmdline/apt-get.cc:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr " 或" -#: cmdline/apt-get.cc:398 +#: cmdline/apt-get.cc:427 msgid "The following NEW packages will be installed:" msgstr "下列【新】软件包将被安装：" -#: cmdline/apt-get.cc:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "下列软件包将被【卸载】：" -#: cmdline/apt-get.cc:446 +#: cmdline/apt-get.cc:475 msgid "The following packages have been kept back:" msgstr "下列软件包的版本将保持不变：" -#: cmdline/apt-get.cc:467 +#: cmdline/apt-get.cc:496 msgid "The following packages will be upgraded:" msgstr "下列软件包将被升级：" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 msgid "The following packages will be DOWNGRADED:" msgstr "下列软件包将被【降级】：" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:537 msgid "The following held packages will be changed:" msgstr "下列被要求保持版本不变的软件包将被改变：" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s (是由于 %s) " -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -377,59 +395,59 @@ msgstr "" "【警告】：下列基础软件包将被卸载。\n" "请勿尝试，除非您确实知道您在做什么！" -#: cmdline/apt-get.cc:602 +#: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "升级了 %lu 个软件包，新安装了 %lu 个软件包，" -#: cmdline/apt-get.cc:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "重新安装了 %lu 个软件包，" -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "降级了 %lu 个软件包，" -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:639 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "要卸载 %lu 个软件包，有 %lu 个软件包未被升级。\n" -#: cmdline/apt-get.cc:614 +#: cmdline/apt-get.cc:643 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "有 %lu 个软件包没有被完全安装或卸载。\n" -#: cmdline/apt-get.cc:635 +#: cmdline/apt-get.cc:664 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "注意，为任务 %2$s 选中了 %1$s\n" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:669 #, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "注意，根据正则表达式 %2$s 选中了 %1$s\n" -#: cmdline/apt-get.cc:657 +#: cmdline/apt-get.cc:686 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "软件包 %s 是一个由下面的软件包提供的虚拟软件包：\n" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr " [已安装]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 msgid " [Not candidate version]" msgstr " [无候选版本]" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:708 msgid "You should explicitly select one to install." msgstr "请您明确地选择一个来进行安装。" -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:711 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -440,185 +458,185 @@ msgstr "" "这可能意味着这个缺失的软件包可能已被废弃，\n" "或者只能在其他发布源中找到\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:729 msgid "However the following packages replace it:" msgstr "可是下列软件包取代了它：" -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:741 #, c-format msgid "Package '%s' has no installation candidate" msgstr "软件包 %s 没有可供安装的候选者" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:754 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "类似 %s 的虚拟软件包可以卸载\n" #. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "软件包 %s 还未安装，因而不会被卸载\n" -#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "软件包 %s 还未安装，因而不会被卸载\n" -#: cmdline/apt-get.cc:788 +#: cmdline/apt-get.cc:817 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "注意，选取 %s 而非 %s\n" -#: cmdline/apt-get.cc:818 +#: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:851 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "忽略了 %s，它已经被安装而且仅请求了升级。\n" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:863 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "不能重新安装 %s，因为无法下载它。\n" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:868 #, c-format msgid "%s is already the newest version.\n" msgstr "%s 已经是最新的版本了。\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s 被设置为手动安装。\n" -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:913 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:918 #, fuzzy, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "正在更正依赖关系..." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr " 失败。" -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "无法更正依赖关系" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "无法最小化要升级的软件包集合" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr " 完成" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1069 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "您也许需要运行“apt-get -f install”来修正上面的错误。" -#: cmdline/apt-get.cc:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "不能满足依赖关系。不妨试一下 -f 选项。" -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 msgid "WARNING: The following packages cannot be authenticated!" msgstr "【警告】：下列软件包不能通过验证！" -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "忽略了认证警告。\n" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " -msgstr "不经验证就安装这些软件包吗？[y/N] " +#: cmdline/apt-get.cc:1108 +msgid "Install these packages without verification?" +msgstr "不经验证就安装这些软件包吗？" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" msgstr "有些软件包不能通过验证" -#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上！" -#: cmdline/apt-get.cc:1140 +#: cmdline/apt-get.cc:1169 msgid "Packages need to be removed but remove is disabled." msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。" -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:1180 msgid "Internal error, Ordering didn't finish" msgstr "内部错误，Ordering 未能完成" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1218 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "怪了……文件大小不符，请发信给 apt@packages.debian.org 吧" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "需要下载 %sB/%sB 的软件包。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1230 #, c-format msgid "Need to get %sB of archives.\n" msgstr "需要下载 %sB 的软件包。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1237 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "解压缩后会消耗掉 %sB 的额外空间。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1242 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "解压缩后将会空出 %sB 的空间。\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 -#: cmdline/apt-get.cc:2593 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, c-format msgid "Couldn't determine free space in %s" msgstr "无法获知您在 %s 上的可用空间" -#: cmdline/apt-get.cc:1241 +#: cmdline/apt-get.cc:1270 #, c-format msgid "You don't have enough free space in %s." msgstr "您在 %s 上没有足够的可用空间。" -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 msgid "Trivial Only specified but this is not a trivial operation." msgstr "虽然您指定了仅执行常规操作，但这不是个常规操作。" #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "是，按我说的做！" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -629,28 +647,28 @@ msgstr "" "若还想继续的话，就输入下面的短句“%s”\n" " ?] " -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "中止执行。" -#: cmdline/apt-get.cc:1284 -msgid "Do you want to continue [Y/n]? " -msgstr "您希望继续执行吗？[Y/n]" +#: cmdline/apt-get.cc:1313 +msgid "Do you want to continue?" +msgstr "您希望继续执行吗？" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" msgstr "无法下载 %s %s\n" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "有一些文件无法下载" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 +#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 msgid "Download complete and in download only mode" msgstr "下载完毕，目前是“仅下载”模式" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -658,19 +676,19 @@ msgstr "" "有几个软件包无法下载，您可以运行 apt-get update 或者加上 --fix-missing 的选项" "再试试？" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1414 msgid "--fix-missing and media swapping is not currently supported" msgstr "目前还不支持 --fix-missing 和介质交换" -#: cmdline/apt-get.cc:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "无法更正缺少的软件包。" -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 msgid "Aborting install." msgstr "中止安装。" -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -679,35 +697,35 @@ msgid_plural "" "all files have been overwritten by other packages:" msgstr[0] "以下软件包因为文件已被其他软件包覆盖而消失：" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "注意：这是自动被 dpkg 有意完成的。" -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "忽略不可用的软件包 %2$s 的目标发行版本 %1$s" -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "选择 %s 作为源代码包而非 %s\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "忽略不可用的 %2$s 软件包的 %1$s 版" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1676 msgid "The update command takes no arguments" msgstr " update 命令不需要参数" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1742 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "我们不应该进行删除，无法启动自动删除器" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1846 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -723,15 +741,15 @@ msgstr "似乎自动卸载工具损坏了一些软件，这不应该发生。请 #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 msgid "The following information may help to resolve the situation:" msgstr "下列信息可能会对解决问题有所帮助：" -#: cmdline/apt-get.cc:1824 +#: cmdline/apt-get.cc:1853 msgid "Internal Error, AutoRemover broke stuff" msgstr "内部错误，自动卸载工具坏事了" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -739,28 +757,28 @@ msgid_plural "" "required:" msgstr[0] "下列软件包是自动安装的并且现在不需要了：" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" "%lu packages were automatically installed and are no longer required.\n" msgstr[0] "%lu 个自动安装的的软件包现在已不再需要了。\n" -#: cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1866 #, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "使用'apt-get autoremove'来卸载它们" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1885 msgid "Internal error, AllUpgrade broke stuff" msgstr "内部错误，全部升级工具坏事了" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1984 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "您可能需要运行“apt-get -f install”来纠正下列错误：" -#: cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -768,7 +786,7 @@ msgstr "" "有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可" "以指定一个解决办法)。" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:2002 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" @@ -779,78 +797,78 @@ msgstr "" "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n" "包尚未被创建或是它们已被从新到(Incoming)目录移出。" -#: cmdline/apt-get.cc:1994 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "破损的软件包" -#: cmdline/apt-get.cc:2020 +#: cmdline/apt-get.cc:2049 msgid "The following extra packages will be installed:" msgstr "将会安装下列额外的软件包：" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "建议安装的软件包：" -#: cmdline/apt-get.cc:2111 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "推荐安装的软件包：" -#: cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "无法找到软件包 %s" -#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s 被设置为手动安装。\n" -#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2213 msgid "Calculating upgrade... " msgstr "正在对升级进行计算... " -#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "失败" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "完成" -#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 msgid "Internal error, problem resolver broke stuff" msgstr "内部错误，问题解决工具坏事了" -#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "无法锁定下载目录" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2452 +#: cmdline/apt-get.cc:2483 msgid "Must specify at least one package to fetch source for" msgstr "要下载源代码，必须指定至少一个对应的软件包" -#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, c-format msgid "Unable to find a source package for %s" msgstr "无法找到与 %s 对应的源代码包" -#: cmdline/apt-get.cc:2509 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -859,7 +877,7 @@ msgstr "" "提示：%s 的打包工作被维护于以下位置的 %s 版本控制系统中：\n" "%s\n" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2545 #, fuzzy, c-format msgid "" "Please use:\n" @@ -870,104 +888,104 @@ msgstr "" "bzr get %s\n" "获得该软件包的最近更新(可能尚未正式发布)。\n" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2598 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "忽略已下载过的文件“%s”\n" -#: cmdline/apt-get.cc:2604 +#: cmdline/apt-get.cc:2635 #, c-format msgid "You don't have enough free space in %s" msgstr "您在 %s 上没有足够的可用空间" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2644 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下载 %sB/%sB 的源代码包。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2649 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下载 %sB 的源代码包。\n" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2655 #, c-format msgid "Fetch source %s\n" msgstr "下载源代码 %s\n" -#: cmdline/apt-get.cc:2662 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "有一些包文件无法下载。" -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:2724 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "忽略已经被解包到 %s 目录的源代码包\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "运行解包的命令“%s”出错。\n" -#: cmdline/apt-get.cc:2706 +#: cmdline/apt-get.cc:2737 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "请检查是否安装了“dpkg-dev”软件包。\n" -#: cmdline/apt-get.cc:2728 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "执行构造软件包命令“%s”失败。\n" -#: cmdline/apt-get.cc:2748 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "子进程出错" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2798 msgid "Must specify at least one package to check builddeps for" msgstr "要检查生成软件包的构建依赖关系，必须指定至少一个软件包" -#: cmdline/apt-get.cc:2792 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "无法获得 %s 的构建依赖关系信息" -#: cmdline/apt-get.cc:2839 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr " %s 没有构建依赖关系信息。\n" -#: cmdline/apt-get.cc:3009 +#: cmdline/apt-get.cc:3040 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系" -#: cmdline/apt-get.cc:3027 +#: cmdline/apt-get.cc:3058 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系" -#: cmdline/apt-get.cc:3050 +#: cmdline/apt-get.cc:3081 #, 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:3089 +#: cmdline/apt-get.cc:3120 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -976,37 +994,37 @@ msgstr "" "由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 " "%1$s 依赖关系" -#: cmdline/apt-get.cc:3095 +#: cmdline/apt-get.cc:3126 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系" -#: cmdline/apt-get.cc:3118 +#: cmdline/apt-get.cc:3149 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3164 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "不能满足软件包 %s 所要求的构建依赖关系。" -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "无法处理构建依赖关系" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "正在连接 %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3397 msgid "Supported modules:" msgstr "支持的模块：" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3438 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1094,7 +1112,7 @@ msgstr "" "以获取更多信息和选项。\n" " 本 APT 具有超级牛力。\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1168,8 +1186,8 @@ msgid "%s was already not hold.\n" msgstr "%s 已经是最新的版本了。\n" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, c-format msgid "Waited for %s but it wasn't there" msgstr "等待子进程 %s 的退出，但是它并不存在" @@ -1236,7 +1254,7 @@ msgstr "无法卸载现在挂载于 %s 的 CD-ROM，它可能正在使用中。" msgid "Disk not found." msgstr "找不到盘片。" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "无法找到该文件" @@ -1298,7 +1316,7 @@ msgstr "登录脚本命令“%s”出错，服务器响应信息为：%s" msgid "TYPE failed, server said: %s" msgstr "TYPE 指令出错，服务器响应信息为：%s" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "连接超时" @@ -1306,8 +1324,8 @@ msgstr "连接超时" msgid "Server closed the connection" msgstr "服务器关闭了连接" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 -#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 +#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 msgid "Read error" msgstr "读错误" @@ -1319,86 +1337,86 @@ msgstr "回应超出了缓存区大小。" msgid "Protocol corruption" msgstr "协议有误" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 -#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 +#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 msgid "Write error" msgstr "写出错" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "无法创建套接字" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "无法连接上数据套接字，连接超时" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "无法连接被动模式的套接字。" -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo 无法得到监听套接字" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "无法绑定套接字" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "无法在套接字上监听" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "无法确定套接字的名字" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "无法发出 PORT 指令" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "无法识别的地址族 %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT 指令出错，服务器响应信息为：%s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "数据套接字连接超时" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "无法接受连接" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "把文件加入哈希表时出错" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "无法获取文件，服务器响应信息为“%s”" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "数据套接字超时" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "数据传送出错，服务器响应信息为“%s”" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "查询" -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "无法调用 " @@ -1434,7 +1452,7 @@ msgstr "无法连接上 %s:%s (%s)。" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "正在连接 %s" @@ -1464,36 +1482,36 @@ msgstr "解析“%s:%s”时，出现了某些故障(%i - %s)" msgid "Unable to connect to %s:%s:" msgstr "不能连接到 %s：%s：" -#: methods/gpgv.cc:166 +#: methods/gpgv.cc:167 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "内部错误：签名正确无误，但是无法确认密钥指纹？！" -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "至少发现一个无效的签名。" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:173 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "无法运行 gpgv 以验证签名(您安装了 gpgv 吗？)" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:178 +#: methods/gpgv.cc:179 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:182 +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "运行 gpgv 时发生未知错误" -#: methods/gpgv.cc:215 methods/gpgv.cc:222 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 msgid "The following signatures were invalid:\n" msgstr "下列签名无效：\n" -#: methods/gpgv.cc:229 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1531,59 +1549,59 @@ msgstr "该 HTTP 服务器的 range 支持不正常" msgid "Unknown date format" msgstr "无法识别的日期格式" -#: methods/http.cc:827 +#: methods/http.cc:826 msgid "Select failed" msgstr "select 调用出错" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "连接超时" -#: methods/http.cc:855 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "写输出文件时出错" -#: methods/http.cc:886 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "写入文件出错" -#: methods/http.cc:914 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "写入文件出错" -#: methods/http.cc:928 +#: methods/http.cc:927 msgid "Error reading from server. Remote end closed connection" msgstr "从服务器读取数据时出错，对方关闭了连接" -#: methods/http.cc:930 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "从服务器读取数据出错" -#: methods/http.cc:1198 +#: methods/http.cc:1197 msgid "Bad header data" msgstr "错误的报头数据" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "连接失败" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "内部错误" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 -#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 +#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "无法读取 %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1632,7 +1650,7 @@ msgstr "无法连同 mmap 为 %s 打补丁(但没有 mmap 的错误) - 补丁可 msgid "Failed to create IPC pipe to subprocess" msgstr "无法为子进程创建 IPC 管道" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "连接被永久关闭" @@ -2107,11 +2125,11 @@ msgstr "归档文件中成员文件头 %s 无效" msgid "Invalid archive member header" msgstr "归档文件中成员文件头无效" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "归档文件太短" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "无法读取归档文件的数据头" @@ -2435,7 +2453,7 @@ msgstr "无效的操作 %s" msgid "Unable to stat the mount point %s" msgstr "无法读取文件系统挂载点 %s 的状态" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "无法读取盘片的状态" @@ -2454,101 +2472,101 @@ msgstr "由于文件系统为只读，因而无法使用文件锁 %s" msgid "Could not open lock file %s" msgstr "无法打开锁文件 %s" -#: apt-pkg/contrib/fileutl.cc:249 +#: apt-pkg/contrib/fileutl.cc:254 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "无法在 nfs 文件系统上使用文件锁 %s" -#: apt-pkg/contrib/fileutl.cc:253 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "无法获得锁 %s" -#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:445 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "子进程 %s 发生了段错误" -#: apt-pkg/contrib/fileutl.cc:843 +#: apt-pkg/contrib/fileutl.cc:846 #, c-format msgid "Sub-process %s received signal %u." msgstr "子进程 %s 收到信号 %u。" -#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "子进程 %s 返回了一个错误号 (%u)" -#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "子进程 %s 异常退出" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "无法打开文件 %s" -#: apt-pkg/contrib/fileutl.cc:1062 +#: apt-pkg/contrib/fileutl.cc:1065 #, c-format msgid "Could not open file descriptor %d" msgstr "无法打开文件描述符 %d" -#: apt-pkg/contrib/fileutl.cc:1147 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "无法创建子进程的 IPC 管道" -#: apt-pkg/contrib/fileutl.cc:1202 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "无法执行压缩程序" -#: apt-pkg/contrib/fileutl.cc:1297 +#: apt-pkg/contrib/fileutl.cc:1298 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "读取文件出错，还剩 %lu 字节没有读出" -#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "写入文件出错，还剩 %lu 字节没有保存" -#: apt-pkg/contrib/fileutl.cc:1681 +#: apt-pkg/contrib/fileutl.cc:1695 #, c-format msgid "Problem closing the file %s" msgstr "关闭文件 %s 出错" -#: apt-pkg/contrib/fileutl.cc:1693 +#: apt-pkg/contrib/fileutl.cc:1707 #, c-format msgid "Problem renaming the file %s to %s" msgstr "重命名文件 %s 为 %s 出错" -#: apt-pkg/contrib/fileutl.cc:1704 +#: apt-pkg/contrib/fileutl.cc:1718 #, c-format msgid "Problem unlinking the file %s" msgstr "用 unlink 删除文件 %s 出错" -#: apt-pkg/contrib/fileutl.cc:1717 +#: apt-pkg/contrib/fileutl.cc:1731 msgid "Problem syncing the file" msgstr "同步文件出错" @@ -2746,7 +2764,7 @@ msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2755,12 +2773,12 @@ msgstr "" "无法立即对 %s 进行配置。请查看 man 5 apt.conf 中的 APT::Immediate-Configure " "(%d)" -#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "无法打开文件 %s" -#: apt-pkg/packagemanager.cc:569 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2782,7 +2800,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "软件包 %s 需要重新安装，但是我无法找到相应的安装文件。" -#: apt-pkg/algorithms.cc:1234 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2790,13 +2808,13 @@ msgstr "" "错误，pkgProblemResolver::Resolve 发生故障，这可能是有软件包被要求保持现状的" "缘故。" -#: apt-pkg/algorithms.cc:1236 +#: apt-pkg/algorithms.cc:1240 msgid "Unable to correct problems, you have held broken packages." msgstr "" "无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关" "系。" -#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2964,40 +2982,40 @@ msgstr "无法重命名文件，%s (%s -> %s)。" msgid "MD5Sum mismatch" msgstr "MD5 校验和不符" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 msgid "Hash Sum mismatch" msgstr "Hash 校验和不符" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "无法解析软件包仓库 Release 文件 %s" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "以下 ID 的密钥没有可用的公钥：\n" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "冲突的发行版：%s (期望 %s 但得到 %s)" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3006,12 +3024,12 @@ msgstr "" "校验签名出错。此仓库未被更新，仍然使用以前的索引文件。GPG 错误：%s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "GPG 错误：%s: %s" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3020,7 +3038,7 @@ msgstr "" "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件" "包。(缘于架构缺失)" -#: apt-pkg/acquire-item.cc:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3028,13 +3046,13 @@ msgid "" msgstr "" "我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。" -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。" -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "大小不符" @@ -3158,22 +3176,22 @@ msgstr "正在写入新的源列表\n" msgid "Source list entries for this disc are:\n" msgstr "对应于该盘片的软件源设置项是：\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "已写入 %i 条记录。\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "已写入 %i 条记录，并有 %i 个文件缺失。\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "已写入 %i 条记录，并有 %i 个文件不匹配\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不匹配\n" @@ -3260,12 +3278,12 @@ msgstr "" msgid "Installing %s" msgstr "正在安装 %s" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr "正在配置 %s" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr "正在删除 %s" @@ -3286,96 +3304,96 @@ msgid "Running post-installation trigger %s" msgstr "执行安装后执行的触发器 %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, c-format msgid "Directory '%s' missing" msgstr "目录 %s 缺失" -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, c-format msgid "Could not open file '%s'" msgstr "无法打开文件 %s" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr "正在准备 %s" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr "正在解压缩 %s" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "正在准备配置 %s" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr "已安装 %s" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "正在准备 %s 的删除操作" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr "已删除 %s" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "正在准备完全删除 %s" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr "完全删除了 %s" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "无法写入日志。 openpty() 失败(没有挂载 /dev/pts ？)\n" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "正在运行 dpkg" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "由于已经达到 MaxReports 限制，没有写入 apport 报告。" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "依赖问题 - 保持未配置" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "因为错误消息指示这是由于上一个问题导致的错误，没有写入 apport 报告。" -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "因为错误消息指示这是由于磁盘已满，没有写入 apport 报告。" -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "因为错误消息指示这是由于内存不足，没有写入 apport 报告。" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "因为错误消息指示这是一个 dpkg I/O 错误，没有写入 apport 报告。" diff --git a/po/zh_TW.po b/po/zh_TW.po index 82ee4e108..5c1afdd03 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.5.4\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-06-26 07:37+0200\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\n" "PO-Revision-Date: 2009-01-28 10:41+0800\n" "Last-Translator: Tetralet \n" "Language-Team: Debian-user in Chinese [Big5] %s)。" msgid "MD5Sum mismatch" msgstr "MD5Sum 不符" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 -#: apt-pkg/acquire-item.cc:2019 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 msgid "Hash Sum mismatch" msgstr "Hash Sum 不符" -#: apt-pkg/acquire-item.cc:1377 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1393 +#: apt-pkg/acquire-item.cc:1404 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "無法辨別 Release 檔 %s" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "無法取得以下的密鑰 ID 的公鑰：\n" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1484 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1495 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "發行版本衝突：%s（應當是 %s 但卻得到 %s）" -#: apt-pkg/acquire-item.cc:1525 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2997,12 +3016,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1652 +#: apt-pkg/acquire-item.cc:1663 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3011,20 +3030,20 @@ msgstr "" "找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。（因為找不到平" "台）" -#: apt-pkg/acquire-item.cc:1711 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package." msgstr "找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。" -#: apt-pkg/acquire-item.cc:1770 +#: apt-pkg/acquire-item.cc:1781 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "這個套件的索引檔損壞了。沒有套件 %s 的 Filename: 欄位。" -#: apt-pkg/acquire-item.cc:1868 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "大小不符" @@ -3144,22 +3163,22 @@ msgstr "正在寫入新的來源列表\n" msgid "Source list entries for this disc are:\n" msgstr "該碟片的來源列表項目為：\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "寫入 %i 筆紀錄。\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案遺失了。\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案不符\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案遺失了，有 %i 個檔案不符\n" @@ -3246,12 +3265,12 @@ msgstr "" msgid "Installing %s" msgstr "正在安裝 %s" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, c-format msgid "Configuring %s" msgstr "正在設定 %s" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, c-format msgid "Removing %s" msgstr "正在移除 %s" @@ -3272,96 +3291,96 @@ msgid "Running post-installation trigger %s" msgstr "正在執行安裝後套件後續處理程式 %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, c-format msgid "Directory '%s' missing" msgstr "找不到 '%s' 目錄" -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "無法開啟檔案 %s" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, c-format msgid "Preparing %s" msgstr "正在準備 %s" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format msgid "Unpacking %s" msgstr "正在解開 %s" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, c-format msgid "Preparing to configure %s" msgstr "正在準備設定 %s" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Installed %s" msgstr "已安裝 %s" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "正在準備移除 %s" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format msgid "Removed %s" msgstr "已移除 %s" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, c-format msgid "Preparing to completely remove %s" msgstr "正在準備完整移除 %s" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, c-format msgid "Completely removed %s" msgstr "已完整移除 %s" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "無法寫入記錄檔，openpty() 失敗（/dev/pts 未掛載？）\n" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1496 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --git a/test/integration/test-bug-596498-trusted-unsigned-repo b/test/integration/test-bug-596498-trusted-unsigned-repo index 6ebc4a3bb..5c643c40e 100755 --- a/test/integration/test-bug-596498-trusted-unsigned-repo +++ b/test/integration/test-bug-596498-trusted-unsigned-repo @@ -27,7 +27,7 @@ aptgetupdate testequal "$PKGTEXT WARNING: The following packages cannot be authenticated! cool -Install these packages without verification [y/N]? N +Install these packages without verification? [y/N] N E: Some packages could not be authenticated" aptget install cool --assume-no -d find aptarchive/ \( -name 'Release.gpg' -o -name 'InRelease' \) -delete @@ -37,7 +37,7 @@ aptgetupdate testequal "$PKGTEXT WARNING: The following packages cannot be authenticated! cool -Install these packages without verification [y/N]? N +Install these packages without verification? [y/N] N E: Some packages could not be authenticated" aptget install cool --assume-no -d sed -i -e 's#deb#deb [trusted=yes]#' $DEBFILE -- cgit v1.2.3 From 096bd9f59750f6bea754d3a05e240c9eea0f6b53 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Thu, 1 Aug 2013 13:19:43 +0200 Subject: prefer native arch over higher priority for providers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The rational from the buglog: > The problem here is that the Priority field in one of the Packages files > is incorrect due to a mishap with reprepro configuration, […] the > amd64 version is Priority: standard but the arm64 version is Priority: > optional (and has a stray "optional: interpreters" field). > […] > However, Priority is a rather weak property of a package because it's > typically applied via overrides, and it's easy for maintainers of > third-party repositories to misconfigure them so that overrides aren't > applied correctly. It shouldn't be ranked ahead of choosing packages > from the native architecture. In this case, I have no user-mode > emulation for arm64 set up, so choosing m4:arm64 simply won't work. This effectly makes the priority the least interesting data point in chosing a provider, which is in line with the other checks we have already order above priority in the past and also has a certain appeal by the soft irony it provides. Closes: #718482 --- apt-pkg/depcache.cc | 6 +++--- ...prefer-native-architecture-over-higher-priority | 25 ++++++++++++++++++++++ 2 files changed, 28 insertions(+), 3 deletions(-) create mode 100755 test/integration/test-prefer-native-architecture-over-higher-priority diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 2c6eb43bf..978a893f7 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1007,9 +1007,6 @@ struct CompareProviders { else if ((B->Flags & pkgCache::Flag::Important) == pkgCache::Flag::Important) return true; } - // higher priority seems like a good idea - if (AV->Priority != BV->Priority) - return AV->Priority > BV->Priority; // prefer native architecture if (strcmp(A.Arch(), B.Arch()) != 0) { @@ -1024,6 +1021,9 @@ struct CompareProviders { else if (*a == B.Arch()) return true; } + // higher priority seems like a good idea + if (AV->Priority != BV->Priority) + return AV->Priority > BV->Priority; // unable to decide… return A->ID < B->ID; } diff --git a/test/integration/test-prefer-native-architecture-over-higher-priority b/test/integration/test-prefer-native-architecture-over-higher-priority new file mode 100755 index 000000000..2e5696376 --- /dev/null +++ b/test/integration/test-prefer-native-architecture-over-higher-priority @@ -0,0 +1,25 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework +setupenvironment +configarchitecture 'amd64' 'arm64' + +insertpackage 'unstable' 'm4' 'amd64' '1' 'Multi-Arch: foreign' 'optional' +insertpackage 'unstable' 'm4' 'arm64' '1' 'Multi-Arch: foreign' 'standard' +insertpackage 'unstable' 'autoconf' 'all' '1' 'Depends: m4' + +setupaptarchive + +testequal 'Reading package lists... +Building dependency tree... +The following extra packages will be installed: + m4 +The following NEW packages will be installed: + autoconf m4 +0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +Inst m4 (1 unstable [amd64]) +Inst autoconf (1 unstable [all]) +Conf m4 (1 unstable [amd64]) +Conf autoconf (1 unstable [all])' aptget install autoconf -s -- cgit v1.2.3 From 64876cf7963f897efa70c3e424527e2e8651aa29 Mon Sep 17 00:00:00 2001 From: Christian PERRIER Date: Sat, 3 Aug 2013 16:07:13 +0200 Subject: Vietnamese translation update. Closes: #718615 --- debian/changelog | 6 +++ po/vi.po | 140 +++++++++++++++++++++++++++---------------------------- 2 files changed, 76 insertions(+), 70 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5159e5b17..e2bb9c471 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +apt (0.9.9.5) UNRELEASED; urgency=low + + * Vietnamese translation update. Closes: #718615 + + -- Christian Perrier Sat, 03 Aug 2013 16:06:55 +0200 + apt (0.9.9.4) unstable; urgency=low [ David Kalnischkies ] diff --git a/po/vi.po b/po/vi.po index f124f01a9..997fc90d9 100644 --- a/po/vi.po +++ b/po/vi.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: apt-0.9.9.1\n" +"Project-Id-Version: apt-0.9.9.4\n" "Report-Msgid-Bugs-To: APT Development Team \n" "POT-Creation-Date: 2013-07-31 16:24+0200\n" -"PO-Revision-Date: 2013-07-16 08:10+0700\n" +"PO-Revision-Date: 2013-08-03 08:52+0700\n" "Last-Translator: Trần Ngọc Quân \n" "Language-Team: Vietnamese \n" "Language: vi\n" @@ -40,7 +40,7 @@ msgstr " Gói thường: " #: cmdline/apt-cache.cc:329 msgid " Pure virtual packages: " -msgstr " Gói ảo nguyên chất: " +msgstr " Gói thuần ảo: " #: cmdline/apt-cache.cc:330 msgid " Single virtual packages: " @@ -107,7 +107,7 @@ msgstr "Không tìm thấy gói" #: cmdline/apt-cache.cc:1265 msgid "You must give at least one search pattern" -msgstr "Bạn phải đưa ra ít nhất một chuỗi tìm kiếm" +msgstr "Bạn phải đưa ra ít nhất một mẫu tìm kiếm" #: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." @@ -117,7 +117,7 @@ msgstr "" #: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" -msgstr "Không thể định vị gói %s" +msgstr "Không thể xác định vị trí của gói %s" #: cmdline/apt-cache.cc:1556 msgid "Package files:" @@ -164,7 +164,7 @@ msgstr " Bảng phiên bản:" #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" -msgstr "%s %s dành cho %s được biên dịch trên %s %s\n" +msgstr "%s %s dành cho %s được biên dịch vào %s %s\n" #: cmdline/apt-cache.cc:1760 msgid "" @@ -301,7 +301,7 @@ msgstr "" "Tùy chọn:\n" " -h Trợ giúp này\n" " -c=? Đọc tập tin cấu hình này\n" -" -o=? Đặt một tùy chọn cấu hình nhiệm ý, v.d. “-o dir::cache=/tmp”\n" +" -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n" #. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] #. e.g. "Do you want to continue? [Y/n] " @@ -408,7 +408,7 @@ msgstr "" #: cmdline/apt-get.cc:631 #, c-format msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu đã nâng cấp, %lu mới được cài đặt, " +msgstr "%lu nâng cấp, %lu được cài đặt mới, " #: cmdline/apt-get.cc:635 #, c-format @@ -418,7 +418,7 @@ msgstr "%lu được cài đặt lại, " #: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " -msgstr "%lu được hạ cấp, " +msgstr "%lu bị hạ cấp, " #: cmdline/apt-get.cc:639 #, c-format @@ -501,7 +501,7 @@ msgstr "Ghi chú: đang chọn “%s” thay cho “%s”\n" #: cmdline/apt-get.cc:847 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" -msgstr "Đang bỏ qua %s vì nó đã được cài đặt và chưa lập tùy chọn Nâng cấp.\n" +msgstr "Đang bỏ qua %s vì nó đã được cài đặt và chưa đặt tùy chọn Nâng cấp.\n" #: cmdline/apt-get.cc:851 #, c-format @@ -512,7 +512,7 @@ msgstr "" #: cmdline/apt-get.cc:863 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -msgstr "Không thể cài đặt lại %s vì không thể tải về nó.\n" +msgstr "Không thể cài đặt lại %s vì không thể tải nó về.\n" #: cmdline/apt-get.cc:868 #, c-format @@ -582,7 +582,7 @@ msgstr "Một số gói không thể được xác thực" #: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" -msgstr "Gập lỗi và đã dùng tùy chọn “-y” mà không có “--force-yes”" +msgstr "Gặp lỗi và đã dùng tùy chọn “-y” mà không có “--force-yes”" #: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" @@ -674,7 +674,7 @@ msgstr "Bạn có muốn tiếp tục không?" #: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format msgid "Failed to fetch %s %s\n" -msgstr "Gặp lỗi khi lấy %s %s\n" +msgstr "Gặp lỗi khi lấy về %s %s\n" #: cmdline/apt-get.cc:1403 msgid "Some files failed to download" @@ -778,14 +778,14 @@ msgid_plural "" "The following packages were automatically installed and are no longer " "required:" msgstr[0] "" -"(Các) gói sau đây đã được tự động cài đặt nên không còn cần thiết lại:" +"(Các) gói sau đây đã được tự động cài đặt nên không còn cần yêu cầu lại:" #: cmdline/apt-get.cc:1864 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" "%lu packages were automatically installed and are no longer required.\n" -msgstr[0] "%lu gói đã được tự động cài đặt nên không còn cần thiết lại.\n" +msgstr[0] "%lu gói đã được tự động cài đặt nên không còn cần yêu cầu lại.\n" #: cmdline/apt-get.cc:1866 msgid "Use 'apt-get autoremove' to remove it." @@ -817,7 +817,7 @@ msgid "" msgstr "" "Không thể cài đặt một số gói. Điều đó có nghĩa là bạn đã yêu cầu\n" "một trường hợp không thể, hoặc nếu bạn sử dụng bản phân phối\n" -"chưa ổn định cái mà yêu cầu các gói mà nó chưa được tạo\n" +"chưa ổn định cái mà yêu cầu các gói mà nó còn chưa được tạo ra\n" "hoặc di chuyển chúng ra khỏi phần Incoming (Đến)." #: cmdline/apt-get.cc:2023 @@ -1055,7 +1055,7 @@ msgstr "Changelog cho %s (%s)" #: cmdline/apt-get.cc:3397 msgid "Supported modules:" -msgstr "Mô-đun đã hỗ trợ:" +msgstr "Hỗ trợ các mô-đun:" #: cmdline/apt-get.cc:3438 msgid "" @@ -1134,13 +1134,13 @@ msgstr "" "\n" "Tùy chọn:\n" " -h Trợ giúp này.\n" -" -q Dữ liệu xuất có thể ghi lưu - không có cái chỉ tiến hành (_im_)\n" +" -q Dữ liệu xuất có thể ghi nhật ký - không hiển thị tiến triển công việc\n" " -qq Không xuất thông tin nào, trừ lỗi\n" -" -d Chỉ tải về, ĐỪNG cài đặt hay giải nén kho\n" -" -s Không hoạt động. Chỉ mô phỏng\n" -" -y Giả sử trả lời Có (yes) mọi khi gặp câu hỏi\n" +" -d Chỉ tải về, KHÔNG cài đặt hay giải nén kho\n" +" -s Không làm gì cả. Chỉ mô phỏng\n" +" -y Trả lời Có (yes) mọi khi gặp câu hỏi\n" " -f Thử sửa chữa một hệ thống có quan hệ phụ thuộc bị sai hỏng\n" -" -m Thử tiếp tục lại nếu không thể định vị kho\n" +" -m Thử tiếp tục lại nếu không thể xác định vị trí từ kho\n" " -u Hiển thị danh sách các gói đã nâng cấp\n" " -b Xây dụng gói nguồn sau khi lấy nó về\n" " -V Hiển thị số thứ tự phiên bản dạng chi tiết\n" @@ -1157,10 +1157,10 @@ msgid "" " Keep also in mind that locking is deactivated,\n" " so don't depend on the relevance to the real current situation!" msgstr "" -"GHI CHÚ: đây chỉ là một sự mô phỏng!\n" -" apt-get yêu cầu quyền root để thực hiện thật.\n" -" Cũng cần nhớ rằng chức năng khoá bị tắt,\n" -" thì không nên thấy đây là trường hợp hiện thời thật!" +"GHI CHÚ: đây chỉ là mô phỏng!\n" +" apt-get yêu cầu quyền root để thực hiện thật.\n" +" Cần nhớ rằng chức năng khóa đã bị tắt,\n" +" nên có thể nó không chính xác như những gì làm thật!" #: cmdline/acqprogress.cc:60 msgid "Hit " @@ -1279,10 +1279,10 @@ msgstr "" "\n" "Tùy chọn:\n" " -h Trợ giúp này.\n" -" -q Dữ liệu xuất có thể ghi lưu - không có cái chỉ tiến hành (_im_)\n" +" -q Dữ liệu xuất có thể ghi nhật ký - không hiển thị diễn biến công việc\n" " -qq Không xuất thông tin nào, trừ lỗi\n" " -s Không làm gì chỉ in những cái sẽ làm.\n" -" -f đọc/ghi tự-động/thủ-công đánh dấu trong tập tin đã chỉ ra.\n" +" -f đánh dấu đọc/ghi tự-động/thủ-công trong tập tin đã cho.\n" " -c=? Đọc tập tin cấu hình này\n" " -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. -o dir::cache=/tmp\n" "Để tìm thông tin thêm, xem hai trang man (hướng dẫn)\n" @@ -1329,7 +1329,7 @@ msgstr "Gặp lỗi khi đặt giờ sửa đổi" #: methods/file.cc:47 msgid "Invalid URI, local URIS must not start with //" -msgstr "Địa chỉ URI không hợp lệ, URI nội bộ không thể bắt đầu với “//”" +msgstr "Địa chỉ URI không hợp lệ, URI nội bộ không thể bắt đầu bằng “//”" #. Login must be before getpeername otherwise dante won't work. #: methods/ftp.cc:173 @@ -1342,7 +1342,7 @@ msgstr "Không thể quyết định tên ngang hàng" #: methods/ftp.cc:184 msgid "Unable to determine the local name" -msgstr "Không thể quyết định tên cục bộ" +msgstr "Không thể phân giải tên cục bộ" #: methods/ftp.cc:215 methods/ftp.cc:243 #, c-format @@ -1640,7 +1640,7 @@ msgstr "Gặp lỗi khi ghi vào tập tin" #: methods/http.cc:927 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" +msgstr "Gặp lỗi khi đọc từ máy phục vụ: Máy chủ đã đóng kết nối" #: methods/http.cc:929 msgid "Error reading from server" @@ -1745,7 +1745,7 @@ msgstr "Gặp một số lỗi trong khi giải nén. Những gói đã được #: dselect/install:102 msgid "will be configured. This may result in duplicate errors" -msgstr "sẽ cũng được cấu hình. Có lẽ sẽ gây ra lỗi trùng" +msgstr "sẽ cũng được cấu hình. Việc này có thể sẽ gây ra lỗi trùng lặp" #: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" @@ -1791,9 +1791,9 @@ msgstr "" "Tùy chọn:\n" " -h Trợ giúp này\n" " -t Đặt thư mục tạm thời\n" -" [temp, tmp: viết tắt cho từ “temporary”: tạm thời]\n" +" [t: viết tắt cho từ “temporary”: tạm thời]\n" " -c=? Đọc tập tin cấu hình này\n" -" -o=? Đặt một tùy chọn cấu hình nhiệm ý, v.d. “-o dir::cache=/tmp”\n" +" -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n" #: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format @@ -1873,25 +1873,25 @@ msgstr "" "\n" "[ftparchive: FTP archive: kho FTP]\n" "\n" -"Lệnh: \tpackages binarypath [tập_tin_đè [tiền_tố_đường_dẫn]]\n" -" \tsources srcpath [tập_tin_đè[tiền_tố_đường_dẫn]]\n" -" \tcontents path\n" -" \trelease path\n" -" \tgenerate config [groups]\n" -" \tclean config\n" +"Lệnh: packages binarypath [tập_tin_đè [tiền_tố_đường_dẫn]]\n" +" sources srcpath [tập_tin_đè[tiền_tố_đường_dẫn]]\n" +" contents path\n" +" release path\n" +" generate config [các_nhóm]\n" +" clean config\n" "\n" -"[packages: những gói;\n" +"(packages: những gói;\n" "binarypath: đường dẫn nhị phân;\n" "sources: những nguồn;\n" "srcpath: đường dẫn nguồn;\n" -"contents path: đường dẫn nội dụng;\n" +"contents path: đường dẫn nội dung;\n" "release path: đường dẫn bản đã phát hành;\n" -"generate config [groups]: tạo ra cấu hình [nhóm];\n" +"generate config [groups]: tạo ra cấu hình [các nhóm];\n" "clean config: cấu hình toàn mới)\n" "\n" "apt-ftparchive (kho ftp) thì tạo ra tập tin chỉ mục cho kho Debian.\n" -"Nó hỗ trợ nhiều cách tạo ra, từ cách tự động toàn bộ\n" -"đến cách thay thế điều hoặt động cho dpkg-scanpackages (dpkg-quét_gói)\n" +"Nó hỗ trợ nhiều cách tạo ra, từ cách tự động hoàn toàn\n" +"đến cách thay thế hàm cho dpkg-scanpackages (dpkg-quét_gói)\n" "và dpkg-scansources (dpkg-quét_nguồn).\n" "\n" "apt-ftparchive tạo ra tập tin Gói ra cây các .deb.\n" @@ -1914,15 +1914,15 @@ msgstr "" " dists/potato/main/binary-i386/Packages\n" "\n" "Tùy chọn:\n" -" -h \t\t_Trợ giúp_ này\n" -" --md5 \t\tĐiều khiển cách tạo ra MD5\n" -" -s=? \t\tTập tin đè nguồn\n" -" -q \t\t_Im lặng_ (không xuất chi tiết)\n" -" -d=? \t\tChọn _cơ sở dữ liệu_ nhớ tạm tùy chọn\n" -" --no-delink \tMở chế độ gỡ lỗi _bỏ liên kết_\n" -" --contents \tĐiều khiển cách tạo ra tập tin _nội dung_\n" -" -c=? \t\tĐọc tập tin cấu hình này\n" -" -o=? \t\tĐặt một tùy chọn cấu hình nhiệm ý, v.d. “-o dir::cache=/tmp”" +" -h _Trợ giúp_ này\n" +" --md5 Điều khiển cách tạo ra MD5\n" +" -s=? Tập tin đè nguồn\n" +" -q _Im lặng_ (không xuất chi tiết)\n" +" -d=? Chọn _cơ sở dữ liệu_ nhớ tạm tùy chọn\n" +" --no-delink Mở chế độ gỡ lỗi _bỏ liên kết_\n" +" --contents Điều khiển cách tạo ra tập tin _nội dung_\n" +" -c=? Đọc tập tin cấu hình này\n" +" -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”" #: ftparchive/apt-ftparchive.cc:803 msgid "No selections matched" @@ -1936,7 +1936,7 @@ msgstr "Thiếu một số tập tin trong nhóm tập tin gói “%s”." #: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" -msgstr "Cơ sở dữ liệu bị hỏng nên đã đổi tên tâp tin thành %s.old (old: cũ)." +msgstr "Cơ sở dữ liệu bị hỏng nên đã đổi tên tập tin thành %s.old (old: cũ)." #: ftparchive/cachedb.cc:65 #, c-format @@ -1982,7 +1982,7 @@ msgstr "CB: Không thể lấy thông tin thống kê %s\n" #: ftparchive/writer.cc:143 msgid "E: " -msgstr "LỖI: " +msgstr "L: " #: ftparchive/writer.cc:145 msgid "W: " @@ -2014,7 +2014,7 @@ msgstr " Bỏ liên kết %s [%s]\n" #: ftparchive/writer.cc:277 #, c-format msgid "Failed to readlink %s" -msgstr "Việc tạo liên kết lại %s bị lỗi" +msgstr "Gặp lỗi khi đọc liên kết %s" #: ftparchive/writer.cc:281 #, c-format @@ -2024,7 +2024,7 @@ msgstr "Việc bỏ liên kết %s bị lỗi" #: ftparchive/writer.cc:288 #, c-format msgid "*** Failed to link %s to %s" -msgstr "*** Việc liên kết %s đến %s bị lỗi" +msgstr "*** Gặp lỗi khi liên kết %s đến %s" #: ftparchive/writer.cc:298 #, c-format @@ -2150,13 +2150,13 @@ msgstr "" "\n" "Tùy chọn:\n" " -h Trợ giúp này.\n" -" -q Làm việc ở chế độ im lặng - không hiển thị tiến triển\n" +" -q Làm việc ở chế độ im lặng - không hiển thị tiến triển công việc\n" " -c=? Đọc tập tin cấu hình này\n" -" -o=? Đặt một tùy chọn cấu hình nhiệm ý, v.d. “-o dir::cache=/tmp”\n" +" -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n" #: cmdline/apt-sortpkgs.cc:89 msgid "Unknown package record!" -msgstr "Không rõ mục ghi gói." +msgstr "Không rõ bản ghi gói!" #: cmdline/apt-sortpkgs.cc:153 msgid "" @@ -2176,13 +2176,13 @@ msgstr "" "[sortpkgs: sort packages: sắp xếp các gói]\n" "\n" "apt-sortpkgs là một công cụ đơn giản để sắp xếp tập tin gói.\n" -"Tùy chọn “-s” dùng để ngụ ý kiểu tập tin.\n" +"Tùy chọn “-s” dùng để ngụ ý kiểu tập tin là gì.\n" "\n" "Tùy chọn:\n" " -h Trợ giúp_ này\n" " -s Sắp xếp những tập tin _nguồn_\n" " -c=? Đọc tập tin cấu hình này\n" -" -o=? Đặt tùy chọn cấu hình nhiệm ý, v.d. “-o dir::cache=/tmp”\n" +" -o=? Đặt tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n" #: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" @@ -2236,11 +2236,11 @@ msgstr "DropNode (thả điểm nút) được gọi với điểm nút còn li #: apt-inst/filelist.cc:414 msgid "Failed to locate the hash element!" -msgstr "Việc định vi phần tử băm bị lỗi" +msgstr "Gặp lỗi xác định vị trí phần tử băm!" #: apt-inst/filelist.cc:461 msgid "Failed to allocate diversion" -msgstr "Việc cấp phát sự trệch đi bị lỗi" +msgstr "Gặp lỗi khi xác định vị trí trệch đi" #: apt-inst/filelist.cc:466 msgid "Internal error in AddDiversion" @@ -2302,7 +2302,7 @@ msgstr "Thư mục %s đang được thay thế do một cái không phải là #: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" -msgstr "Việc định vị điểm nút trong hộp băm nó bị lỗi" +msgstr "Gặp lỗi khi xác định vị trí điểm nút trong hộp băm nó bị lỗi" #: apt-inst/extract.cc:286 msgid "The path is too long" @@ -2339,7 +2339,7 @@ msgstr "" #: apt-inst/deb/debfile.cc:120 #, c-format msgid "Internal error, could not locate member %s" -msgstr "Gặp lỗi nội bộ, không thể định vị thành viên %s" +msgstr "Gặp lỗi nội bộ, không thể xác định vị trí thành viên %s" #: apt-inst/deb/debfile.cc:214 msgid "Unparsable control file" @@ -2902,7 +2902,7 @@ msgid "" "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" "Việc chạy tiến trình cài đặt này sẽ cần thiết gỡ bỏ tạm gói chủ yếu %s, do " -"vong lăp Xung đột/Phụ thuộc trước. Trường hợp này thường xấu, nhưng mà nếu " +"vòng lặp Xung đột/Phụ thuộc trước. Trường hợp này thường xấu, nhưng mà nếu " "bạn thật sự muốn tiếp tục, có thể hoạt hóa tuy chọn “APT::Force-" "LoopBreak” (buộc ngắt vòng lặp)." @@ -3005,7 +3005,7 @@ msgstr "Không thể phân tích hay mở danh sách gói hay tâp tin trạng t #: apt-pkg/cachefile.cc:91 msgid "You may want to run apt-get update to correct these problems" msgstr "" -"Có lẽ bạn muốn chạy “apt-get update” (lấy cập nhật) để sửa các vấn đề này" +"Bạn nên chạy lệnh “apt-get update” (lấy cập nhật) để sửa các vấn đề này" #: apt-pkg/cachefile.cc:109 msgid "The list of sources could not be read." @@ -3433,7 +3433,7 @@ msgstr "Đang gỡ bỏ hoàn toàn %s" #: apt-pkg/deb/dpkgpm.cc:77 #, c-format msgid "Noting disappearance of %s" -msgstr "Đang ghi lưu sự biến mất của %s" +msgstr "Đang ghi chép sự biến mất của %s" #: apt-pkg/deb/dpkgpm.cc:78 #, c-format -- cgit v1.2.3 From 4ccd3b3ce69d6a6598e1773689a44fdec78a85cc Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 5 Aug 2013 22:40:28 +0200 Subject: fix some unitialized data members --- apt-pkg/cdrom.h | 2 +- apt-pkg/contrib/sha2.h | 4 +++- apt-pkg/tagfile.h | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h index 4fc3d3928..7d19eb813 100644 --- a/apt-pkg/cdrom.h +++ b/apt-pkg/cdrom.h @@ -18,7 +18,7 @@ class pkgCdromStatus /*{{{*/ int totalSteps; public: - pkgCdromStatus() {}; + pkgCdromStatus() : totalSteps(0) {}; virtual ~pkgCdromStatus() {}; // total steps diff --git a/apt-pkg/contrib/sha2.h b/apt-pkg/contrib/sha2.h index 51c921dbd..8e0c99a1b 100644 --- a/apt-pkg/contrib/sha2.h +++ b/apt-pkg/contrib/sha2.h @@ -60,10 +60,11 @@ class SHA256Summation : public SHA2SummationBase res.Set(Sum); return res; }; - SHA256Summation() + SHA256Summation() { SHA256_Init(&ctx); Done = false; + memset(&Sum, 0, sizeof(Sum)); }; }; @@ -96,6 +97,7 @@ class SHA512Summation : public SHA2SummationBase { SHA512_Init(&ctx); Done = false; + memset(&Sum, 0, sizeof(Sum)); }; }; diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h index 4718f5101..126f4219d 100644 --- a/apt-pkg/tagfile.h +++ b/apt-pkg/tagfile.h @@ -84,7 +84,7 @@ class pkgTagSection Stop = this->Stop; }; - pkgTagSection() : Section(0), TagCount(0), Stop(0) {}; + pkgTagSection() : Section(0), TagCount(0), Stop(0), d(NULL) {}; virtual ~pkgTagSection() {}; }; -- cgit v1.2.3 From 1680800209dc85387c4c2da9a1edfcde44f87807 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 7 Aug 2013 18:00:07 +0200 Subject: specific pins below 1000 cause downgrades MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We start your quest by using the version of a package applying to a specific pin, but that version could very well be below the current version, which causes APT to suggest a downgrade even if it is advertised that it never does this below 1000. Its of course questionable what use a specific pin on a package has which has a newer version already installed, but reacting with the suggestion of a downgrade is really not appropriated (even if its kinda likely that this is actually the intend the user has – it could just as well be an outdated pin) and as pinning is complicated enough we should atleast do what is described in the manpage. So we look out for the specific pin and if we haven't seen it at the moment we see the installed version, we ignore the specific pin. Closes: 543966 --- apt-pkg/policy.cc | 25 +++++-- .../test-bug-543966-downgrade-below-1000-pin | 81 ++++++++++++++++++++++ 2 files changed, 99 insertions(+), 7 deletions(-) create mode 100755 test/integration/test-bug-543966-downgrade-below-1000-pin diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc index 4ae3b5f87..0a06cc6e3 100644 --- a/apt-pkg/policy.cc +++ b/apt-pkg/policy.cc @@ -166,11 +166,15 @@ pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator const &Pk tracks the default when the default is taken away, and a permanent pin that stays at that setting. */ + bool PrefSeen = false; for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false; ++Ver) { /* Lets see if this version is the installed version */ bool instVer = (Pkg.CurrentVer() == Ver); + if (Pref == Ver) + PrefSeen = true; + for (pkgCache::VerFileIterator VF = Ver.FileList(); VF.end() == false; ++VF) { /* If this is the status file, and the current version is not the @@ -187,26 +191,33 @@ pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator const &Pk { Pref = Ver; Max = Prio; + PrefSeen = true; } if (Prio > MaxAlt) { PrefAlt = Ver; MaxAlt = Prio; - } - } - + } + } + if (instVer == true && Max < 1000) { + /* Not having seen the Pref yet means we have a specific pin below 1000 + on a version below the current installed one, so ignore the specific pin + as this would be a downgrade otherwise */ + if (PrefSeen == false || Pref.end() == true) + { + Pref = Ver; + PrefSeen = true; + } /* Elevate our current selection (or the status file itself) to the Pseudo-status priority. */ - if (Pref.end() == true) - Pref = Ver; Max = 1000; - + // Fast path optimize. if (StatusOverride == false) break; - } + } } // If we do not find our candidate, use the one with the highest pin. // This means that if there is a version available with pin > 0; there diff --git a/test/integration/test-bug-543966-downgrade-below-1000-pin b/test/integration/test-bug-543966-downgrade-below-1000-pin new file mode 100755 index 000000000..f602bea95 --- /dev/null +++ b/test/integration/test-bug-543966-downgrade-below-1000-pin @@ -0,0 +1,81 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework + +setupenvironment +configarchitecture 'i386' + +insertpackage 'unstable' 'base-files' 'all' '5.0.0' +insertinstalledpackage 'base-files' 'all' '5.0.0-1' + +setupaptarchive + +STATUS=$(readlink -f rootdir/var/lib/dpkg/status) +APTARCHIVE="$(readlink -f aptarchive)/" + +testequal "base-files: + Installed: 5.0.0-1 + Candidate: 5.0.0-1 + Version table: + *** 5.0.0-1 0 + 100 $STATUS + 5.0.0 0 + 500 file:${APTARCHIVE} unstable/main i386 Packages" aptcache policy base-files -o apt::pin=0 + +echo 'Package: base-files +Pin: release a=unstable +Pin-Priority: 99' > rootdir/etc/apt/preferences + +testequal "base-files: + Installed: 5.0.0-1 + Candidate: 5.0.0-1 + Package pin: 5.0.0 + Version table: + *** 5.0.0-1 99 + 100 $STATUS + 5.0.0 99 + 500 file:${APTARCHIVE} unstable/main i386 Packages" aptcache policy base-files -o apt::pin=99 + +echo 'Package: base-files +Pin: release a=unstable +Pin-Priority: 100' > rootdir/etc/apt/preferences + +testequal "base-files: + Installed: 5.0.0-1 + Candidate: 5.0.0-1 + Package pin: 5.0.0 + Version table: + *** 5.0.0-1 100 + 100 $STATUS + 5.0.0 100 + 500 file:${APTARCHIVE} unstable/main i386 Packages" aptcache policy base-files -o apt::pin=100 + +echo 'Package: base-files +Pin: release a=unstable +Pin-Priority: 999' > rootdir/etc/apt/preferences + +testequal "base-files: + Installed: 5.0.0-1 + Candidate: 5.0.0-1 + Package pin: 5.0.0 + Version table: + *** 5.0.0-1 999 + 100 $STATUS + 5.0.0 999 + 500 file:${APTARCHIVE} unstable/main i386 Packages" aptcache policy base-files -o apt::pin=999 + +echo 'Package: base-files +Pin: release a=unstable +Pin-Priority: 1000' > rootdir/etc/apt/preferences + +testequal "base-files: + Installed: 5.0.0-1 + Candidate: 5.0.0 + Package pin: 5.0.0 + Version table: + *** 5.0.0-1 1000 + 100 $STATUS + 5.0.0 1000 + 500 file:${APTARCHIVE} unstable/main i386 Packages" aptcache policy base-files -o apt::pin=1000 -- cgit v1.2.3 From 91c4cc14d3654636edf997d23852f05ad3de4853 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 7 Aug 2013 16:40:39 +0200 Subject: stop skipping "-----" sections in Release files The file we read will always be a Release file as the clearsign is stripped earlier in this method, so this check is just wasting CPU Its also removing the risk that this could ever be part of a valid section, even if I can't imagine how that should be valid. Git-Dch: Ignore --- apt-pkg/indexrecords.cc | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc index e37a78cfb..6d89949a0 100644 --- a/apt-pkg/indexrecords.cc +++ b/apt-pkg/indexrecords.cc @@ -62,7 +62,7 @@ bool indexRecords::Load(const string Filename) /*{{{*/ if (OpenMaybeClearSignedFile(Filename, Fd) == false) return false; - pkgTagFile TagFile(&Fd, Fd.Size() + 256); // XXX + pkgTagFile TagFile(&Fd); if (_error->PendingError() == true) { strprintf(ErrorText, _("Unable to parse Release file %s"),Filename.c_str()); @@ -71,16 +71,11 @@ bool indexRecords::Load(const string Filename) /*{{{*/ pkgTagSection Section; const char *Start, *End; - // Skip over sections beginning with ----- as this is an idicator for clearsigns - do { - if (TagFile.Step(Section) == false) - { - strprintf(ErrorText, _("No sections in Release file %s"), Filename.c_str()); - return false; - } - - Section.Get (Start, End, 0); - } while (End - Start > 5 && strncmp(Start, "-----", 5) == 0); + if (TagFile.Step(Section) == false) + { + strprintf(ErrorText, _("No sections in Release file %s"), Filename.c_str()); + return false; + } Suite = Section.FindS("Suite"); Dist = Section.FindS("Codename"); -- cgit v1.2.3 From e9737c7f6a3e03b2975927ef9b04c1194026ed9c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 7 Aug 2013 16:45:49 +0200 Subject: use pkgTagFile to parse "header" of Release files The handwritten parsing here was mostly done as we couldn't trust the Release file we got, but nowadays we are sure that the Release file is valid and contains just a single section we want it to include. Beside reducing code it also fixes a bug: Fieldnames in deb822 formatted files are case-insensitive and pkgTagFile does it correctly, but this selfbuilt stuff here didn't. --- apt-pkg/deb/deblistparser.cc | 104 ++++++++----------------------------------- 1 file changed, 19 insertions(+), 85 deletions(-) diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 28857176b..c2707d0a5 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -805,94 +805,28 @@ bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator &FileI, map_ptrloc const storage = WriteUniqString(component); FileI->Component = storage; - // FIXME: should use FileFd and TagSection - FILE* release = fdopen(dup(File.Fd()), "r"); - if (release == NULL) + pkgTagFile TagFile(&File); + pkgTagSection Section; + if (_error->PendingError() == true || TagFile.Step(Section) == false) return false; - char buffer[101]; - while (fgets(buffer, sizeof(buffer), release) != NULL) - { - size_t len = 0; - - // Skip empty lines - for (; buffer[len] == '\r' && buffer[len] == '\n'; ++len) - /* nothing */ - ; - if (buffer[len] == '\0') - continue; - - // seperate the tag from the data - const char* dataStart = strchr(buffer + len, ':'); - if (dataStart == NULL) - continue; - len = dataStart - buffer; - for (++dataStart; *dataStart == ' '; ++dataStart) - /* nothing */ - ; - const char* dataEnd = (const char*)rawmemchr(dataStart, '\0'); - // The last char should be a newline, but we can never be sure: #633350 - const char* lineEnd = dataEnd; - for (--lineEnd; *lineEnd == '\r' || *lineEnd == '\n'; --lineEnd) - /* nothing */ - ; - ++lineEnd; - - // which datastorage need to be updated - enum { Suite, Component, Version, Origin, Codename, Label, None } writeTo = None; - if (buffer[0] == ' ') - ; - #define APT_PARSER_WRITETO(X) else if (strncmp(#X, buffer, len) == 0) writeTo = X; - APT_PARSER_WRITETO(Suite) - APT_PARSER_WRITETO(Component) - APT_PARSER_WRITETO(Version) - APT_PARSER_WRITETO(Origin) - APT_PARSER_WRITETO(Codename) - APT_PARSER_WRITETO(Label) - #undef APT_PARSER_WRITETO - #define APT_PARSER_FLAGIT(X) else if (strncmp(#X, buffer, len) == 0) \ - pkgTagSection::FindFlag(FileI->Flags, pkgCache::Flag:: X, dataStart, lineEnd); - APT_PARSER_FLAGIT(NotAutomatic) - APT_PARSER_FLAGIT(ButAutomaticUpgrades) - #undef APT_PARSER_FLAGIT - - // load all data from the line and save it - string data; - if (writeTo != None) - data.append(dataStart, dataEnd); - if (sizeof(buffer) - 1 == (dataEnd - buffer)) - { - while (fgets(buffer, sizeof(buffer), release) != NULL) - { - if (writeTo != None) - data.append(buffer); - if (strlen(buffer) != sizeof(buffer) - 1) - break; - } - } - if (writeTo != None) - { - // remove spaces and stuff from the end of the data line - for (std::string::reverse_iterator s = data.rbegin(); - s != data.rend(); ++s) - { - if (*s != '\r' && *s != '\n' && *s != ' ') - break; - *s = '\0'; - } - map_ptrloc const storage = WriteUniqString(data); - switch (writeTo) { - case Suite: FileI->Archive = storage; break; - case Component: FileI->Component = storage; break; - case Version: FileI->Version = storage; break; - case Origin: FileI->Origin = storage; break; - case Codename: FileI->Codename = storage; break; - case Label: FileI->Label = storage; break; - case None: break; - } - } + std::string data; + #define APT_INRELEASE(TAG, STORE) \ + data = Section.FindS(TAG); \ + if (data.empty() == false) \ + { \ + map_ptrloc const storage = WriteUniqString(data); \ + STORE = storage; \ } - fclose(release); + APT_INRELEASE("Suite", FileI->Archive) + APT_INRELEASE("Component", FileI->Component) + APT_INRELEASE("Version", FileI->Version) + APT_INRELEASE("Origin", FileI->Origin) + APT_INRELEASE("Codename", FileI->Codename) + APT_INRELEASE("Label", FileI->Label) + #undef APT_INRELEASE + Section.FindFlag("NotAutomatic", FileI->Flags, pkgCache::Flag::NotAutomatic); + Section.FindFlag("ButAutomaticUpgrades", FileI->Flags, pkgCache::Flag::ButAutomaticUpgrades); return !_error->PendingError(); } -- cgit v1.2.3 From f52037d629aea696f938015e7f1ec037eb079af8 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 8 Aug 2013 15:40:15 +0200 Subject: fix -Wall errors --- apt-pkg/deb/dpkgpm.cc | 6 ++++-- apt-pkg/tagfile.h | 2 +- apt-pkg/vendorlist.cc | 2 +- cmdline/apt-cdrom.cc | 3 ++- ftparchive/writer.cc | 3 ++- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index b0bd6b184..34ae4e593 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -134,7 +134,8 @@ static void dpkgChrootDirectory() std::cerr << "Chrooting into " << chrootDir << std::endl; if (chroot(chrootDir.c_str()) != 0) _exit(100); - chdir("/"); + if (chdir("/") != 0) + _exit(100); } /*}}}*/ @@ -755,7 +756,8 @@ bool pkgDPkgPM::OpenLog() pw = getpwnam("root"); gr = getgrnam("adm"); if (pw != NULL && gr != NULL) - chown(logfile_name.c_str(), pw->pw_uid, gr->gr_gid); + if(chown(logfile_name.c_str(), pw->pw_uid, gr->gr_gid) != 0) + _error->Errno("OpenLog", "chown failed"); chmod(logfile_name.c_str(), 0640); fprintf(d->term_out, "\nLog started: %s\n", timestr); } diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h index 126f4219d..fedd72701 100644 --- a/apt-pkg/tagfile.h +++ b/apt-pkg/tagfile.h @@ -84,7 +84,7 @@ class pkgTagSection Stop = this->Stop; }; - pkgTagSection() : Section(0), TagCount(0), Stop(0), d(NULL) {}; + pkgTagSection() : Section(0), TagCount(0), d(NULL), Stop(0) {}; virtual ~pkgTagSection() {}; }; diff --git a/apt-pkg/vendorlist.cc b/apt-pkg/vendorlist.cc index ecfc7db87..602425624 100644 --- a/apt-pkg/vendorlist.cc +++ b/apt-pkg/vendorlist.cc @@ -66,7 +66,7 @@ bool pkgVendorList::CreateList(Configuration& Cnf) /*{{{*/ Configuration Block(Top); string VendorID = Top->Tag; vector *Fingerprints = new vector; - struct Vendor::Fingerprint *Fingerprint = new struct Vendor::Fingerprint; + struct Vendor::Fingerprint *Fingerprint = new struct Vendor::Fingerprint(); string Origin = Block.Find("Origin"); Fingerprint->Print = Block.Find("Fingerprint"); diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc index c153cca85..545edf439 100644 --- a/cmdline/apt-cdrom.cc +++ b/cmdline/apt-cdrom.cc @@ -66,7 +66,8 @@ void pkgCdromTextStatus::Prompt(const char *Text) { char C; cout << Text << ' ' << flush; - read(STDIN_FILENO,&C,1); + if (read(STDIN_FILENO,&C,1) < 0) + _error->Errno("pkgCdromTextStatus::Prompt", "failed to prompt"); if (C != '\n') cout << endl; } diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index 3283128d8..7ecfe78ed 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -284,7 +284,8 @@ bool FTWScanner::Delink(string &FileName,const char *OriginalPath, if (link(FileName.c_str(),OriginalPath) != 0) { // Panic! Restore the symlink - symlink(OldLink,OriginalPath); + if (symlink(OldLink,OriginalPath) != 0) + _error->Errno("symlink", "failed to restore symlink"); return _error->Errno("link",_("*** Failed to link %s to %s"), FileName.c_str(), OriginalPath); -- cgit v1.2.3 From de81d69704bc5103ca55032a8f009820f30624c7 Mon Sep 17 00:00:00 2001 From: Christian PERRIER Date: Sat, 10 Aug 2013 12:51:40 +0200 Subject: Japanese translation update. Closes: #719279 --- debian/changelog | 1 + po/ja.po | 35 +++++++++++++++++------------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/debian/changelog b/debian/changelog index e2bb9c471..d1ecbff1f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ apt (0.9.9.5) UNRELEASED; urgency=low * Vietnamese translation update. Closes: #718615 + * Japanese translation update. Closes: #719279 -- Christian Perrier Sat, 03 Aug 2013 16:06:55 +0200 diff --git a/po/ja.po b/po/ja.po index 724dd3000..6248256d1 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,10 +6,10 @@ # Debian Project, Kenshi Muto , 2004-2012 msgid "" msgstr "" -"Project-Id-Version: apt 0.9.7.1\n" +"Project-Id-Version: apt 0.9.9.4\n" "Report-Msgid-Bugs-To: APT Development Team \n" "POT-Creation-Date: 2013-07-31 16:24+0200\n" -"PO-Revision-Date: 2012-07-01 00:14+0900\n" +"PO-Revision-Date: 2013-08-10 09:39+0900\n" "Last-Translator: Kenshi Muto \n" "Language-Team: Debian Japanese List \n" "Language: ja\n" @@ -296,7 +296,7 @@ msgstr "" #. YESEXPR/NOEXPR defined in your l10n. #: cmdline/apt-get.cc:146 msgid "[Y/n]" -msgstr "[Y/n]" +msgstr "" #. TRANSLATOR: Yes/No question help-text: defaulting to N[o] #. e.g. "Should this file be removed? [y/N] " @@ -304,7 +304,7 @@ msgstr "[Y/n]" #. YESEXPR/NOEXPR defined in your l10n. #: cmdline/apt-get.cc:152 msgid "[y/N]" -msgstr "[y/N]" +msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set #: cmdline/apt-get.cc:163 @@ -565,12 +565,14 @@ msgid "Authentication warning overridden.\n" msgstr "認証の警告は上書きされました。\n" #: cmdline/apt-get.cc:1108 +#, fuzzy +#| msgid "Install these packages without verification [y/N]? " msgid "Install these packages without verification?" -msgstr "検証なしにこれらのパッケージをインストールしますか?" +msgstr "検証なしにこれらのパッケージをインストールしますか [y/N]? " #: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" -msgstr "いくつかのパッケージを認証できませんでした?" +msgstr "いくつかのパッケージを認証できませんでした" #: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 msgid "There are problems and -y was used without --force-yes" @@ -658,8 +660,10 @@ msgid "Abort." msgstr "中断しました。" #: cmdline/apt-get.cc:1313 +#, fuzzy +#| msgid "Do you want to continue [Y/n]? " msgid "Do you want to continue?" -msgstr "続行しますか" +msgstr "続行しますか [Y/n]? " #: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format @@ -1526,9 +1530,9 @@ msgid "Temporary failure resolving '%s'" msgstr "'%s' が一時的に解決できません" #: methods/connect.cc:209 -#, fuzzy, c-format +#, c-format msgid "System error resolving '%s:%s'" -msgstr "'%s:%s' (%i - %s) の解決中に何か問題が起こりました" +msgstr "'%s:%s' の解決中にシステムエラーが発生しました" #: methods/connect.cc:211 #, c-format @@ -1684,6 +1688,7 @@ msgstr "ミラーファイル '%s' を読み込めません" #: methods/mirror.cc:315 #, fuzzy, c-format +#| msgid "Can not read mirror file '%s'" msgid "No entry found in mirror file '%s'" msgstr "ミラーファイル '%s' を読み込めません" @@ -2466,13 +2471,13 @@ msgstr "%c%s... 完了" #: apt-pkg/contrib/progress.cc:179 msgid "..." -msgstr "" +msgstr "..." #. Print the spinner #: apt-pkg/contrib/progress.cc:195 -#, fuzzy, c-format +#, c-format msgid "%c%s... %u%%" -msgstr "%c%s... 完了" +msgstr "%c%s... %u%%" #: apt-pkg/contrib/cmndline.cc:80 #, c-format @@ -3541,9 +3546,3 @@ msgstr "" #: apt-pkg/deb/debsystem.cc:121 msgid "Not locked" msgstr "ロックされていません" - -#~ msgid "File %s doesn't start with a clearsigned message" -#~ msgstr "ファイル %s はクリア署名されたメッセージで始まっていません" - -#~ msgid "Skipping nonexistent file %s" -#~ msgstr "存在しないファイル %s をスキップしています" -- cgit v1.2.3 From e7c82918f3abfb49d794bbe697f8721f25333b77 Mon Sep 17 00:00:00 2001 From: Christian PERRIER Date: Sun, 11 Aug 2013 15:42:09 +0200 Subject: Complete Japanese translation --- po/ja.po | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/po/ja.po b/po/ja.po index 6248256d1..97c476b09 100644 --- a/po/ja.po +++ b/po/ja.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: apt 0.9.9.4\n" "Report-Msgid-Bugs-To: APT Development Team \n" "POT-Creation-Date: 2013-07-31 16:24+0200\n" -"PO-Revision-Date: 2013-08-10 09:39+0900\n" +"PO-Revision-Date: 2013-08-11 19:39+0900\n" "Last-Translator: Kenshi Muto \n" "Language-Team: Debian Japanese List \n" "Language: ja\n" @@ -239,6 +239,10 @@ msgid "" "You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" "cdrom' for more information about the CD-ROM auto-detection and mount point." msgstr "" +"CD-ROM が自動検出されなかったか、デフォルトで利用するマウントポイントに見当た" +"りませんでした。CD-ROM のマウントポイントを設定するために --cdrom オプション" +"を試すことができます。CD-ROM の自動検出およびマウントポイントの詳細について" +"は、'man apt-cdrom' を参照してください。" #: cmdline/apt-cdrom.cc:85 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" @@ -296,7 +300,7 @@ msgstr "" #. YESEXPR/NOEXPR defined in your l10n. #: cmdline/apt-get.cc:146 msgid "[Y/n]" -msgstr "" +msgstr "[Y/n]" #. TRANSLATOR: Yes/No question help-text: defaulting to N[o] #. e.g. "Should this file be removed? [y/N] " @@ -304,7 +308,7 @@ msgstr "" #. YESEXPR/NOEXPR defined in your l10n. #: cmdline/apt-get.cc:152 msgid "[y/N]" -msgstr "" +msgstr "[y/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set #: cmdline/apt-get.cc:163 @@ -565,10 +569,8 @@ msgid "Authentication warning overridden.\n" msgstr "認証の警告は上書きされました。\n" #: cmdline/apt-get.cc:1108 -#, fuzzy -#| msgid "Install these packages without verification [y/N]? " msgid "Install these packages without verification?" -msgstr "検証なしにこれらのパッケージをインストールしますか [y/N]? " +msgstr "検証なしにこれらのパッケージをインストールしますか?" #: cmdline/apt-get.cc:1110 msgid "Some packages could not be authenticated" @@ -660,10 +662,8 @@ msgid "Abort." msgstr "中断しました。" #: cmdline/apt-get.cc:1313 -#, fuzzy -#| msgid "Do you want to continue [Y/n]? " msgid "Do you want to continue?" -msgstr "続行しますか [Y/n]? " +msgstr "続行しますか?" #: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 #, c-format @@ -1566,6 +1566,8 @@ msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" +"クリアサインされたファイルが有効ではなく、'%s' を得ました (認証にネットワーク" +"が必要?)" #: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" @@ -1687,10 +1689,9 @@ msgid "Can not read mirror file '%s'" msgstr "ミラーファイル '%s' を読み込めません" #: methods/mirror.cc:315 -#, fuzzy, c-format -#| msgid "Can not read mirror file '%s'" +#, c-format msgid "No entry found in mirror file '%s'" -msgstr "ミラーファイル '%s' を読み込めません" +msgstr "ミラーファイル '%s' のエントリが見つかりません" #: methods/mirror.cc:445 #, c-format -- cgit v1.2.3 From ca57fd4d8b854d97bd70efcf1018e34bc2ad4981 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 12 Aug 2013 17:11:41 +0200 Subject: use the 'abi-complicance-checker package instead of using the buildin copy for the abi checks --- abicheck/abi-compliance-checker.pl | 7325 ------------------------------------ abicheck/run_abi_test | 7 +- 2 files changed, 6 insertions(+), 7326 deletions(-) delete mode 100644 abicheck/abi-compliance-checker.pl diff --git a/abicheck/abi-compliance-checker.pl b/abicheck/abi-compliance-checker.pl deleted file mode 100644 index 7fd8ab173..000000000 --- a/abicheck/abi-compliance-checker.pl +++ /dev/null @@ -1,7325 +0,0 @@ -#!/usr/bin/perl -########################################################################### -# ABI-compliance-checker v1.13, lightweight tool for statically checking -# backward binary compatibility of shared C/C++ libraries in Linux. -# Copyright (C) The Linux Foundation -# Copyright (C) Institute for System Programming, RAS -# Author: Andrey Ponomarenko -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -########################################################################### -use Getopt::Long; -Getopt::Long::Configure ("posix_default", "no_ignore_case"); -use Data::Dumper; - -my $ABI_COMPLIANCE_CHECKER_VERSION = "1.13"; -my ($Help, $ShowVersion, %Descriptor, $TargetLibraryName, $HeaderCheckingMode_Separately, $GenerateDescriptor, $TestSystem, $DumpInfo_DescriptorPath, $CheckHeadersOnly, $InterfacesListPath, $AppPath, $ShowExpendTime); - -my $CmdName = get_FileName($0); -GetOptions("h|help!" => \$Help, - "v|version!" => \$ShowVersion, -#general options - "l|library=s" => \$TargetLibraryName, - "d1|descriptor1=s" => \$Descriptor{1}{"Path"}, - "d2|descriptor2=s" => \$Descriptor{2}{"Path"}, -#extra options - "app|application=s" => \$AppPath, - "symbols_list|int_list=s" => \$InterfacesListPath, - "dump_abi|dump_info=s" => \$DumpInfo_DescriptorPath, - "headers_only!" => \$CheckHeadersOnly, -#other options - "d|descriptor_template!" => \$GenerateDescriptor, - "separately!" => \$HeaderCheckingMode_Separately, - "test!" => \$TestSystem, - "time!" => \$ShowExpendTime -) or exit(1); - -sub HELP_MESSAGE() -{ - print STDERR <<"EOM" - -NAME: - $CmdName - check ABI compatibility of shared C/C++ library versions - -DESCRIPTION: - Lightweight tool for statically checking backward binary compatibility of shared C/C++ libraries - in Linux. It checks header files along with shared objects in two library versions and searches - for ABI changes that may lead to incompatibility. Breakage of the binary compatibility may result - in crashing or incorrect behavior of applications built with an old version of a library when - it is running with a new one. - - ABI Compliance Checker was intended for library developers that are interested in ensuring - backward binary compatibility. Also it can be used for checking forward binary compatibility - and checking applications portability to the new library version. - - This tool is free software: you can redistribute it and/or modify it under the terms of the GNU GPL. - -USAGE: - $CmdName [options] - -EXAMPLE OF USE: - $CmdName -l -d1 <1st_version_descriptor> -d2 <2nd_version_descriptor> - -GENERAL OPTIONS: - -h|-help - Print this help. - - -v|-version - Print version. - - -l|-library - Library name (without version). - It affects only on the path and the title of the report. - - -d1|-descriptor1 - Path to descriptor of 1st library version. - - -d2|-descriptor2 - Path to descriptor of 2nd library version. - -EXTRA OPTIONS: - -app|-application - This option allow to specify the application that should be tested for portability - to the new library version. - - -dump_abi|-dump_info - Dump library ABI information using specified descriptor. - This command will create '_.abi.tar.gz' file in the directory 'abi_dumps//'. - You can transfer it anywhere and pass instead of library descriptor. - - -headers_only - Check header files without shared objects. It is easy to run, but may provide - a low quality ABI compliance report with false positives and without - detecting of added/withdrawn interfaces. - - -symbols_list|-int_list - This option allow to specify a file with a list of interfaces (mangled names in C++) - that should be checked, other library interfaces will not be checked. - -OTHER OPTIONS: - -d|-descriptor_template - Create library descriptor template 'library-descriptor.xml' in the current directory. - - -separately - Check headers individually. This mode requires more time for checking ABI compliance, - but possible compiler errors in one header can't affect others. - - -test - Run internal tests (create two binary-incompatible versions of an artificial library - and run ABI-Compliance-Checker on it). - -DESCRIPTOR EXAMPLE: - - 1.28.0 - - - - /usr/local/atk/atk-1.28.0/include/ - - - - /usr/local/atk/atk-1.28.0/lib/libatk-1.0.so - - - - /usr/include/glib-2.0/ - /usr/lib/glib-2.0/include/ - - - -Report bugs to -For more information, please see: http://ispras.linux-foundation.org/index.php/ABI_compliance_checker -EOM - ; -} - -my $Descriptor_Template = " - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"; - -my %Operator_Indication = ( -"not" => "~", -"assign" => "=", -"andassign" => "&=", -"orassign" => "|=", -"xorassign" => "^=", -"or" => "|", -"xor" => "^", -"addr" => "&", -"and" => "&", -"lnot" => "!", -"eq" => "==", -"ne" => "!=", -"lt" => "<", -"lshift" => "<<", -"lshiftassign" => "<<=", -"rshiftassign" => ">>=", -"call" => "()", -"mod" => "%", -"modassign" => "%=", -"subs" => "[]", -"land" => "&&", -"lor" => "||", -"rshift" => ">>", -"ref" => "->", -"le" => "<=", -"deref" => "*", -"mult" => "*", -"preinc" => "++", -"delete" => " delete", -"vecnew" => " new[]", -"vecdelete" => " delete[]", -"predec" => "--", -"postinc" => "++", -"postdec" => "--", -"plusassign" => "+=", -"plus" => "+", -"minus" => "-", -"minusassign" => "-=", -"gt" => ">", -"ge" => ">=", -"new" => " new", -"multassign" => "*=", -"divassign" => "/=", -"div" => "/", -"neg" => "-", -"pos" => "+", -"memref" => "->*", -"compound" => "," -); - -sub num_to_str($) -{ - my $Number = $_[0]; - if(int($Number)>3) - { - return $Number."th"; - } - elsif(int($Number)==1) - { - return "1st"; - } - elsif(int($Number)==2) - { - return "2nd"; - } - elsif(int($Number)==3) - { - return "3rd"; - } - else - { - return ""; - } -} - -#Global variables -my $REPORT_PATH; -my %ERR_PATH; -my $POINTER_SIZE; -my $MAX_COMMAND_LINE_ARGUMENTS = 4096; -my %Cache; -my %FuncAttr; -my %LibInfo; -my %HeaderCompileError; -my $StartTime; -my %CompilerOptions; -my %AddedInt; -my %WithdrawnInt; -my @RecurLib; -my %CheckedSoLib; - -#Constants checking -my %ConstantsSrc; -my %Constants; - -#Types -my %TypeDescr; -my %TemplateInstance_Func; -my %TemplateInstance; -my %OpaqueTypes; -my %Tid_TDid; -my %CheckedTypes; -my %Typedef_BaseName; -my %StdCxxTypedef; -my %TName_Tid; -my %EnumMembName_Id; - -#Interfaces -my %FuncDescr; -my %ClassFunc; -my %ClassVirtFunc; -my %ClassIdVirtFunc; -my %ClassId; -my %tr_name; -my %mangled_name; -my %InternalInterfaces; -my %InterfacesList; -my %InterfacesList_App; -my %CheckedInterfaces; -my %DepInterfaces; - -#Headers -my %Include_Preamble; -my %Headers; -my %HeaderName_Destinations; -my %Header_Dependency; - -#Shared objects -my %SoLib_DefaultPath; - -#Merging -my %CompleteSignature; -my @RecurTypes; -my %Interface_Library; -my %Library_Interface; -my %Language; -my %SoNames_All; -my $Version; - -#Symbols versioning -my %SymVer; - -#Problem descriptions -my %CompatProblems; -my %ConstantProblems; - -#Rerorts -my $ContentID = 1; -my $ContentSpanStart = "\n"; -my $ContentSpanEnd = "\n"; -my $ContentDivStart = "
\n"; -my $ContentDivEnd = "
\n"; -my $Content_Counter = 0; - -sub readDescriptor($) -{ - my $LibVersion = $_[0]; - if(not -e $Descriptor{$LibVersion}{"Path"}) - { - return; - } - my $Descriptor_File = readFile($Descriptor{$LibVersion}{"Path"}); - $Descriptor_File =~ s/\/\*(.|\n)+?\*\///g; - $Descriptor_File =~ s/<\!--(.|\n)+?-->//g; - if(not $Descriptor_File) - { - print "ERROR: descriptor d$LibVersion is empty\n"; - exit(1); - } - $Descriptor{$LibVersion}{"Version"} = parseTag(\$Descriptor_File, "version"); - if(not $Descriptor{$LibVersion}{"Version"}) - { - print "ERROR: version in the descriptor d$LibVersion was not specified (section )\n\n"; - exit(1); - } - $Descriptor{$LibVersion}{"Headers"} = parseTag(\$Descriptor_File, "headers"); - if(not $Descriptor{$LibVersion}{"Headers"}) - { - print "ERROR: header files in the descriptor d$LibVersion were not specified (section )\n"; - exit(1); - } - if(not $CheckHeadersOnly) - { - $Descriptor{$LibVersion}{"Libs"} = parseTag(\$Descriptor_File, "libs"); - if(not $Descriptor{$LibVersion}{"Libs"}) - { - print "ERROR: shared objects in the descriptor d$LibVersion were not specified (section )\n"; - exit(1); - } - } - $Descriptor{$LibVersion}{"Include_Paths"} = parseTag(\$Descriptor_File, "include_paths"); - $Descriptor{$LibVersion}{"Gcc_Options"} = parseTag(\$Descriptor_File, "gcc_options"); - foreach my $Option (split("\n", $Descriptor{$LibVersion}{"Gcc_Options"})) - { - $Option =~ s/\A\s+|\s+\Z//g; - next if(not $Option); - $CompilerOptions{$LibVersion} .= " ".$Option; - } - $Descriptor{$LibVersion}{"Opaque_Types"} = parseTag(\$Descriptor_File, "opaque_types"); - foreach my $Type_Name (split("\n", $Descriptor{$LibVersion}{"Opaque_Types"})) - { - $Type_Name =~ s/\A\s+|\s+\Z//g; - next if(not $Type_Name); - $OpaqueTypes{$LibVersion}{$Type_Name} = 1; - } - $Descriptor{$LibVersion}{"Skip_interfaces"} = parseTag(\$Descriptor_File, "skip_interfaces"); - foreach my $Interface_Name (split("\n", $Descriptor{$LibVersion}{"Skip_interfaces"})) - { - $Interface_Name =~ s/\A\s+|\s+\Z//g; - next if(not $Interface_Name); - $InternalInterfaces{$LibVersion}{$Interface_Name} = 1; - } - $Descriptor{$LibVersion}{"Include_Preamble"} = parseTag(\$Descriptor_File, "include_preamble"); - my $Position = 0; - foreach my $Header_Name (split("\n", $Descriptor{$LibVersion}{"Include_Preamble"})) - { - $Header_Name =~ s/\A\s+|\s+\Z//g; - next if(not $Header_Name); - $Include_Preamble{$LibVersion}{$Header_Name}{"Position"} = $Position; - $Position+=1; - } - my $Descriptors_Dir = "descriptors_storage/$TargetLibraryName"; - system("mkdir", "-p", $Descriptors_Dir); - my $Descriptor_Name = $TargetLibraryName."_".$Descriptor{$LibVersion}{"Version"}.".desc"; - if($Descriptor{$LibVersion}{"Path"} ne $Descriptors_Dir."/".$Descriptor_Name) - { - system("cp", "-f", $Descriptor{$LibVersion}{"Path"}, $Descriptors_Dir."/".$Descriptor_Name); - } - $ERR_PATH{$LibVersion} = "header_compile_errors/$TargetLibraryName/".$Descriptor{$LibVersion}{"Version"}; -} - -sub parseTag($$) -{ - my ($CodeRef, $Tag) = @_; - return "" if(not $CodeRef or not ${$CodeRef} or not $Tag); - if(${$CodeRef} =~ s/\<$Tag\>((.|\n)+?)\<\/$Tag\>//) - { - my $Content = $1; - $Content=~s/(\A\s+|\s+\Z)//g; - return $Content; - } - else - { - return ""; - } -} - -my %check_node=( -"array_type"=>1, -"binfo"=>1, -"boolean_type"=>1, -"complex_type"=>1, -"const_decl"=>1, -"enumeral_type"=>1, -"field_decl"=>1, -"function_decl"=>1, -"function_type"=>1, -"identifier_node"=>1, -"integer_cst"=>1, -"integer_type"=>1, -"method_type"=>1, -"namespace_decl"=>1, -"parm_decl"=>1, -"pointer_type"=>1, -"real_cst"=>1, -"real_type"=>1, -"record_type"=>1, -"reference_type"=>1, -"string_cst"=>1, -"template_decl"=>1, -"template_type_parm"=>1, -"tree_list"=>1, -"tree_vec"=>1, -"type_decl"=>1, -"union_type"=>1, -"var_decl"=>1, -"void_type"=>1); - -sub getInfo($) -{ - my $InfoPath = $_[0]; - return if(not $InfoPath or not -f $InfoPath); - my $InfoPath_New = $InfoPath.".1"; - #my $Keywords = join("\\|", keys(%check_node));#|grep "$Keywords" - system("sed ':a;N;\$!ba;s/\\n[^\@]//g' ".esc($InfoPath)."|sed 's/ [ ]\\+/ /g' > ".esc($InfoPath_New)); - system("rm", "-fr", $InfoPath); - #getting info - open(INFO, $InfoPath_New) || die ("can't open file '\$InfoPath_New\': $!\n"); - while() - { - chomp; - if(/\A@([0-9]+)[ ]+([a-zA-Z_]+)[ ]+(.*)\Z/) - { - next if(not $check_node{$2}); - $LibInfo{$Version}{$1}{"info_type"}=$2; - $LibInfo{$Version}{$1}{"info"}=$3; - } - } - close(INFO); - system("rm", "-fr", $InfoPath_New); - #processing info - setTemplateParams_All(); - getTypeDescr_All(); - getFuncDescr_All(); - getVarDescr_All(); - %LibInfo = (); - %TemplateInstance = (); -} - -sub setTemplateParams_All() -{ - foreach (keys(%{$LibInfo{$Version}})) - { - if($LibInfo{$Version}{$_}{"info_type"} eq "template_decl") - { - setTemplateParams($_); - } - } -} - -sub setTemplateParams($) -{ - my $TypeInfoId = $_[0]; - my $Info = $LibInfo{$Version}{$TypeInfoId}{"info"}; - if($Info =~ /(inst|spcs)[ ]*:[ ]*@([0-9]+) /) - { - my $TmplInst_InfoId = $2; - setTemplateInstParams($TmplInst_InfoId); - my $TmplInst_Info = $LibInfo{$Version}{$TmplInst_InfoId}{"info"}; - while($TmplInst_Info =~ /chan[ ]*:[ ]*@([0-9]+) /) - { - $TmplInst_InfoId = $1; - $TmplInst_Info = $LibInfo{$Version}{$TmplInst_InfoId}{"info"}; - setTemplateInstParams($TmplInst_InfoId); - } - } -} - -sub setTemplateInstParams($) -{ - my $TmplInst_Id = $_[0]; - my $Info = $LibInfo{$Version}{$TmplInst_Id}{"info"}; - my ($Params_InfoId, $ElemId) = (); - if($Info =~ /purp[ ]*:[ ]*@([0-9]+) /) - { - $Params_InfoId = $1; - } - if($Info =~ /valu[ ]*:[ ]*@([0-9]+) /) - { - $ElemId = $1; - } - if($Params_InfoId and $ElemId) - { - my $Params_Info = $LibInfo{$Version}{$Params_InfoId}{"info"}; - while($Params_Info =~ s/ ([0-9]+)[ ]*:[ ]*@([0-9]+) //) - { - my ($Param_Pos, $Param_TypeId) = ($1, $2); - return if($LibInfo{$Version}{$Param_TypeId}{"info_type"} eq "template_type_parm"); - if($LibInfo{$ElemId}{"info_type"} eq "function_decl") - { - $TemplateInstance_Func{$Version}{$ElemId}{$Param_Pos} = $Param_TypeId; - } - else - { - $TemplateInstance{$Version}{getTypeDeclId($ElemId)}{$ElemId}{$Param_Pos} = $Param_TypeId; - } - } - } -} - -sub getTypeDeclId($) -{ - my $TypeInfo = $LibInfo{$Version}{$_[0]}{"info"}; - if($TypeInfo =~ /name[ ]*:[ ]*@([0-9]+)/) - { - return $1; - } - else - { - return ""; - } -} - -sub isFuncPtr($) -{ - my $Ptd = pointTo($_[0]); - if($Ptd) - { - if(($LibInfo{$Version}{$_[0]}{"info"} =~ m/unql[ ]*:/) and not ($LibInfo{$Version}{$_[0]}{"info"} =~ m/qual[ ]*:/)) - { - return 0; - } - elsif(($LibInfo{$Version}{$_[0]}{"info_type"} eq "pointer_type") and ($LibInfo{$Version}{$Ptd}{"info_type"} eq "function_type" or $LibInfo{$Version}{$Ptd}{"info_type"} eq "method_type")) - { - return 1; - } - else - { - return 0; - } - } - else - { - return 0; - } -} - -sub pointTo($) -{ - my $TypeInfo = $LibInfo{$Version}{$_[0]}{"info"}; - if($TypeInfo =~ /ptd[ ]*:[ ]*@([0-9]+)/) - { - return $1; - } - else - { - return ""; - } -} - -sub getTypeDescr_All() -{ - foreach (sort {int($a)<=>int($b)} keys(%{$LibInfo{$Version}})) - { - if($LibInfo{$Version}{$_}{"info_type"}=~/_type\Z/ and $LibInfo{$Version}{$_}{"info_type"}!~/function_type|method_type/) - { - getTypeDescr(getTypeDeclId($_), $_); - } - } - $TypeDescr{$Version}{""}{-1}{"Name"} = "..."; - $TypeDescr{$Version}{""}{-1}{"Type"} = "Intrinsic"; - $TypeDescr{$Version}{""}{-1}{"Tid"} = -1; -} - -sub getTypeDescr($$) -{ - my ($TypeDeclId, $TypeId) = @_; - $Tid_TDid{$Version}{$TypeId} = $TypeDeclId; - %{$TypeDescr{$Version}{$TypeDeclId}{$TypeId}} = getTypeAttr($TypeDeclId, $TypeId); - if(not $TypeDescr{$Version}{$TypeDeclId}{$TypeId}{"Name"}) - { - delete($TypeDescr{$Version}{$TypeDeclId}{$TypeId}); - return; - } - if(not $TName_Tid{$Version}{$TypeDescr{$Version}{$TypeDeclId}{$TypeId}{"Name"}}) - { - $TName_Tid{$Version}{$TypeDescr{$Version}{$TypeDeclId}{$TypeId}{"Name"}} = $TypeId; - } -} - -sub getTypeAttr($$) -{ - my ($TypeDeclId, $TypeId) = @_; - my ($BaseTypeSpec, %TypeAttr) = (); - if($TypeDescr{$Version}{$TypeDeclId}{$TypeId}{"Name"}) - { - return %{$TypeDescr{$Version}{$TypeDeclId}{$TypeId}}; - } - $TypeAttr{"Tid"} = $TypeId; - $TypeAttr{"TDid"} = $TypeDeclId; - $TypeAttr{"Type"} = getTypeType($TypeDeclId, $TypeId); - if($TypeAttr{"Type"} eq "Unknown") - { - return (); - } - elsif($TypeAttr{"Type"} eq "FuncPtr") - { - %{$TypeDescr{$Version}{$TypeDeclId}{$TypeId}} = getFuncPtrAttr(pointTo($TypeId), $TypeDeclId, $TypeId); - $TName_Tid{$Version}{$TypeDescr{$Version}{$TypeDeclId}{$TypeId}{"Name"}} = $TypeId; - return %{$TypeDescr{$Version}{$TypeDeclId}{$TypeId}}; - } - elsif($TypeAttr{"Type"} eq "Array") - { - ($TypeAttr{"BaseType"}{"Tid"}, $TypeAttr{"BaseType"}{"TDid"}, $BaseTypeSpec) = selectBaseType($TypeDeclId, $TypeId); - my %BaseTypeAttr = getTypeAttr($TypeAttr{"BaseType"}{"TDid"}, $TypeAttr{"BaseType"}{"Tid"}); - my $ArrayElemNum = getSize($TypeId)/8; - $ArrayElemNum = $ArrayElemNum/$BaseTypeAttr{"Size"} if($BaseTypeAttr{"Size"}); - $TypeAttr{"Size"} = $ArrayElemNum; - if($ArrayElemNum) - { - $TypeAttr{"Name"} = $BaseTypeAttr{"Name"}."[".$ArrayElemNum."]"; - } - else - { - $TypeAttr{"Name"} = $BaseTypeAttr{"Name"}."[]"; - } - $TypeAttr{"Name"} = correctName($TypeAttr{"Name"}); - $TypeAttr{"Library"} = $BaseTypeAttr{"Library"}; - $TypeAttr{"Header"} = $BaseTypeAttr{"Header"}; - %{$TypeDescr{$Version}{$TypeDeclId}{$TypeId}} = %TypeAttr; - $TName_Tid{$Version}{$TypeDescr{$Version}{$TypeDeclId}{$TypeId}{"Name"}} = $TypeId; - return %TypeAttr; - } - elsif($TypeAttr{"Type"} =~ /Intrinsic|Union|Struct|Enum|Class/) - { - if($TemplateInstance{$Version}{$TypeDeclId}{$TypeId}) - { - my @Template_Params = (); - foreach my $Param_Pos (sort {int($a)<=>int($b)} keys(%{$TemplateInstance{$Version}{$TypeDeclId}{$TypeId}})) - { - my $Type_Id = $TemplateInstance{$Version}{$TypeDeclId}{$TypeId}{$Param_Pos}; - my $Param = get_TemplateParam($Type_Id); - if($Param eq "") - { - return (); - } - @Template_Params = (@Template_Params, $Param); - } - %{$TypeDescr{$Version}{$TypeDeclId}{$TypeId}} = getTrivialTypeAttr($TypeDeclId, $TypeId); - $TypeDescr{$Version}{$TypeDeclId}{$TypeId}{"Name"} = $TypeDescr{$Version}{$TypeDeclId}{$TypeId}{"Name"}."< ".join(", ", @Template_Params)." >"; - $TypeDescr{$Version}{$TypeDeclId}{$TypeId}{"Name"} = correctName($TypeDescr{$Version}{$TypeDeclId}{$TypeId}{"Name"}); - $TName_Tid{$Version}{$TypeDescr{$Version}{$TypeDeclId}{$TypeId}{"Name"}} = $TypeId; - return %{$TypeDescr{$Version}{$TypeDeclId}{$TypeId}}; - } - else - { - %{$TypeDescr{$Version}{$TypeDeclId}{$TypeId}} = getTrivialTypeAttr($TypeDeclId, $TypeId); - return %{$TypeDescr{$Version}{$TypeDeclId}{$TypeId}}; - } - } - else - { - ($TypeAttr{"BaseType"}{"Tid"}, $TypeAttr{"BaseType"}{"TDid"}, $BaseTypeSpec) = selectBaseType($TypeDeclId, $TypeId); - my %BaseTypeAttr = getTypeAttr($TypeAttr{"BaseType"}{"TDid"}, $TypeAttr{"BaseType"}{"Tid"}); - if($BaseTypeSpec and $BaseTypeAttr{"Name"}) - { - if(($TypeAttr{"Type"} eq "Pointer") and $BaseTypeAttr{"Name"}=~/\([\*]+\)/) - { - $TypeAttr{"Name"} = $BaseTypeAttr{"Name"}; - $TypeAttr{"Name"} =~ s/\(([*]+)\)/($1*)/g; - } - else - { - $TypeAttr{"Name"} = $BaseTypeAttr{"Name"}." ".$BaseTypeSpec; - } - } - elsif($BaseTypeAttr{"Name"}) - { - $TypeAttr{"Name"} = $BaseTypeAttr{"Name"}; - } - if($TypeAttr{"Type"} eq "Typedef") - { - $TypeAttr{"Name"} = getNameByInfo($TypeDeclId); - $TypeAttr{"NameSpace"} = getNameSpace($TypeDeclId); - if($TypeAttr{"NameSpace"}) - { - $TypeAttr{"Name"} = $TypeAttr{"NameSpace"}."::".$TypeAttr{"Name"}; - } - ($TypeAttr{"Header"}, $TypeAttr{"Line"}) = getLocation($TypeDeclId); - if($TypeAttr{"NameSpace"}=~/\Astd(::|\Z)/ and $BaseTypeAttr{"NameSpace"}=~/\Astd(::|\Z)/) - { - $StdCxxTypedef{$Version}{$BaseTypeAttr{"Name"}} = $TypeAttr{"Name"}; - } - $Typedef_BaseName{$Version}{$TypeAttr{"Name"}} = $BaseTypeAttr{"Name"}; - } - if(not $TypeAttr{"Size"}) - { - if($TypeAttr{"Type"} eq "Pointer") - { - $TypeAttr{"Size"} = $POINTER_SIZE; - } - else - { - $TypeAttr{"Size"} = $BaseTypeAttr{"Size"}; - } - } - $TypeAttr{"Name"} = correctName($TypeAttr{"Name"}); - $TypeAttr{"Library"} = $BaseTypeAttr{"Library"}; - $TypeAttr{"Header"} = $BaseTypeAttr{"Header"} if(not $TypeAttr{"Header"}); - %{$TypeDescr{$Version}{$TypeDeclId}{$TypeId}} = %TypeAttr; - $TName_Tid{$Version}{$TypeDescr{$Version}{$TypeDeclId}{$TypeId}{"Name"}} = $TypeId; - return %TypeAttr; - } -} - -sub get_TemplateParam($) -{ - my $Type_Id = $_[0]; - if(getNodeType($Type_Id) eq "integer_cst") - { - return getNodeIntCst($Type_Id); - } - elsif(getNodeType($Type_Id) eq "string_cst") - { - return getNodeStrCst($Type_Id); - } - else - { - my $Type_DId = getTypeDeclId($Type_Id); - my %ParamAttr = getTypeAttr($Type_DId, $Type_Id); - if(not $ParamAttr{"Name"}) - { - return ""; - } - if($ParamAttr{"Name"}=~/\>/) - { - if($StdCxxTypedef{$Version}{$ParamAttr{"Name"}}) - { - return $StdCxxTypedef{$Version}{$ParamAttr{"Name"}}; - } - elsif(my $Covered = cover_stdcxx_typedef($ParamAttr{"Name"})) - { - return $Covered; - } - else - { - return $ParamAttr{"Name"}; - } - } - else - { - return $ParamAttr{"Name"}; - } - } -} - -sub cover_stdcxx_typedef($) -{ - my $TypeName = $_[0]; - my $TypeName_Covered = $TypeName; - while($TypeName=~s/>[ ]*(const|volatile|restrict| |\*|\&)\Z/>/g){}; - if(my $Cover = $StdCxxTypedef{$Version}{$TypeName}) - { - $TypeName = esc_l($TypeName); - $TypeName_Covered=~s/$TypeName/$Cover /g; - } - return correctName($TypeName_Covered); -} - -sub getNodeType($) -{ - return $LibInfo{$Version}{$_[0]}{"info_type"}; -} - -sub getNodeIntCst($) -{ - my $CstId = $_[0]; - my $CstTypeId = getTreeAttr($CstId, "type"); - if($EnumMembName_Id{$Version}{$CstId}) - { - return $EnumMembName_Id{$Version}{$CstId}; - } - elsif($LibInfo{$Version}{$_[0]}{"info"} =~ /low[ ]*:[ ]*([^ ]+) /) - { - if($1 eq "0") - { - if(getNodeType($CstTypeId) eq "boolean_type") - { - return "false"; - } - else - { - return "0"; - } - } - elsif($1 eq "1") - { - if(getNodeType($CstTypeId) eq "boolean_type") - { - return "true"; - } - else - { - return "1"; - } - } - else - { - return $1; - } - } - else - { - return ""; - } -} - -sub getNodeStrCst($) -{ - if($LibInfo{$Version}{$_[0]}{"info"} =~ /low[ ]*:[ ]*(.+)[ ]+lngt/) - { - return $1; - } - else - { - return ""; - } -} - -sub esc_l($) -{ - my $String = $_[0]; - $String=~s/([()*])/\\$1/g; - return $String; -} - -sub getFuncPtrAttr($$$) -{ - my ($FuncTypeId, $TypeDeclId, $TypeId) = @_; - my $FuncInfo = $LibInfo{$Version}{$FuncTypeId}{"info"}; - my $FuncInfo_Type = $LibInfo{$Version}{$FuncTypeId}{"info_type"}; - my $FuncPtrCorrectName = ""; - my %TypeAttr = ("Size"=>$POINTER_SIZE, "Type"=>"FuncPtr", "TDid"=>$TypeDeclId, "Tid"=>$TypeId); - my @ParamTypeName; - if($FuncInfo =~ /retn[ ]*:[ ]*\@([0-9]+) /) - { - my $ReturnTypeId = $1; - my %ReturnAttr = getTypeAttr(getTypeDeclId($ReturnTypeId), $ReturnTypeId); - $FuncPtrCorrectName .= $ReturnAttr{"Name"}; - $TypeAttr{"Return"} = $ReturnTypeId; - } - if($FuncInfo =~ /prms[ ]*:[ ]*@([0-9]+) /) - { - my $ParamTypeInfoId = $1; - my $Position = 0; - while($ParamTypeInfoId) - { - my $ParamTypeInfo = $LibInfo{$Version}{$ParamTypeInfoId}{"info"}; - last if($ParamTypeInfo !~ /valu[ ]*:[ ]*@([0-9]+) /); - my $ParamTypeId = $1; - my %ParamAttr = getTypeAttr(getTypeDeclId($ParamTypeId), $ParamTypeId); - last if($ParamAttr{"Name"} eq "void"); - $TypeAttr{"Memb"}{$Position}{"type"} = $ParamTypeId; - push(@ParamTypeName, $ParamAttr{"Name"}); - last if($ParamTypeInfo !~ /chan[ ]*:[ ]*@([0-9]+) /); - $ParamTypeInfoId = $1; - $Position+=1; - } - } - if($FuncInfo_Type eq "function_type") - { - $FuncPtrCorrectName .= " (*) (".join(", ", @ParamTypeName).")"; - } - elsif($FuncInfo_Type eq "method_type") - { - if($FuncInfo =~ /clas[ ]*:[ ]*@([0-9]+) /) - { - my $ClassId = $1; - my $ClassName = $TypeDescr{$Version}{getTypeDeclId($ClassId)}{$ClassId}{"Name"}; - if($ClassName) - { - $FuncPtrCorrectName .= " ($ClassName\:\:*) (".join(", ", @ParamTypeName).")"; - } - else - { - $FuncPtrCorrectName .= " (*) (".join(", ", @ParamTypeName).")"; - } - } - else - { - $FuncPtrCorrectName .= " (*) (".join(", ", @ParamTypeName).")"; - } - } - $TypeAttr{"Name"} = correctName($FuncPtrCorrectName); - return %TypeAttr; -} - -sub getTypeName($) -{ - my $Info = $LibInfo{$Version}{$_[0]}{"info"}; - if($Info =~ /name[ ]*:[ ]*@([0-9]+) /) - { - return getNameByInfo($1); - } - else - { - if($LibInfo{$Version}{$_[0]}{"info_type"} eq "integer_type") - { - if($LibInfo{$Version}{$_[0]}{"info"} =~ /unsigned/) - { - return "unsigned int"; - } - else - { - return "int"; - } - } - else - { - return ""; - } - } -} - -sub selectBaseType($$) -{ - my ($TypeDeclId, $TypeId) = @_; - my $TypeInfo = $LibInfo{$Version}{$TypeId}{"info"}; - my $BaseTypeDeclId; - my $Type_Type = getTypeType($TypeDeclId, $TypeId); - #qualifications - if(($LibInfo{$Version}{$TypeId}{"info"} =~ /qual[ ]*:[ ]*c /) and ($LibInfo{$Version}{$TypeId}{"info"} =~ /unql[ ]*:[ ]*\@([0-9]+) /)) - { - return ($1, getTypeDeclId($1), "const"); - } - elsif(($LibInfo{$Version}{$TypeId}{"info"} =~ /qual[ ]*:[ ]*r /) and ($LibInfo{$Version}{$TypeId}{"info"} =~ /unql[ ]*:[ ]*\@([0-9]+) /)) - { - return ($1, getTypeDeclId($1), "restrict"); - } - elsif(($LibInfo{$Version}{$TypeId}{"info"} =~ /qual[ ]*:[ ]*v /) and ($LibInfo{$Version}{$TypeId}{"info"} =~ /unql[ ]*:[ ]*\@([0-9]+) /)) - { - return ($1, getTypeDeclId($1), "volatile"); - } - elsif((not ($LibInfo{$Version}{$TypeId}{"info"} =~ /qual[ ]*:/)) and ($LibInfo{$Version}{$TypeId}{"info"} =~ /unql[ ]*:[ ]*\@([0-9]+) /)) - {#typedefs - return ($1, getTypeDeclId($1), ""); - } - elsif($LibInfo{$Version}{$TypeId}{"info_type"} eq "reference_type") - { - if($TypeInfo =~ /refd[ ]*:[ ]*@([0-9]+) /) - { - return ($1, getTypeDeclId($1), "&"); - } - else - { - return (0, 0, ""); - } - } - elsif($LibInfo{$Version}{$TypeId}{"info_type"} eq "array_type") - { - if($TypeInfo =~ /elts[ ]*:[ ]*@([0-9]+) /) - { - return ($1, getTypeDeclId($1), ""); - } - else - { - return (0, 0, ""); - } - } - elsif($LibInfo{$Version}{$TypeId}{"info_type"} eq "pointer_type") - { - if($TypeInfo =~ /ptd[ ]*:[ ]*@([0-9]+) /) - { - return ($1, getTypeDeclId($1), "*"); - } - else - { - return (0, 0, ""); - } - } - else - { - return (0, 0, ""); - } -} - -sub getFuncDescr_All() -{ - foreach (sort {int($b)<=>int($a)} keys(%{$LibInfo{$Version}})) - { - if($LibInfo{$Version}{$_}{"info_type"} eq "function_decl") - { - getFuncDescr($_); - } - } -} - -sub getVarDescr_All() -{ - foreach (sort {int($b)<=>int($a)} keys(%{$LibInfo{$Version}})) - { - if($LibInfo{$Version}{$_}{"info_type"} eq "var_decl") - { - getVarDescr($_); - } - } -} - -sub getVarDescr($) -{ - my $FuncInfoId = $_[0]; - if($LibInfo{$Version}{getNameSpaceId($FuncInfoId)}{"info_type"} eq "function_decl") - { - return; - } - ($FuncDescr{$Version}{$FuncInfoId}{"Header"}, $FuncDescr{$Version}{$FuncInfoId}{"Line"}) = getLocation($FuncInfoId); - if((not $FuncDescr{$Version}{$FuncInfoId}{"Header"}) or ($FuncDescr{$Version}{$FuncInfoId}{"Header"}=~/\|\/)) - { - delete($FuncDescr{$Version}{$FuncInfoId}); - return; - } - $FuncDescr{$Version}{$FuncInfoId}{"ShortName"} = getNameByInfo($FuncInfoId); - $FuncDescr{$Version}{$FuncInfoId}{"MnglName"} = getFuncMnglName($FuncInfoId); - if($FuncDescr{$Version}{$FuncInfoId}{"MnglName"} and $FuncDescr{$Version}{$FuncInfoId}{"MnglName"}!~/\A_Z/) - { - delete($FuncDescr{$Version}{$FuncInfoId}); - return; - } - if(not $FuncDescr{$Version}{$FuncInfoId}{"MnglName"}) - { - $FuncDescr{$Version}{$FuncInfoId}{"Name"} = $FuncDescr{$Version}{$FuncInfoId}{"ShortName"}; - $FuncDescr{$Version}{$FuncInfoId}{"MnglName"} = $FuncDescr{$Version}{$FuncInfoId}{"ShortName"}; - } - if(not is_in_library($FuncDescr{$Version}{$FuncInfoId}{"MnglName"}, $Version) and not $CheckHeadersOnly) - { - delete $FuncDescr{$Version}{$FuncInfoId}; - return; - } - $FuncDescr{$Version}{$FuncInfoId}{"Return"} = getTypeId($FuncInfoId); - delete($FuncDescr{$Version}{$FuncInfoId}{"Return"}) if(not $FuncDescr{$Version}{$FuncInfoId}{"Return"}); - $FuncDescr{$Version}{$FuncInfoId}{"Data"} = 1; - set_Class_And_Namespace($FuncInfoId); - setFuncAccess($FuncInfoId); - if($FuncDescr{$Version}{$FuncInfoId}{"MnglName"} =~ /\A_ZTV/) - { - delete($FuncDescr{$Version}{$FuncInfoId}{"Return"}); - } - if($FuncDescr{$Version}{$FuncInfoId}{"ShortName"} =~ /\A_Z/) - { - delete($FuncDescr{$Version}{$FuncInfoId}{"ShortName"}); - } -} - -sub getTrivialTypeAttr($$) -{ - my ($TypeInfoId, $TypeId) = @_; - my %TypeAttr = (); - return if(getTypeTypeByTypeId($TypeId)!~/Intrinsic|Union|Struct|Enum/); - setTypeAccess($TypeId, \%TypeAttr); - ($TypeAttr{"Header"}, $TypeAttr{"Line"}) = getLocation($TypeInfoId); - if(($TypeAttr{"Header"} eq "") or ($TypeAttr{"Header"} eq "")) - { - delete($TypeAttr{"Header"}); - } - $TypeAttr{"Name"} = getNameByInfo($TypeInfoId); - $TypeAttr{"Name"} = getTypeName($TypeId) if(not $TypeAttr{"Name"}); - my $NameSpaceId = getNameSpaceId($TypeInfoId); - if($NameSpaceId ne $TypeId) - { - $TypeAttr{"NameSpace"} = getNameSpace($TypeInfoId); - } - if($TypeAttr{"NameSpace"} and isNotAnon($TypeAttr{"Name"})) - { - $TypeAttr{"Name"} = $TypeAttr{"NameSpace"}."::".$TypeAttr{"Name"}; - } - $TypeAttr{"Name"} = correctName($TypeAttr{"Name"}); - if(isAnon($TypeAttr{"Name"})) - { - $TypeAttr{"Name"} = "anon-"; - $TypeAttr{"Name"} .= $TypeAttr{"Header"}."-".$TypeAttr{"Line"}; - } - $TypeAttr{"Size"} = getSize($TypeId)/8; - $TypeAttr{"Type"} = getTypeType($TypeInfoId, $TypeId); - if($TypeAttr{"Type"} eq "Struct" and has_methods($TypeId)) - { - $TypeAttr{"Type"} = "Class"; - } - if(($TypeAttr{"Type"} eq "Struct") or ($TypeAttr{"Type"} eq "Class")) - { - setBaseClasses($TypeInfoId, $TypeId, \%TypeAttr); - } - setTypeMemb($TypeInfoId, $TypeId, \%TypeAttr); - $TypeAttr{"Tid"} = $TypeId; - $TypeAttr{"TDid"} = $TypeInfoId; - $Tid_TDid{$Version}{$TypeId} = $TypeInfoId; - if(not $TName_Tid{$Version}{$TypeAttr{"Name"}}) - { - $TName_Tid{$Version}{$TypeAttr{"Name"}} = $TypeId; - } - return %TypeAttr; -} - -sub has_methods($) -{ - my $TypeId = $_[0]; - my $Info = $LibInfo{$Version}{$TypeId}{"info"}; - return ($Info=~/(fncs)[ ]*:[ ]*@([0-9]+) /); -} - -sub setBaseClasses($$$) -{ - my ($TypeInfoId, $TypeId, $TypeAttr) = @_; - my $Info = $LibInfo{$Version}{$TypeId}{"info"}; - if($Info =~ /binf[ ]*:[ ]*@([0-9]+) /) - { - $Info = $LibInfo{$Version}{$1}{"info"}; - while($Info =~ /accs[ ]*:[ ]*([a-z]+) /) - { - last if($Info !~ s/accs[ ]*:[ ]*([a-z]+) //); - my $Access = $1; - last if($Info !~ s/binf[ ]*:[ ]*@([0-9]+) //); - my $BInfoId = $1; - my $ClassId = getBinfClassId($BInfoId); - if($Access eq "pub") - { - $TypeAttr->{"BaseClass"}{$ClassId} = "public"; - } - elsif($Access eq "prot") - { - $TypeAttr->{"BaseClass"}{$ClassId} = "protected"; - } - elsif($Access eq "priv") - { - $TypeAttr->{"BaseClass"}{$ClassId} = "private"; - } - else - { - $TypeAttr->{"BaseClass"}{$ClassId} = "private"; - } - } - } -} - -sub getBinfClassId($) -{ - my $Info = $LibInfo{$Version}{$_[0]}{"info"}; - $Info =~ /type[ ]*:[ ]*@([0-9]+) /; - return $1; -} - -sub get_func_signature($) -{ - my $FuncInfoId = $_[0]; - my $PureSignature = $FuncDescr{$Version}{$FuncInfoId}{"ShortName"}; - my @ParamTypes = (); - foreach my $ParamPos (sort {int($a) <=> int($b)} keys(%{$FuncDescr{$Version}{$FuncInfoId}{"Param"}})) - {#checking parameters - my $ParamType_Id = $FuncDescr{$Version}{$FuncInfoId}{"Param"}{$ParamPos}{"type"}; - my $ParamType_Name = uncover_typedefs($TypeDescr{$Version}{getTypeDeclId($ParamType_Id)}{$ParamType_Id}{"Name"}); - @ParamTypes = (@ParamTypes, $ParamType_Name); - } - $PureSignature = $PureSignature."(".join(", ", @ParamTypes).")"; - $PureSignature = delete_keywords($PureSignature); - return correctName($PureSignature); -} - -sub delete_keywords($) -{ - my $TypeName = $_[0]; - $TypeName =~ s/(\W|\A)(enum |struct |union |class )/$1/g; - return $TypeName; -} - -sub uncover_typedefs($) -{ - my $TypeName = $_[0]; - return "" if(not $TypeName); - return $Cache{"uncover_typedefs"}{$Version}{$TypeName} if(defined $Cache{"uncover_typedefs"}{$Version}{$TypeName}); - my ($TypeName_New, $TypeName_Pre) = (correctName($TypeName), ""); - while($TypeName_New ne $TypeName_Pre) - { - $TypeName_Pre = $TypeName_New; - my $TypeName_Copy = $TypeName_New; - my %Words = (); - while($TypeName_Copy=~s/(\W|\A)([a-z_][\w:]*)(\W|\Z)//io) - { - my $Word = $2; - next if(not $Word or $Word=~/\A(true|false|const|int|long|void|short|float|unsigned|char|double|class|struct|union|enum)\Z/); - $Words{$Word} = 1; - } - foreach my $Word (keys(%Words)) - { - my $BaseType_Name = $Typedef_BaseName{$Version}{$Word}; - next if($TypeName_New=~/(\W|\A)(struct $Word|union $Word|enum $Word)(\W|\Z)/); - next if(not $BaseType_Name); - if($BaseType_Name=~/\([*]+\)/) - { - $TypeName_New =~ /$Word(.*)\Z/; - my $Type_Suffix = $1; - $TypeName_New = $BaseType_Name; - if($TypeName_New =~ s/\(([*]+)\)/($1 $Type_Suffix)/) - { - $TypeName_New = correctName($TypeName_New); - } - } - else - { - if($TypeName_New =~ s/(\W|\A)$Word(\W|\Z)/$1$BaseType_Name$2/g) - { - $TypeName_New = correctName($TypeName_New); - } - } - } - } - $Cache{"uncover_typedefs"}{$Version}{$TypeName} = $TypeName_New; - return $TypeName_New; -} - -sub isInternal($) -{ - my $FuncInfoId = $_[0]; - my $FuncInfo = $LibInfo{$Version}{$_[0]}{"info"}; - return 0 if($FuncInfo !~ /mngl[ ]*:[ ]*@([0-9]+) /); - my $FuncMnglNameInfoId = $1; - return ($LibInfo{$Version}{$FuncMnglNameInfoId}{"info"} =~ /\*[ ]*INTERNAL[ ]*\*/); -} - -sub set_Class_And_Namespace($) -{ - my $FuncInfoId = $_[0]; - my $FuncInfo = $LibInfo{$Version}{$FuncInfoId}{"info"}; - if($FuncInfo =~ /scpe[ ]*:[ ]*@([0-9]+) /) - { - my $NameSpaceInfoId = $1; - if($LibInfo{$Version}{$NameSpaceInfoId}{"info_type"} eq "namespace_decl") - { - my $NameSpaceInfo = $LibInfo{$Version}{$NameSpaceInfoId}{"info"}; - if($NameSpaceInfo =~ /name[ ]*:[ ]*@([0-9]+) /) - { - my $NameSpaceId = $1; - my $NameSpaceIdentifier = $LibInfo{$Version}{$NameSpaceId}{"info"}; - if($NameSpaceIdentifier =~ /strg[ ]*:[ ]*(.*)[ ]+lngt/) - { - my $NameSpace = $1; - $NameSpace =~ s/[ ]+\Z//g; - $FuncDescr{$Version}{$FuncInfoId}{"NameSpace"} = $NameSpace; - } - } - } - elsif($LibInfo{$Version}{$NameSpaceInfoId}{"info_type"} eq "record_type") - { - $FuncDescr{$Version}{$FuncInfoId}{"Class"} = $NameSpaceInfoId; - } - } -} - -sub getFuncDescr($) -{ - my $FuncInfoId = $_[0]; - return if(isInternal($FuncInfoId)); - ($FuncDescr{$Version}{$FuncInfoId}{"Header"}, $FuncDescr{$Version}{$FuncInfoId}{"Line"}) = getLocation($FuncInfoId); - if(not $FuncDescr{$Version}{$FuncInfoId}{"Header"} or $FuncDescr{$Version}{$FuncInfoId}{"Header"}=~/\|\/) - { - delete($FuncDescr{$Version}{$FuncInfoId}); - return; - } - setFuncAccess($FuncInfoId); - setFuncKind($FuncInfoId); - if($FuncDescr{$Version}{$FuncInfoId}{"PseudoTemplate"}) - { - delete($FuncDescr{$Version}{$FuncInfoId}); - return; - } - $FuncDescr{$Version}{$FuncInfoId}{"Type"} = getFuncType($FuncInfoId); - $FuncDescr{$Version}{$FuncInfoId}{"Return"} = getFuncReturn($FuncInfoId); - delete($FuncDescr{$Version}{$FuncInfoId}{"Return"}) if(not $FuncDescr{$Version}{$FuncInfoId}{"Return"}); - $FuncDescr{$Version}{$FuncInfoId}{"ShortName"} = getFuncShortName(getFuncOrig($FuncInfoId)); - if($FuncDescr{$Version}{$FuncInfoId}{"ShortName"} =~ /\._/) - { - delete($FuncDescr{$Version}{$FuncInfoId}); - return; - } - if(defined $TemplateInstance_Func{$Version}{$FuncInfoId}) - { - my @TmplParams = (); - foreach my $ParamPos (sort {int($a) <=> int($b)} keys(%{$TemplateInstance_Func{$Version}{$FuncInfoId}})) - { - my $Param = get_TemplateParam($TemplateInstance_Func{$Version}{$FuncInfoId}{$ParamPos}); - if($Param eq "") - { - delete($FuncDescr{$Version}{$FuncInfoId}); - return; - } - push(@TmplParams, $Param); - } - $FuncDescr{$Version}{$FuncInfoId}{"ShortName"} .= "<".join(", ", @TmplParams).">"; - } - setFuncParams($FuncInfoId); - $FuncDescr{$Version}{$FuncInfoId}{"MnglName"} = getFuncMnglName($FuncInfoId); - if($FuncDescr{$Version}{$FuncInfoId}{"MnglName"} and $FuncDescr{$Version}{$FuncInfoId}{"MnglName"}!~/\A_Z/) - { - delete($FuncDescr{$Version}{$FuncInfoId}); - return; - } - - if((is_in_library($FuncDescr{$Version}{$FuncInfoId}{"ShortName"}, $Version) or $CheckHeadersOnly) and not $FuncDescr{$Version}{$FuncInfoId}{"MnglName"} and ($FuncDescr{$Version}{$FuncInfoId}{"Type"} eq "Function")) - { - $FuncDescr{$Version}{$FuncInfoId}{"MnglName"} = $FuncDescr{$Version}{$FuncInfoId}{"ShortName"}; - } - set_Class_And_Namespace($FuncInfoId); - if(not $FuncDescr{$Version}{$FuncInfoId}{"MnglName"} and not $FuncDescr{$Version}{$FuncInfoId}{"Class"}) - {#this section only for c++ functions without class that have not been mangled in the tree - $FuncDescr{$Version}{$FuncInfoId}{"MnglName"} = $mangled_name{get_func_signature($FuncInfoId)}; - } - if(not is_in_library($FuncDescr{$Version}{$FuncInfoId}{"MnglName"}, $Version) and not $CheckHeadersOnly) - {#src only - delete($FuncDescr{$Version}{$FuncInfoId}); - return; - } - if($FuncDescr{$Version}{$FuncInfoId}{"Constructor"} or $FuncDescr{$Version}{$FuncInfoId}{"Destructor"}) - { - delete($FuncDescr{$Version}{$FuncInfoId}{"Return"}); - } - my $FuncBody = getFuncBody($FuncInfoId); - if($FuncBody eq "defined") - { - $FuncDescr{$Version}{$FuncInfoId}{"InLine"} = 1; - } - if($CheckHeadersOnly and $FuncDescr{$Version}{$FuncInfoId}{"InLine"}) - { - delete($FuncDescr{$Version}{$FuncInfoId}); - return; - } - if(($FuncDescr{$Version}{$FuncInfoId}{"Type"} eq "Method") or $FuncDescr{$Version}{$FuncInfoId}{"Constructor"} or $FuncDescr{$Version}{$FuncInfoId}{"Destructor"}) - { - if($FuncDescr{$Version}{$FuncInfoId}{"MnglName"}!~/\A_Z/) - { - delete($FuncDescr{$Version}{$FuncInfoId}); - return; - } - } - if(getFuncSpec($FuncInfoId) eq "Virt") - {#virtual methods - $FuncDescr{$Version}{$FuncInfoId}{"Virt"} = 1; - } - if(getFuncSpec($FuncInfoId) eq "PureVirt") - {#pure virtual methods - $FuncDescr{$Version}{$FuncInfoId}{"PureVirt"} = 1; - } - if($FuncDescr{$Version}{$FuncInfoId}{"MnglName"} =~ /\A_Z/ and $FuncDescr{$Version}{$FuncInfoId}{"Class"}) - { - if($FuncDescr{$Version}{$FuncInfoId}{"Type"} eq "Function") - {#static methods - $FuncDescr{$Version}{$FuncInfoId}{"Static"} = 1; - } - } - if(getFuncLink($FuncInfoId) eq "Static") - { - $FuncDescr{$Version}{$FuncInfoId}{"Static"} = 1; - } - delete($FuncDescr{$Version}{$FuncInfoId}{"Type"}); -} - -sub getFuncBody($) -{ - my $FuncInfo = $LibInfo{$Version}{$_[0]}{"info"}; - if($FuncInfo =~ /body[ ]*:[ ]*undefined(\ |\Z)/i) - { - return "undefined"; - } - elsif($FuncInfo =~ /body[ ]*:[ ]*@([0-9]+)(\ |\Z)/i) - { - return "defined"; - } - else - { - return ""; - } -} - -sub getTypeShortName($) -{ - my $TypeName = $_[0]; - $TypeName =~ s/\<.*\>//g; - $TypeName =~ s/.*\:\://g; - return $TypeName; -} - -sub getBackRef($) -{ - my $TypeInfo = $LibInfo{$Version}{$_[0]}{"info"}; - if($TypeInfo =~ /name[ ]*:[ ]*@([0-9]+) /) - { - return $1; - } - else - { - return ""; - } -} - -sub getTypeId($) -{ - my $TypeInfo = $LibInfo{$Version}{$_[0]}{"info"}; - if($TypeInfo =~ /type[ ]*:[ ]*@([0-9]+) /) - { - return $1; - } - else - { - return ""; - } -} - -sub getFuncId($) -{ - my $FuncInfo = $LibInfo{$Version}{$_[0]}{"info"}; - if($FuncInfo =~ /type[ ]*:[ ]*@([0-9]+) /) - { - return $1; - } - else - { - return ""; - } -} - -sub setTypeMemb($$) -{ - my ($TypeDeclId, $TypeId, $TypeAttr) = @_; - my $TypeInfo = $LibInfo{$Version}{$TypeId}{"info"}; - my $TypeMembInfoId; - my $TypeType = $TypeAttr->{"Type"}; - my $Position = 0; - my $BasePosition = 0; - my $TypeTypeInfoId; - my $StructMembName; - if($TypeType eq "Enum") - { - $TypeMembInfoId = getEnumMembInfoId($TypeId); - while($TypeMembInfoId) - { - $TypeAttr->{"Memb"}{$Position}{"value"} = getEnumMembVal($TypeMembInfoId); - my $MembName = getEnumMembName($TypeMembInfoId); - $TypeAttr->{"Memb"}{$Position}{"name"} = getEnumMembName($TypeMembInfoId); - $EnumMembName_Id{$Version}{getTreeAttr($TypeMembInfoId, "valu")} = ($TypeAttr->{"NameSpace"})?$TypeAttr->{"NameSpace"}."::".$MembName:$MembName; - $TypeMembInfoId = getNextMembInfoId($TypeMembInfoId); - $Position += 1; - } - } - elsif(($TypeType eq "Struct") or ($TypeType eq "Class") or ($TypeType eq "Union")) - { - $TypeMembInfoId = getStructMembInfoId($TypeId); - while($TypeMembInfoId) - { - if($LibInfo{$Version}{$TypeMembInfoId}{"info_type"} ne "field_decl") - { - $TypeMembInfoId = getNextStructMembInfoId($TypeMembInfoId); - next; - } - $StructMembName = getStructMembName($TypeMembInfoId); - if($StructMembName =~ /_vptr\./) - {#virtual tables - $TypeMembInfoId = getNextStructMembInfoId($TypeMembInfoId); - next; - } - if(not $StructMembName) - {#base classes - #$TypeAttr->{"Base"}{$BasePosition}{"type"} = getStructMembType($TypeMembInfoId); - #$TypeAttr->{"Base"}{$BasePosition}{"access"} = getStructMembAccess($TypeMembInfoId); - $BasePosition += 1; - $TypeMembInfoId = getNextStructMembInfoId($TypeMembInfoId); - next; - } - $TypeAttr->{"Memb"}{$Position}{"type"} = getStructMembType($TypeMembInfoId); - $TypeAttr->{"Memb"}{$Position}{"name"} = $StructMembName; - $TypeAttr->{"Memb"}{$Position}{"access"} = getStructMembAccess($TypeMembInfoId); - $TypeAttr->{"Memb"}{$Position}{"bitfield"} = getStructMembBitFieldSize($TypeMembInfoId); - - $TypeMembInfoId = getNextStructMembInfoId($TypeMembInfoId); - $Position += 1; - } - } -} - -sub setFuncParams($) -{ - my $FuncInfoId = $_[0]; - my $ParamInfoId = getFuncParamInfoId($FuncInfoId); - my $FunctionType = getFuncType($FuncInfoId); - if($FunctionType eq "Method") - { - $ParamInfoId = getNextElem($ParamInfoId); - } - my $Position = 0; - while($ParamInfoId) - { - my $ParamTypeId = getFuncParamType($ParamInfoId); - last if($TypeDescr{$Version}{getTypeDeclId($ParamTypeId)}{$ParamTypeId}{"Name"} eq "void"); - if($TypeDescr{$Version}{getTypeDeclId($ParamTypeId)}{$ParamTypeId}{"Type"} eq "Restrict") - {#delete restrict spec - $ParamTypeId = getRestrictBase($ParamTypeId); - } - $FuncDescr{$Version}{$FuncInfoId}{"Param"}{$Position}{"type"} = $ParamTypeId; - $FuncDescr{$Version}{$FuncInfoId}{"Param"}{$Position}{"name"} = getFuncParamName($ParamInfoId); - if(not $FuncDescr{$Version}{$FuncInfoId}{"Param"}{$Position}{"name"}) - { - $FuncDescr{$Version}{$FuncInfoId}{"Param"}{$Position}{"name"} = "p".($Position+1); - } - $ParamInfoId = getNextElem($ParamInfoId); - $Position += 1; - } - if(detect_nolimit_args($FuncInfoId)) - { - $FuncDescr{$Version}{$FuncInfoId}{"Param"}{$Position}{"type"} = -1; - } -} - -sub detect_nolimit_args($) -{ - my $FuncInfoId = $_[0]; - my $FuncTypeId = getFuncTypeId($FuncInfoId); - my $ParamListElemId = getFuncParamTreeListId($FuncTypeId); - my $HaveVoid = 0; - my $Position = 0; - while($ParamListElemId) - { - my $ParamTypeId = getTreeAttr($ParamListElemId, "valu"); - if($TypeDescr{$Version}{getTypeDeclId($ParamTypeId)}{$ParamTypeId}{"Name"} eq "void") - { - $HaveVoid = 1; - last; - } - $ParamListElemId = getNextElem($ParamListElemId); - $Position += 1; - } - return ($Position>=1 and not $HaveVoid); -} - -sub getFuncParamTreeListId($) -{ - my $FuncTypeId = $_[0]; - if($LibInfo{$Version}{$FuncTypeId}{"info"} =~ /prms[ ]*:[ ]*@([0-9]+) /) - { - return $1; - } - else - { - return ""; - } -} - -sub getTreeAttr($$) -{ - my ($Id, $Attr) = @_; - if($LibInfo{$Version}{$Id}{"info"} =~ /$Attr[ ]*:[ ]*@([0-9]+) /) - { - return $1; - } - else - { - return ""; - } -} - -sub getRestrictBase($) -{ - my $TypeId = $_[0]; - my $TypeDeclId = getTypeDeclId($TypeId); - my $BaseTypeId = $TypeDescr{$Version}{$TypeDeclId}{$TypeId}{"BaseType"}{"Tid"}; - my $BaseTypeDeclId = $TypeDescr{$Version}{$TypeDeclId}{$TypeId}{"BaseType"}{"TDid"}; - return $BaseTypeId; -} - -sub setFuncAccess($) -{ - my $FuncInfoId = $_[0]; - if($LibInfo{$Version}{$FuncInfoId}{"info"} =~ /accs[ ]*:[ ]*([a-zA-Z]+) /) - { - my $Access = $1; - if($Access eq "prot") - { - $FuncDescr{$Version}{$FuncInfoId}{"Protected"} = 1; - } - elsif($Access eq "priv") - { - $FuncDescr{$Version}{$FuncInfoId}{"Private"} = 1; - } - } -} - -sub setTypeAccess($$) -{ - my ($TypeId, $TypeAttr) = @_; - my $TypeInfo = $LibInfo{$Version}{$TypeId}{"info"}; - if($TypeInfo =~ /accs[ ]*:[ ]*([a-zA-Z]+) /) - { - my $Access = $1; - if($Access eq "prot") - { - $TypeAttr->{"Protected"} = 1; - } - elsif($Access eq "priv") - { - $TypeAttr->{"Private"} = 1; - } - } -} - -sub setFuncKind($) -{ - my $FuncInfoId = $_[0]; - if($LibInfo{$Version}{$FuncInfoId}{"info"} =~ /pseudo tmpl/) - { - $FuncDescr{$Version}{$FuncInfoId}{"PseudoTemplate"} = 1; - } - elsif($LibInfo{$Version}{$FuncInfoId}{"info"} =~ /note[ ]*:[ ]*constructor /) - { - $FuncDescr{$Version}{$FuncInfoId}{"Constructor"} = 1; - } - elsif($LibInfo{$Version}{$FuncInfoId}{"info"} =~ /note[ ]*:[ ]*destructor /) - { - $FuncDescr{$Version}{$FuncInfoId}{"Destructor"} = 1; - } -} - -sub getFuncSpec($) -{ - my $FuncInfoId = $_[0]; - my $FuncInfo = $LibInfo{$Version}{$FuncInfoId}{"info"}; - if($FuncInfo =~ m/spec[ ]*:[ ]*pure /) - { - return "PureVirt"; - } - elsif($FuncInfo =~ m/spec[ ]*:[ ]*virt /) - { - return "Virt"; - } - else - { - if($FuncInfo =~ /spec[ ]*:[ ]*([a-zA-Z]+) /) - { - return $1; - } - else - { - return ""; - } - } -} - -sub getFuncClass($) -{ - my $FuncInfoId = $_[0]; - my $FuncInfo = $LibInfo{$Version}{$FuncInfoId}{"info"}; - if($FuncInfo =~ /scpe[ ]*:[ ]*@([0-9]+) /) - { - return $1; - } - else - { - return ""; - } -} - -sub getFuncLink($) -{ - my $FuncInfoId = $_[0]; - my $FuncInfo = $LibInfo{$Version}{$FuncInfoId}{"info"}; - if($FuncInfo =~ /link[ ]*:[ ]*static /) - { - return "Static"; - } - else - { - if($FuncInfo =~ /link[ ]*:[ ]*([a-zA-Z]+) /) - { - return $1; - } - else - { - return ""; - } - } -} - -sub getNextElem($) -{ - my $FuncInfoId = $_[0]; - my $FuncInfo = $LibInfo{$Version}{$FuncInfoId}{"info"}; - if($FuncInfo =~ /chan[ ]*:[ ]*@([0-9]+) /) - { - return $1; - } - else - { - return ""; - } -} - -sub getFuncParamInfoId($) -{ - my $FuncInfoId = $_[0]; - my $FuncInfo = $LibInfo{$Version}{$FuncInfoId}{"info"}; - if($FuncInfo =~ /args[ ]*:[ ]*@([0-9]+) /) - { - return $1; - } - else - { - return ""; - } -} - -sub getFuncParamType($) -{ - my $ParamInfoId = $_[0]; - my $ParamInfo = $LibInfo{$Version}{$ParamInfoId}{"info"}; - if($ParamInfo =~ /type[ ]*:[ ]*@([0-9]+) /) - { - return $1; - } - else - { - return ""; - } -} - -sub getFuncParamName($) -{ - my $ParamInfoId = $_[0]; - my $ParamInfo = $LibInfo{$Version}{$ParamInfoId}{"info"}; - return "" if($ParamInfo !~ /name[ ]*:[ ]*@([0-9]+) /); - my $NameInfoId = $1; - return "" if($LibInfo{$Version}{$NameInfoId}{"info"} !~ /strg[ ]*:[ ]*(.*)[ ]+lngt/); - my $FuncParamName = $1; - $FuncParamName =~ s/[ ]+\Z//g; - return $FuncParamName; -} - -sub getEnumMembInfoId($) -{ - my $TypeInfoId = $_[0]; - my $TypeInfo = $LibInfo{$Version}{$TypeInfoId}{"info"}; - if($TypeInfo =~ /csts[ ]*:[ ]*@([0-9]+) /) - { - return $1; - } - else - { - return ""; - } -} - -sub getStructMembInfoId($) -{ - my $TypeInfoId = $_[0]; - my $TypeInfo = $LibInfo{$Version}{$TypeInfoId}{"info"}; - if($TypeInfo =~ /flds[ ]*:[ ]*@([0-9]+) /) - { - return $1; - } - else - { - return ""; - } -} - -sub getNameSpace($) -{ - my $TypeInfoId = $_[0]; - my $TypeInfo = $LibInfo{$Version}{$TypeInfoId}{"info"}; - return "" if($TypeInfo !~ /scpe[ ]*:[ ]*@([0-9]+) /); - my $NameSpaceInfoId = $1; - if($LibInfo{$Version}{$NameSpaceInfoId}{"info_type"} eq "namespace_decl") - { - my $NameSpaceInfo = $LibInfo{$Version}{$NameSpaceInfoId}{"info"}; - if($NameSpaceInfo =~ /name[ ]*:[ ]*@([0-9]+) /) - { - my $NameSpaceId = $1; - my $NameSpaceIdentifier = $LibInfo{$Version}{$NameSpaceId}{"info"}; - return "" if($NameSpaceIdentifier !~ /strg[ ]*:[ ]*(.*)[ ]+lngt/); - my $NameSpace = $1; - $NameSpace =~ s/[ ]+\Z//g; - my $BaseNameSpace = getNameSpace($NameSpaceInfoId); - $NameSpace = $BaseNameSpace."::".$NameSpace if($BaseNameSpace); - return $NameSpace; - } - else - { - return ""; - } - } - elsif($LibInfo{$Version}{$NameSpaceInfoId}{"info_type"} eq "record_type") - { - my %NameSpaceAttr = getTypeAttr(getTypeDeclId($NameSpaceInfoId), $NameSpaceInfoId); - return $NameSpaceAttr{"Name"}; - } - else - { - return ""; - } -} - -sub getNameSpaceId($) -{ - my $TypeInfoId = $_[0]; - my $TypeInfo = $LibInfo{$Version}{$TypeInfoId}{"info"}; - if($TypeInfo =~ /scpe[ ]*:[ ]*@([0-9]+) /) - { - return $1; - } - else - { - return ""; - } -} - -sub getEnumMembName($) -{ - my $TypeMembInfoId = $_[0]; - return "" if($LibInfo{$Version}{$TypeMembInfoId}{"info"} !~ /purp[ ]*:[ ]*@([0-9]+)/); - my $Purp = $1; - return "" if($LibInfo{$Version}{$Purp}{"info"} !~ /strg[ ]*:[ ]*(.*)[ ]+lngt/); - my $EnumMembName = $1; - $EnumMembName =~ s/[ ]+\Z//g; - return $EnumMembName; -} - -sub getStructMembName($) -{ - my $TypeMembInfoId = $_[0]; - return "" if($LibInfo{$Version}{$TypeMembInfoId}{"info"} !~ /name[ ]*:[ ]*@([0-9]+) /); - my $NameInfoId = $1; - return "" if($LibInfo{$Version}{$NameInfoId}{"info"} !~ /strg[ ]*:[ ]*(.*)[ ]+lngt/); - my $StructMembName = $1; - $StructMembName =~ s/[ ]+\Z//g; - return $StructMembName; -} - -sub getEnumMembVal($) -{ - my $TypeMembInfoId = $_[0]; - return "" if($LibInfo{$Version}{$TypeMembInfoId}{"info"} !~ /valu[ ]*:[ ]*@([0-9]+) /); - my $Valu = $1; - if($LibInfo{$Version}{$Valu}{"info"} =~ /low[ ]*:[ ]*(-?[0-9]+) /) - { - return $1; - } - else - { - return ""; - } -} - -sub getSize($) -{ - my $Info = $LibInfo{$Version}{$_[0]}{"info"}; - if($Info =~ /size[ ]*:[ ]*@([0-9]+) /) - { - my $SizeInfoId = $1; - if($LibInfo{$Version}{$SizeInfoId}{"info"} =~ /low[ ]*:[ ]*(-?[0-9]+) /) - { - return $1; - } - else - { - return ""; - } - } - else - { - return 0; - } -} - -sub getStructMembType($) -{ - my $TypeMembInfoId = $_[0]; - if($LibInfo{$Version}{$TypeMembInfoId}{"info"} =~ /type[ ]*:[ ]*@([0-9]+) /) - { - return $1; - } - else - { - return ""; - } -} - -sub getStructMembBitFieldSize($) -{ - my $TypeMembInfoId = $_[0]; - if($LibInfo{$Version}{$TypeMembInfoId}{"info"} =~ / bitfield /) - { - return getSize($TypeMembInfoId); - } - else - { - return 0; - } -} - -sub getStructMembAccess($) -{ - my $MembInfo = $LibInfo{$Version}{$_[0]}{"info"}; - if($MembInfo =~ /accs[ ]*:[ ]*([a-zA-Z]+) /) - { - my $Access = $1; - if($Access eq "prot") - { - return "protected"; - } - elsif($Access eq "priv") - { - return "private"; - } - else - { - return "public"; - } - } - else - { - return "public"; - } -} - -sub getNextMembInfoId($) -{ - my $TypeMembInfoId = $_[0]; - if($LibInfo{$Version}{$TypeMembInfoId}{"info"} =~ /chan[ ]*:[ ]*@([0-9]+) /) - { - return $1; - } - else - { - return ""; - } -} - -sub getNextStructMembInfoId($) -{ - my $TypeMembInfoId = $_[0]; - if($LibInfo{$Version}{$TypeMembInfoId}{"info"} =~ /chan[ ]*:[ ]*@([0-9]+) /) - { - return $1; - } - else - { - return ""; - } -} - -sub fieldHasName($) -{ - my $TypeMembInfoId = $_[0]; - if($LibInfo{$Version}{$TypeMembInfoId}{"info_type"} eq "field_decl") - { - if($LibInfo{$Version}{$TypeMembInfoId}{"info"} =~ /name[ ]*:[ ]*@([0-9]+) /) - { - return $1; - } - else - { - return ""; - } - } - else - { - return 0; - } -} - -sub getTypeHeader($) -{ - my $TypeInfo = $LibInfo{$Version}{$_[0]}{"info"}; - if($TypeInfo =~ /srcp[ ]*:[ ]*([0-9a-zA-Z\_\-\<\>\.\+]+):([0-9]+) /) - { - return ($1, $2); - } - else - { - return (); - } -} - -sub register_header($$$) -{ - my ($Destination, $Position, $LibVersion) = @_; - return if(not $Destination); - if($Destination=~/\A\// and not -f $Destination) - { - print "\nERROR: specified header \'$Destination\' does not exist\n"; - return; - } - my $Header_Name = get_FileName($Destination); - $Headers{$LibVersion}{$Destination}{"Name"} = $Header_Name; - $Headers{$LibVersion}{$Destination}{"Position"} = $Position; - $Headers{$LibVersion}{$Destination}{"Identity"} = $Destination; - $HeaderName_Destinations{$LibVersion}{$Header_Name}{$Destination} = 1; -} - -sub headerSearch($) -{ - my $LibVersion = $_[0]; - foreach my $Dest (split("\n", $Descriptor{$LibVersion}{"Include_Paths"})) - { - $Dest =~ s/\A\s+|\s+\Z//g; - next if(not $Dest); - if(not -e $Dest) - { - print "ERROR: can't access \'$Dest\'\n"; - } - $Header_Dependency{$LibVersion}{$Dest} = 1; - } - foreach my $Dest (split("\n", $Descriptor{$LibVersion}{"Headers"})) - {#fill %Header_Dependency - if(-d $Dest) - { - foreach my $Dir (cmd_find($Dest,"d","")) - { - chomp($Dir); - $Header_Dependency{$LibVersion}{$Dir} = 1; - } - } - elsif(-f $Dest) - { - $Header_Dependency{$LibVersion}{get_Dir($Dest)} = 1; - } - } - my $Position = 0; - foreach my $Dest (split("\n", $Descriptor{$LibVersion}{"Headers"})) - { - $Dest =~ s/\A\s+|\s+\Z//g; - next if(not $Dest); - if(is_header($Dest, $LibVersion)) - { - register_header($Dest, $Position, $LibVersion); - $Position += 1; - } - elsif(-d $Dest) - { - foreach my $Destination (sort {lc($a) cmp lc($b)} (cmd_find($Dest,"f",""))) - { - chomp($Destination); - next if(not is_header($Destination, $LibVersion)); - register_header($Destination, $Position, $LibVersion); - $Position += 1; - } - } - else - { - print "WARNING: \'$Dest\' was not found in the specified include paths\n"; - register_header($Dest, $Position, $LibVersion); - $Position += 1; - } - } - if(keys(%{$Headers{$LibVersion}})==1) - { - my $Destination = (keys(%{$Headers{$LibVersion}}))[0]; - $Headers{$LibVersion}{$Destination}{"Identity"} = $Headers{$LibVersion}{$Destination}{"Name"}; - } - foreach my $Header_Name (keys(%{$HeaderName_Destinations{$LibVersion}})) - {#set relative paths (for dublicates) - if(keys(%{$HeaderName_Destinations{$LibVersion}{$Header_Name}})>1) - { - my $FirstDest = (keys(%{$HeaderName_Destinations{$LibVersion}{$Header_Name}}))[0]; - my $Prefix = get_Dir($FirstDest); - while($Prefix =~ /\A(.+)\/[^\/]+\Z/) - { - my $NewPrefix = $1; - my $Changes_Number = 0; - my %Identity = (); - foreach my $Dest (keys(%{$HeaderName_Destinations{$LibVersion}{$Header_Name}})) - { - if($Dest =~ /\A$Prefix\/(.*)\Z/) - { - $Identity{$Dest} = $1; - $Changes_Number+=1; - } - } - if($Changes_Number eq keys(%{$HeaderName_Destinations{$LibVersion}{$Header_Name}})) - { - foreach my $Dest (keys(%{$HeaderName_Destinations{$LibVersion}{$Header_Name}})) - { - $Headers{$LibVersion}{$Dest}{"Identity"} = $Identity{$Dest}; - } - last; - } - $Prefix = $NewPrefix; - } - } - } - if(not keys(%{$Headers{$LibVersion}})) - { - print "ERROR: header files were not found\n"; - exit(1); - } -} - -sub get_FileName($) -{ - my $Path = $_[0]; - if($Path =~ /\A(.*\/)([^\/]*)\Z/) - { - return $2; - } - else - { - return $Path; - } -} - -sub get_Dir($) -{ - my $Path = $_[0]; - return "" if($Path =~ m*\A\./*); - if($Path =~ /\A(.*)\/([^\/]*)\Z/) - { - return $1; - } - else - { - return ""; - } -} - -sub esc($) -{ - my $Str = $_[0]; - $Str =~ s/([()\[\]{}$ &'"`;,<>])/\\$1/g; - return $Str; -} - -sub getLocation($) -{ - my $TypeInfo = $LibInfo{$Version}{$_[0]}{"info"}; - if($TypeInfo =~ /srcp[ ]*:[ ]*([0-9a-zA-Z\_\-\<\>\.\+]+):([0-9]+) /) - { - return ($1, $2); - } - else - { - return (); - } -} - -sub getHeader($) -{ - my $TypeInfo = $LibInfo{$Version}{$_[0]}{"info"}; - if($TypeInfo =~ /srcp[ ]*:[ ]*([0-9a-zA-Z\_\-\<\>\.\+]+):([0-9]+) /) - { - return $1; - } - else - { - return ""; - } -} - -sub getLine($) -{ - my $TypeInfo = $LibInfo{$Version}{$_[0]}{"info"}; - if($TypeInfo =~ /srcp[ ]*:[ ]*([0-9a-zA-Z\_\-\<\>\.\+]+):([0-9]+) /) - { - return $2; - } - else - { - return ""; - } -} - -sub getTypeType($$) -{ - my ($TypeDeclId, $TypeId) = @_; - return "Const" if($LibInfo{$Version}{$TypeId}{"info"} =~ /qual[ ]*:[ ]*c / and $LibInfo{$Version}{$TypeId}{"info"} =~ /unql[ ]*:[ ]*\@/); - return "Typedef" if($LibInfo{$Version}{$TypeId}{"info"} =~ /unql[ ]*:/ and $LibInfo{$Version}{$TypeId}{"info"} !~ /qual[ ]*:/); - return "Volatile" if($LibInfo{$Version}{$TypeId}{"info"} =~ /qual[ ]*:[ ]*v / and $LibInfo{$Version}{$TypeId}{"info"} =~ /unql[ ]*:[ ]*\@/); - return "Restrict" if($LibInfo{$Version}{$TypeId}{"info"} =~ /qual[ ]*:[ ]*r / and $LibInfo{$Version}{$TypeId}{"info"} =~ /unql[ ]*:[ ]*\@/); - my $TypeType = getTypeTypeByTypeId($TypeId); - if($TypeType eq "Struct") - { - if($TypeDeclId and $LibInfo{$Version}{$TypeDeclId}{"info_type"} eq "template_decl") - { - return "Template"; - } - else - { - return "Struct"; - } - } - else - { - return $TypeType; - } - -} - -sub getTypeTypeByTypeId($) -{ - my $TypeId = $_[0]; - my $TypeType = $LibInfo{$Version}{$TypeId}{"info_type"}; - if($TypeType =~ /integer_type|real_type|boolean_type|void_type|complex_type/) - { - return "Intrinsic"; - } - elsif(isFuncPtr($TypeId)) - { - return "FuncPtr"; - } - elsif($TypeType eq "pointer_type") - { - return "Pointer"; - } - elsif($TypeType eq "reference_type") - { - return "Ref"; - } - elsif($TypeType eq "union_type") - { - return "Union"; - } - elsif($TypeType eq "enumeral_type") - { - return "Enum"; - } - elsif($TypeType eq "record_type") - { - return "Struct"; - } - elsif($TypeType eq "array_type") - { - return "Array"; - } - elsif($TypeType eq "complex_type") - { - return "Intrinsic"; - } - elsif($TypeType eq "function_type") - { - return "FunctionType"; - } - elsif($TypeType eq "method_type") - { - return "MethodType"; - } - else - { - return "Unknown"; - } -} - -sub getNameByInfo($) -{ - my $TypeInfo = $LibInfo{$Version}{$_[0]}{"info"}; - return "" if($TypeInfo !~ /name[ ]*:[ ]*@([0-9]+) /); - my $TypeNameInfoId = $1; - return "" if($LibInfo{$Version}{$TypeNameInfoId}{"info"} !~ /strg[ ]*:[ ]*(.*)[ ]+lngt/); - my $TypeName = $1; - $TypeName =~ s/[ ]+\Z//g; - return $TypeName; -} - -sub getFuncShortName($) -{ - my $FuncInfo = $LibInfo{$Version}{$_[0]}{"info"}; - if($FuncInfo =~ / operator /) - { - if($FuncInfo =~ /note[ ]*:[ ]*conversion /) - { - return "operator ".get_TypeName($FuncDescr{$Version}{$_[0]}{"Return"}); - } - else - { - return "" if($FuncInfo !~ / operator[ ]+([a-zA-Z]+) /); - return "operator".$Operator_Indication{$1}; - } - } - else - { - return "" if($FuncInfo !~ /name[ ]*:[ ]*@([0-9]+) /); - my $FuncNameInfoId = $1; - return "" if($LibInfo{$Version}{$FuncNameInfoId}{"info"} !~ /strg[ ]*:[ ]*([^ ]*)[ ]+lngt/); - return $1; - } -} - -sub getFuncMnglName($) -{ - my $FuncInfo = $LibInfo{$Version}{$_[0]}{"info"}; - return "" if($FuncInfo !~ /mngl[ ]*:[ ]*@([0-9]+) /); - my $FuncMnglNameInfoId = $1; - return "" if($LibInfo{$Version}{$FuncMnglNameInfoId}{"info"} !~ /strg[ ]*:[ ]*([^ ]*)[ ]+/); - my $FuncMnglName = $1; - $FuncMnglName =~ s/[ ]+\Z//g; - return $FuncMnglName; -} - -sub getFuncReturn($) -{ - my $FuncInfo = $LibInfo{$Version}{$_[0]}{"info"}; - return "" if($FuncInfo !~ /type[ ]*:[ ]*@([0-9]+) /); - my $FuncTypeInfoId = $1; - return "" if($LibInfo{$Version}{$FuncTypeInfoId}{"info"} !~ /retn[ ]*:[ ]*@([0-9]+) /); - my $FuncReturnTypeId = $1; - if($TypeDescr{$Version}{getTypeDeclId($FuncReturnTypeId)}{$FuncReturnTypeId}{"Type"} eq "Restrict") - {#delete restrict spec - $FuncReturnTypeId = getRestrictBase($FuncReturnTypeId); - } - return $FuncReturnTypeId; -} - -sub getFuncOrig($) -{ - my $FuncInfo = $LibInfo{$Version}{$_[0]}{"info"}; - if($FuncInfo =~ /orig[ ]*:[ ]*@([0-9]+) /) - { - return $1; - } - else - { - return $_[0]; - } -} - -sub unmangleArray(@) -{ - if($#_>$MAX_COMMAND_LINE_ARGUMENTS) - { - my @Half = splice(@_, 0, ($#_+1)/2); - return (unmangleArray(@Half), unmangleArray(@_)) - } - else - { - my $UnmangleCommand = "c++filt ".join(" ", @_); - return split("\n", `$UnmangleCommand`); - } -} - -sub get_Signature($$) -{ - my ($Interface, $LibVersion) = @_; - return $Cache{"get_Signature"}{$Interface}{$LibVersion} if($Cache{"get_Signature"}{$Interface}{$LibVersion}); - my ($MnglName, $SymbolVersion) = ($Interface, ""); - if($Interface =~ /\A([^@]+)[\@]+([^@]+)\Z/) - { - ($MnglName, $SymbolVersion) = ($1, $2); - } - if($MnglName =~ /\A(_ZGV|_ZTI|_ZTS|_ZTT|_ZTV|_ZThn|_ZTv0_n)/) - { - $Cache{"get_Signature"}{$Interface}{$LibVersion} = $tr_name{$MnglName}.(($SymbolVersion)?"\@".$SymbolVersion:""); - return $Cache{"get_Signature"}{$Interface}{$LibVersion}; - } - if(not $CompleteSignature{$LibVersion}{$Interface}) - { - if($Interface =~ /\A_Z/) - { - $Cache{"get_Signature"}{$Interface}{$LibVersion} = $tr_name{$MnglName}.(($SymbolVersion)?"\@".$SymbolVersion:""); - return $Cache{"get_Signature"}{$Interface}{$LibVersion}; - } - else - { - $Cache{"get_Signature"}{$Interface}{$LibVersion} = $Interface; - return $Interface; - } - } - my ($Func_Signature, @Param_Types_FromUnmangledName) = (); - my $ShortName = $CompleteSignature{$LibVersion}{$Interface}{"ShortName"}; - if($Interface =~ /\A_Z/) - { - if($CompleteSignature{$LibVersion}{$Interface}{"Class"}) - { - $Func_Signature = get_TypeName($CompleteSignature{$LibVersion}{$Interface}{"Class"}, $LibVersion)."::".(($CompleteSignature{$LibVersion}{$Interface}{"Destructor"})?"~":"").$ShortName; - } - else - { - $Func_Signature = $ShortName; - } - @Param_Types_FromUnmangledName = get_Signature_Parts($tr_name{$MnglName}, 0); - } - else - { - $Func_Signature = $MnglName; - } - my @ParamArray = (); - foreach my $Pos (sort {int($a) <=> int($b)} keys(%{$CompleteSignature{$LibVersion}{$Interface}{"Param"}})) - { - next if($Pos eq ""); - my $ParamTypeId = $CompleteSignature{$LibVersion}{$Interface}{"Param"}{$Pos}{"type"}; - my $ParamTypeName = $TypeDescr{$LibVersion}{$Tid_TDid{$LibVersion}{$ParamTypeId}}{$ParamTypeId}{"Name"}; - $ParamTypeName = $Param_Types_FromUnmangledName[$Pos] if(not $ParamTypeName); - if(my $ParamName = $CompleteSignature{$LibVersion}{$Interface}{"Param"}{$Pos}{"name"}) - { - if($ParamTypeName=~/\([*]+\)/) - { - $ParamTypeName=~s/\(([*]+)\)/\($1$ParamName\)/; - push(@ParamArray, $ParamTypeName); - } - else - { - push(@ParamArray, $ParamTypeName." ".$ParamName); - } - } - else - { - push(@ParamArray, $ParamTypeName); - } - } - if(not $CompleteSignature{$LibVersion}{$Interface}{"Data"}) - { - if($Interface=~/\A_Z/) - { - if($CompleteSignature{$LibVersion}{$Interface}{"Constructor"}) - { - if($Interface=~/C1/) - { - $Func_Signature .= " [in-charge]"; - } - elsif($Interface=~/C2/) - { - $Func_Signature .= " [not-in-charge]"; - } - } - elsif($CompleteSignature{$LibVersion}{$Interface}{"Destructor"}) - { - if($Interface=~/D1/) - { - $Func_Signature .= " [in-charge]"; - } - elsif($Interface=~/D2/) - { - $Func_Signature .= " [not-in-charge]"; - } - elsif($Interface=~/D0/) - { - $Func_Signature .= " [in-charge-deleting]"; - } - } - } - $Func_Signature .= " (".join(", ", @ParamArray).")"; - } - if($Interface=~/\A_ZNK/) - { - $Func_Signature .= " const"; - } - $Func_Signature .= "\@".$SymbolVersion if($SymbolVersion); - $Cache{"get_Signature"}{$Interface}{$LibVersion} = $Func_Signature; - return $Func_Signature; -} - -sub getVarNameByAttr($) -{ - my $FuncInfoId = $_[0]; - my $VarName; - return "" if(not $FuncDescr{$Version}{$FuncInfoId}{"ShortName"}); - if($FuncDescr{$Version}{$FuncInfoId}{"Class"}) - { - $VarName .= $TypeDescr{$Version}{getTypeDeclId($FuncDescr{$Version}{$FuncInfoId}{"Class"})}{$FuncDescr{$Version}{$FuncInfoId}{"Class"}}{"Name"}; - $VarName .= "::"; - } - $VarName .= $FuncDescr{$Version}{$FuncInfoId}{"ShortName"}; - return $VarName; -} - -sub mangleFuncName($) -{ - my $FuncId = $_[0]; -} - -sub getFuncType($) -{ - my $FuncInfo = $LibInfo{$Version}{$_[0]}{"info"}; - return "" if($FuncInfo !~ /type[ ]*:[ ]*@([0-9]+) /); - my $FuncTypeInfoId = $1; - my $FunctionType = $LibInfo{$Version}{$FuncTypeInfoId}{"info_type"}; - if($FunctionType eq "method_type") - { - return "Method"; - } - elsif($FunctionType eq "function_type") - { - return "Function"; - } - else - { - return $FunctionType; - } -} - -sub getFuncTypeId($) -{ - my $FuncInfo = $LibInfo{$Version}{$_[0]}{"info"}; - if($FuncInfo =~ /type[ ]*:[ ]*@([0-9]+)( |\Z)/) - { - return $1; - } - else - { - return 0; - } -} - -sub isNotAnon($) -{ - return (not isAnon($_[0])); -} - -sub isAnon($) -{ - return (($_[0] =~ m/\.\_[0-9]+/) or ($_[0] =~ m/anon-/)); -} - -sub unmangled_Compact($$) -#Removes all non-essential (for C++ language) whitespace from a string. If -#the whitespace is essential it will be replaced with exactly one ' ' -#character. Works correctly only for unmangled names. -#If level > 1 is supplied, can relax its intent to compact the string. -{ - my $result=$_[0]; - my $level = $_[1] || 1; - my $o1 = ($level>1)?' ':''; - #First, we reduce all spaces that we can - my $coms='[-()<>:*&~!|+=%@~"?.,/[^'."']"; - my $coms_nobr='[-()<:*&~!|+=%@~"?.,'."']"; - my $clos='[),;:\]]'; - $result=~s/^\s+//gm; - $result=~s/\s+$//gm; - $result=~s/((?!\n)\s)+/ /g; - $result=~s/(\w+)\s+($coms+)/$1$o1$2/gm; - #$result=~s/(\w)(\()/$1$o1$2/gm if $o1; - $result=~s/($coms+)\s+(\w+)/$1$o1$2/gm; - $result=~s/(\()\s+(\w)/$1$2/gm if $o1; - $result=~s/(\w)\s+($clos)/$1$2/gm; - $result=~s/($coms+)\s+($coms+)/$1 $2/gm; - $result=~s/($coms_nobr+)\s+($coms+)/$1$o1$2/gm; - $result=~s/($coms+)\s+($coms_nobr+)/$1$o1$2/gm; - #don't forget about >> and <:. In unmangled names global-scope modifier - #is not used, so <: will always be a digraph and requires no special treatment. - #We also try to remove other parts that are better to be removed here than in other places - #double-cv - $result=~s/\bconst\s+const\b/const/gm; - $result=~s/\bvolatile\s+volatile\b/volatile/gm; - $result=~s/\bconst\s+volatile\b\s+const\b/const volatile/gm; - $result=~s/\bvolatile\s+const\b\s+volatile\b/const volatile/gm; - #Place cv in proper order - $result=~s/\bvolatile\s+const\b/const volatile/gm; - return $result; -} - -sub unmangled_PostProcess($) -{ - my $result = $_[0]; - #s/\bunsigned int\b/unsigned/g; - $result =~ s/\bshort unsigned int\b/unsigned short/g; - $result =~ s/\bshort int\b/short/g; - $result =~ s/\blong long unsigned int\b/unsigned long long/g; - $result =~ s/\blong unsigned int\b/unsigned long/g; - $result =~ s/\blong long int\b/long long/g; - $result =~ s/\blong int\b/long/g; - $result =~ s/\)const\b/\) const/g; - $result =~ s/\blong long unsigned\b/unsigned long long/g; - $result =~ s/\blong unsigned\b/unsigned long/g; - return $result; -} - -# From libtodb2/libtodb.pm -# Trim string spaces. -sub trim($) -{ - my $string = shift; - $string =~ s/^\s+//; - $string =~ s/\s+$//; - return $string; -} - -sub correctName($) -{#type name correction - my $CorrectName = $_[0]; - $CorrectName = unmangled_Compact($CorrectName, 1); - $CorrectName = unmangled_PostProcess($CorrectName); - return $CorrectName; -} - -sub getDump_AllInOne() -{ - return if(not keys(%Headers)); - `mkdir -p temp && rm -f temp/*`; - my $Header_Depend = ""; - foreach my $Dep (sort {length($a) <=> length($b)} keys(%{$Header_Dependency{$Version}})) - { - $Header_Depend .= " -I".esc($Dep); - } - my $Lib_VersionName = esc($TargetLibraryName)."_v".$Version; - open(LIB_HEADER, ">temp/$TargetLibraryName"."_v$Version.h"); - foreach my $Preamble_Header (sort {int($Include_Preamble{$Version}{$a}{"Position"})<=>int($Include_Preamble{$Version}{$b}{"Position"})} keys(%{$Include_Preamble{$Version}})) - { - print LIB_HEADER "#include <$Preamble_Header>\n"; - } - foreach my $Destination (sort {int($Headers{$Version}{$a}{"Position"})<=>int($Headers{$Version}{$b}{"Position"})} keys(%{$Headers{$Version}})) - { - my $HName = get_FileName($Destination); - next if($Include_Preamble{$Version}{$Destination} or ($Include_Preamble{$Version}{$HName} and $HeaderName_Destinations{$Version}{$HName} and keys(%{$HeaderName_Destinations{$Version}{$HName}})==1)); - print LIB_HEADER "#include <$Destination>\n"; - } - close(LIB_HEADER); - system("g++ >".esc($ERR_PATH{$Version})." 2>&1 -fdump-translation-unit temp/$Lib_VersionName.h $CompilerOptions{$Version} $Header_Depend"); - if($?) - { - print "WARNING: some errors have occured while compiling header(s), fix it first!\nyou can see compilation errors in the file \'$ERR_PATH{$Version}\'\n"; - } - $ConstantsSrc{$Version} = cmd_preprocessor("temp/$Lib_VersionName.h", $CompilerOptions{$Version}." ".$Header_Depend, "define\\ \\|undef\\ \\|#[ ]\\+[0-9]\\+ \".*\""); - system("mkdir", "-p", "header_compile_errors/$TargetLibraryName/temp/"); - system("cp", "-f", "temp/$TargetLibraryName"."_v$Version.h", "header_compile_errors/$TargetLibraryName/temp/"); - return (split("\n", `find . -maxdepth 1 -name "$Lib_VersionName\.h*\.tu"`))[0]; -} - -sub getDump_Separately($) -{ - `mkdir -p temp`; - `rm -f temp/*`; - my $Destination = $_[0]; - my $Header_Depend = ""; - foreach my $Dep (sort {length($a) <=> length($b)} keys(%{$Header_Dependency{$Version}})) - { - $Header_Depend .= " -I".esc($Dep); - } - my $Lib_VersionName = esc($TargetLibraryName)."_v".$Version; - open(LIB_HEADER, ">temp/$TargetLibraryName"."_v$Version.h"); - foreach my $Preamble_Header (sort {int($Include_Preamble{$Version}{$a}{"Position"})<=>int($Include_Preamble{$Version}{$b}{"Position"})} keys(%{$Include_Preamble{$Version}})) - { - print LIB_HEADER "#include <$Preamble_Header>\n"; - } - my $Destination_HName = get_FileName($Destination); - if(not ( $Include_Preamble{$Version}{$Destination} or ($Include_Preamble{$Version}{$Destination_HName} and $HeaderName_Destinations{$Version}{$Destination_HName} and keys(%{$HeaderName_Destinations{$Version}{$Destination_HName}})==1) )) - { - print LIB_HEADER "#include <$Destination>\n"; - } - close(LIB_HEADER); - system("g++ >>".esc($ERR_PATH{$Version})." 2>&1 -fdump-translation-unit temp/$Lib_VersionName.h $CompilerOptions{$Version} $Header_Depend"); - if($?) - { - $HeaderCompileError{get_FileName($Destination)} = 1; - } - $ConstantsSrc{$Version} .= cmd_preprocessor("temp/$Lib_VersionName.h", $CompilerOptions{$Version}." ".$Header_Depend, "define\\ \\|undef\\ \\|#[ ]\\+[0-9]\\+ \".*\""); - return (split("\n", `find . -maxdepth 1 -name "$Lib_VersionName\.h*\.tu"`))[0]; -} - -sub cmd_file($) -{ - my $Path = $_[0]; - return "" if(not $Path or not -e $Path); - my $Cmd = "file ".esc($Path); - my $Cmd_Out = `$Cmd`; - return $Cmd_Out; -} - -sub cmd_preprocessor($$$) -{ - my ($Path, $AddOpt, $Grep) = @_; - return "" if(not $Path or not -f $Path); - my $Cmd = "g++ -dD -E -x c++-header ".esc($Path)." 2>/dev/null $AddOpt"; - if($Grep) - { - $Cmd .= " | grep \"$Grep\""; - } - my $Cmd_Out = `$Cmd`; - return $Cmd_Out; -} - -sub cmd_cat($$) -{ - my ($Path, $Grep) = @_; - return "" if(not $Path or not -e $Path); - my $Cmd = "cat ".esc($Path); - if($Grep) - { - $Cmd .= " | grep \"$Grep\""; - } - my $Cmd_Out = `$Cmd`; - return $Cmd_Out; -} - -sub cmd_find($$$) -{ - my ($Path, $Type, $Name) = @_; - return () if(not $Path or not -e $Path); - my $Cmd = "find ".esc($Path); - if($Type) - { - $Cmd .= " -type $Type"; - } - if($Name) - { - $Cmd .= " -name \"$Name\""; - } - return split("\n", `$Cmd`); -} - -sub cmd_tar($) -{ - my $Path = $_[0]; - return "" if(not $Path or not -e $Path); - my $Cmd = "tar -xvzf ".esc($Path); - my $Cmd_Out = `$Cmd`; - return $Cmd_Out; -} - -sub is_header($$) -{ - my ($Destination, $LibVersion) = @_; - return 0 if(-d $Destination); - return 1 if($Destination =~ /\.(h|hh|hhh|hpp|tcc)\Z/i); - return 0 if($Destination =~ /\.\w+\Z/i);#cpp|c|gch|tu|fs|pas - if($Destination =~ /\A\//) - { - return (cmd_file($Destination) =~ /:[ ]*ASCII C[\+]* program text/); - } - else - { - foreach my $Prefix (keys(%{$Header_Dependency{$LibVersion}})) - { - my $Path = $Prefix."/".$Destination; - if(-f $Path) - { - if(cmd_file($Path) =~ /:[ ]*ASCII C[\+]* program text/) - { - return 1; - } - } - } - return 0; - } -} - -sub parseHeaders_AllInOne($) -{ - $Version = $_[0]; - print "checking header(s) ".$Descriptor{$Version}{"Version"}." ...\n"; - system("mkdir", "-p", "header_compile_errors/".$TargetLibraryName); - system("rm", "-fr", $ERR_PATH{$Version}); - my $DumpPath = getDump_AllInOne(); - if(not $DumpPath) - { - print "\nERROR: can't create gcc syntax tree for header(s)\nyou can see compilation errors in the file '$ERR_PATH{$Version}'\n"; - exit(1); - } - getInfo($DumpPath); - parse_constants(); - system("rm", "-fr", "temp"); -} - -sub parseHeader($) -{ - my $Destination = $_[0]; - my $DumpPath = getDump_Separately($Destination); - if(not $DumpPath) - { - print "ERROR: can't create gcc syntax tree for header\nyou can see compilation errors in the file '$ERR_PATH{$Version}'\n"; - exit(1); - } - getInfo($DumpPath); - parse_constants(); - system("rm", "-fr", "temp"); -} - -sub is_in_library($$) -{ - my ($MnglName, $LibVersion) = @_; - return ($Interface_Library{$LibVersion}{$MnglName} or ($SymVer{$LibVersion}{$MnglName} and $Interface_Library{$LibVersion}{$SymVer{$LibVersion}{$MnglName}})); -} - -sub prepareInterfaces($) -{ - my $LibVersion = $_[0]; - my (@MnglNames, @UnMnglNames) = (); - if($CheckHeadersOnly) - { - foreach my $FuncInfoId (sort keys(%{$FuncDescr{$LibVersion}})) - { - if($FuncDescr{$LibVersion}{$FuncInfoId}{"MnglName"} =~ /\A_Z/) - { - push(@MnglNames, $FuncDescr{$LibVersion}{$FuncInfoId}{"MnglName"}); - } - } - if($#MnglNames > -1) - { - @UnMnglNames = reverse(unmangleArray(@MnglNames)); - foreach my $FuncInfoId (sort keys(%{$FuncDescr{$LibVersion}})) - { - if($FuncDescr{$LibVersion}{$FuncInfoId}{"MnglName"} =~ /\A_Z/) - { - my $UnmangledName = pop(@UnMnglNames); - $tr_name{$FuncDescr{$LibVersion}{$FuncInfoId}{"MnglName"}} = $UnmangledName; - } - } - } - } - my (%NotMangled_Int, %Mangled_Int) = (); - foreach my $FuncInfoId (keys(%{$FuncDescr{$LibVersion}})) - { - my $MnglName = $FuncDescr{$LibVersion}{$FuncInfoId}{"MnglName"}; - if($MnglName=~/\A_Z/) - { - $Mangled_Int{$FuncInfoId} = $MnglName; - } - else - { - $NotMangled_Int{$FuncInfoId} = $MnglName; - } - next if(not $MnglName or not is_in_library($MnglName, $LibVersion) and not $CheckHeadersOnly); - next if($MnglName =~ /\A_Z/ and $tr_name{$MnglName} =~ /\.\_[0-9]/); - next if(not $FuncDescr{$LibVersion}{$FuncInfoId}{"Header"}); - %{$CompleteSignature{$LibVersion}{$MnglName}} = %{$FuncDescr{$LibVersion}{$FuncInfoId}}; - #interface and its symlink have same signatures - if($SymVer{$LibVersion}{$MnglName}) - { - %{$CompleteSignature{$LibVersion}{$SymVer{$LibVersion}{$MnglName}}} = %{$FuncDescr{$LibVersion}{$FuncInfoId}}; - } - delete($FuncDescr{$LibVersion}{$FuncInfoId}); - } - if(keys(%Mangled_Int)) - { - foreach my $Interface_Id (keys(%NotMangled_Int)) - { - delete($CompleteSignature{$LibVersion}{$NotMangled_Int{$Interface_Id}}); - } - } -} - -my %UsedType; -sub cleanData($) -{ - my $LibVersion = $_[0]; - foreach my $FuncInfoId (keys(%{$FuncDescr{$LibVersion}})) - { - my $MnglName = $FuncDescr{$LibVersion}{$FuncInfoId}{"MnglName"}; - if(not $MnglName or not is_in_library($MnglName, $LibVersion) and not $CheckHeadersOnly) - { - delete($FuncDescr{$LibVersion}{$FuncInfoId}); - next; - } - if(defined $InterfacesListPath and not $InterfacesList{$MnglName}) - { - delete($FuncDescr{$LibVersion}{$FuncInfoId}); - next; - } - if(defined $AppPath and not $InterfacesList_App{$MnglName}) - { - delete($FuncDescr{$LibVersion}{$FuncInfoId}); - next; - } - my %FuncInfo = %{$FuncDescr{$LibVersion}{$FuncInfoId}}; - detect_TypeUsing($Tid_TDid{$LibVersion}{$FuncInfo{"Return"}}, $FuncInfo{"Return"}, $LibVersion); - detect_TypeUsing($Tid_TDid{$LibVersion}{$FuncInfo{"Class"}}, $FuncInfo{"Class"}, $LibVersion); - foreach my $Param_Pos (keys(%{$FuncInfo{"Param"}})) - { - my $Param_TypeId = $FuncInfo{"Param"}{$Param_Pos}{"type"}; - detect_TypeUsing($Tid_TDid{$LibVersion}{$Param_TypeId}, $Param_TypeId, $LibVersion); - } - } - foreach my $TDid (keys(%{$TypeDescr{$LibVersion}})) - { - foreach my $Tid (keys(%{$TypeDescr{$LibVersion}{$TDid}})) - { - if(not $UsedType{$LibVersion}{$TDid}{$Tid}) - { - delete($TypeDescr{$LibVersion}{$TDid}{$Tid}); - if(not keys(%{$TypeDescr{$LibVersion}{$TDid}})) - { - delete($TypeDescr{$LibVersion}{$TDid}); - } - delete($Tid_TDid{$LibVersion}{$Tid}) if($Tid_TDid{$LibVersion}{$Tid} eq $TDid); - } - } - } -} - -sub detect_TypeUsing($$$) -{ - my ($TypeDeclId, $TypeId, $LibVersion) = @_; - return if($UsedType{$LibVersion}{$TypeDeclId}{$TypeId}); - my %Type = get_Type($TypeDeclId, $TypeId, $LibVersion); - if($Type{"Type"} =~ /Struct|Union|Class|FuncPtr|Enum/) - { - $UsedType{$LibVersion}{$TypeDeclId}{$TypeId} = 1; - foreach my $Memb_Pos (keys(%{$Type{"Memb"}})) - { - my $Member_TypeId = $Type{"Memb"}{$Memb_Pos}{"type"}; - detect_TypeUsing($Tid_TDid{$LibVersion}{$Member_TypeId}, $Member_TypeId, $LibVersion); - } - if($Type{"Type"} eq "FuncPtr") - { - my $ReturnType = $Type{"Return"}; - detect_TypeUsing($Tid_TDid{$LibVersion}{$ReturnType}, $ReturnType, $LibVersion); - } - } - elsif($Type{"Type"} =~ /Const|Pointer|Ref|Volatile|Restrict|Array|/) - { - $UsedType{$LibVersion}{$TypeDeclId}{$TypeId} = 1; - detect_TypeUsing($Type{"BaseType"}{"TDid"}, $Type{"BaseType"}{"Tid"}, $LibVersion); - } - elsif($Type{"Type"} eq "Intrinsic") - { - $UsedType{$LibVersion}{$TypeDeclId}{$TypeId} = 1; - } - else - { - delete($TypeDescr{$LibVersion}{$TypeDeclId}{$TypeId}); - if(not keys(%{$TypeDescr{$LibVersion}{$TypeDeclId}})) - { - delete($TypeDescr{$LibVersion}{$TypeDeclId}); - } - delete($Tid_TDid{$LibVersion}{$TypeId}) if($Tid_TDid{$LibVersion}{$TypeId} eq $TypeDeclId); - } -} - -sub initializeClassVirtFunc($) -{ - my $LibVersion = $_[0]; - foreach my $Interface (keys(%{$CompleteSignature{$LibVersion}})) - { - if($CompleteSignature{$LibVersion}{$Interface}{"Virt"}) - { - my $ClassName = $TypeDescr{$LibVersion}{$Tid_TDid{$LibVersion}{$CompleteSignature{$LibVersion}{$Interface}{"Class"}}}{$CompleteSignature{$LibVersion}{$Interface}{"Class"}}{"Name"}; - $ClassVirtFunc{$LibVersion}{$ClassName}{$Interface} = 1; - $ClassIdVirtFunc{$LibVersion}{$CompleteSignature{$LibVersion}{$Interface}{"Class"}}{$Interface} = 1; - $ClassId{$LibVersion}{$ClassName} = $CompleteSignature{$LibVersion}{$Interface}{"Class"}; - } - } -} - -sub checkVirtFuncRedefinitions($) -{ - my $LibVersion = $_[0]; - foreach my $Class_Name (keys(%{$ClassVirtFunc{$LibVersion}})) - { - $CheckedTypes{$Class_Name} = 1; - foreach my $VirtFuncName (keys(%{$ClassVirtFunc{$LibVersion}{$Class_Name}})) - { - $CompleteSignature{$LibVersion}{$VirtFuncName}{"VirtualRedefine"} = find_virtual_method_in_base_classes($VirtFuncName, $ClassId{$LibVersion}{$Class_Name}, $LibVersion); - } - } -} - -sub setVirtFuncPositions($) -{ - my $LibVersion = $_[0]; - foreach my $Class_Name (keys(%{$ClassVirtFunc{$LibVersion}})) - { - $CheckedTypes{$Class_Name} = 1; - my $Position = 0; - foreach my $VirtFuncName (sort {int($CompleteSignature{$LibVersion}{$a}{"Line"}) <=> int($CompleteSignature{$LibVersion}{$b}{"Line"})} keys(%{$ClassVirtFunc{$LibVersion}{$Class_Name}})) - { - if($ClassVirtFunc{1}{$Class_Name}{$VirtFuncName} and $ClassVirtFunc{2}{$Class_Name}{$VirtFuncName} and not $CompleteSignature{1}{$VirtFuncName}{"VirtualRedefine"} and not $CompleteSignature{2}{$VirtFuncName}{"VirtualRedefine"}) - { - $CompleteSignature{$LibVersion}{$VirtFuncName}{"Position"} = $Position; - $Position += 1; - } - } - } -} - -sub check_VirtualTable($$) -{ - my ($TargetFunction, $LibVersion) = @_; - my $Class_Id = $CompleteSignature{$LibVersion}{$TargetFunction}{"Class"}; - my $Class_DId = $Tid_TDid{$LibVersion}{$Class_Id}; - my %Class_Type = get_Type($Class_DId, $Class_Id, $LibVersion); - $CheckedTypes{$Class_Type{"Name"}} = 1; - foreach my $VirtFuncName (keys(%{$ClassVirtFunc{2}{$Class_Type{"Name"}}})) - {#Added - if($ClassId{1}{$Class_Type{"Name"}} and not $ClassVirtFunc{1}{$Class_Type{"Name"}}{$VirtFuncName} and $AddedInt{$VirtFuncName}) - { - if($CompleteSignature{2}{$VirtFuncName}{"VirtualRedefine"}) - { - if($TargetFunction eq $VirtFuncName) - { - my $BaseClass_Id = $CompleteSignature{2}{$CompleteSignature{2}{$VirtFuncName}{"VirtualRedefine"}}{"Class"}; - my %BaseClass_Type = get_Type($Tid_TDid{2}{$BaseClass_Id}, $BaseClass_Id, 2); - my $BaseClass_Name = $BaseClass_Type{"Name"}; - %{$CompatProblems{$TargetFunction}{"Virtual_Function_Redefinition"}{$tr_name{$CompleteSignature{2}{$VirtFuncName}{"VirtualRedefine"}}}}=( - "Type_Name"=>$Class_Type{"Name"}, - "Type_Type"=>$Class_Type{"Type"}, - "Header"=>$CompleteSignature{2}{$TargetFunction}{"Header"}, - "Line"=>$CompleteSignature{2}{$TargetFunction}{"Line"}, - "Target"=>$tr_name{$CompleteSignature{2}{$VirtFuncName}{"VirtualRedefine"}}, - "Signature"=>$tr_name{$TargetFunction}, - "Old_Value"=>$tr_name{$CompleteSignature{2}{$VirtFuncName}{"VirtualRedefine"}}, - "New_Value"=>$tr_name{$TargetFunction}, - "Old_SoName"=>$Interface_Library{1}{$TargetFunction}, - "New_SoName"=>$Interface_Library{2}{$TargetFunction} ); - } - } - elsif($TargetFunction ne $VirtFuncName) - { - %{$CompatProblems{$TargetFunction}{"Added_Virtual_Function"}{$tr_name{$VirtFuncName}}}=( - "Type_Name"=>$Class_Type{"Name"}, - "Type_Type"=>$Class_Type{"Type"}, - "Header"=>$Class_Type{"Header"}, - "Line"=>$Class_Type{"Line"}, - "Target"=>$tr_name{$VirtFuncName}, - "Signature"=>$tr_name{$TargetFunction}, - "Old_SoName"=>$Interface_Library{1}{$TargetFunction}, - "New_SoName"=>$Interface_Library{2}{$TargetFunction} ); - } - } - } - foreach my $VirtFuncName (keys(%{$ClassVirtFunc{1}{$Class_Type{"Name"}}})) - {#Withdrawn - if($ClassId{2}{$Class_Type{"Name"}} and not $ClassVirtFunc{2}{$Class_Type{"Name"}}{$VirtFuncName} and $WithdrawnInt{$VirtFuncName}) - { - if($CompleteSignature{1}{$VirtFuncName}{"VirtualRedefine"}) - { - if($TargetFunction eq $VirtFuncName) - { - my $BaseClass_Id = $CompleteSignature{1}{$CompleteSignature{1}{$VirtFuncName}{"VirtualRedefine"}}{"Class"}; - my $BaseClass_Name = $TypeDescr{1}{$Tid_TDid{1}{$BaseClass_Id}}{$BaseClass_Id}{"Name"}; - %{$CompatProblems{$TargetFunction}{"Virtual_Function_Redefinition_B"}{$tr_name{$CompleteSignature{1}{$VirtFuncName}{"VirtualRedefine"}}}}=( - "Type_Name"=>$Class_Type{"Name"}, - "Type_Type"=>$Class_Type{"Type"}, - "Header"=>$CompleteSignature{2}{$TargetFunction}{"Header"}, - "Line"=>$CompleteSignature{2}{$TargetFunction}{"Line"}, - "Target"=>$tr_name{$CompleteSignature{1}{$VirtFuncName}{"VirtualRedefine"}}, - "Signature"=>$tr_name{$TargetFunction}, - "Old_Value"=>$tr_name{$TargetFunction}, - "New_Value"=>$tr_name{$CompleteSignature{1}{$VirtFuncName}{"VirtualRedefine"}}, - "Old_SoName"=>$Interface_Library{1}{$TargetFunction}, - "New_SoName"=>$Interface_Library{2}{$TargetFunction} ); - } - } - else - { - %{$CompatProblems{$TargetFunction}{"Withdrawn_Virtual_Function"}{$tr_name{$VirtFuncName}}}=( - "Type_Name"=>$Class_Type{"Name"}, - "Type_Type"=>$Class_Type{"Type"}, - "Header"=>$Class_Type{"Header"}, - "Line"=>$Class_Type{"Line"}, - "Target"=>$tr_name{$VirtFuncName}, - "Signature"=>$tr_name{$TargetFunction}, - "Old_SoName"=>$Interface_Library{1}{$TargetFunction}, - "New_SoName"=>$Interface_Library{2}{$TargetFunction} ); - } - } - } -} - -sub find_virtual_method_in_base_classes($$$) -{ - my ($VirtFuncName, $Checked_ClassId, $LibVersion) = @_; - foreach my $BaseClass_Id (keys(%{$TypeDescr{$LibVersion}{$Tid_TDid{$LibVersion}{$Checked_ClassId}}{$Checked_ClassId}{"BaseClass"}})) - { - my $VirtMethodInClass = find_virtual_method_in_class($VirtFuncName, $BaseClass_Id, $LibVersion); - if($VirtMethodInClass) - { - return $VirtMethodInClass; - } - my $VirtMethodInBaseClasses = find_virtual_method_in_base_classes($VirtFuncName, $BaseClass_Id, $LibVersion); - if($VirtMethodInBaseClasses) - { - return $VirtMethodInBaseClasses; - } - } - return ""; -} - -sub find_virtual_method_in_class($$$) -{ - my ($VirtFuncName, $Checked_ClassId, $LibVersion) = @_; - my $Suffix = getFuncSuffix($VirtFuncName, $LibVersion); - foreach my $Checked_VirtFuncName (keys(%{$ClassIdVirtFunc{$LibVersion}{$Checked_ClassId}})) - { - if($Suffix eq getFuncSuffix($Checked_VirtFuncName, $LibVersion) - and ((not $CompleteSignature{$LibVersion}{$VirtFuncName}{"Constructor"} and not $CompleteSignature{$LibVersion}{$VirtFuncName}{"Destructor"} and $CompleteSignature{$LibVersion}{$VirtFuncName}{"ShortName"} eq $CompleteSignature{$LibVersion}{$Checked_VirtFuncName}{"ShortName"}) or ($CompleteSignature{$LibVersion}{$VirtFuncName}{"Constructor"} or $CompleteSignature{$LibVersion}{$VirtFuncName}{"Destructor"}))) - { - return $Checked_VirtFuncName; - } - } - return ""; -} - -sub getFuncSuffix($$) -{ - my ($FuncName, $LibVersion) = @_; - my $ClassId = $CompleteSignature{$LibVersion}{$FuncName}{"Class"}; - my $ClassName = $TypeDescr{$LibVersion}{$Tid_TDid{$LibVersion}{$ClassId}}{$ClassId}{"Name"}; - my $ShortName = $CompleteSignature{$LibVersion}{$FuncName}{"ShortName"}; - my $Suffix = $tr_name{$FuncName}; - $Suffix =~ s/\A$ClassName\:\:[~]*$ShortName[ ]*//g; - return $Suffix; -} - -sub isRecurType($$$$) -{ - foreach (@RecurTypes) - { - if($_->{"Tid1"} eq $_[0] - and $_->{"TDid1"} eq $_[1] - and $_->{"Tid2"} eq $_[2] - and $_->{"TDid2"} eq $_[3]) - { - return 1; - } - } - return 0; -} - -sub find_MemberPair_Pos_byName($$) -{ - my ($Member_Name, $Pair_Type) = @_; - foreach my $MemberPair_Pos (sort keys(%{$Pair_Type->{"Memb"}})) - { - if($Pair_Type->{"Memb"}{$MemberPair_Pos}{"name"} eq $Member_Name) - { - return $MemberPair_Pos; - } - } - return "lost"; -} - -sub getBitfieldSum($$) -{ - my ($Member_Pos, $Pair_Type) = @_; - my $BitfieldSum = 0; - while($Member_Pos>-1) - { - return $BitfieldSum if(not $Pair_Type->{"Memb"}{$Member_Pos}{"bitfield"}); - $BitfieldSum += $Pair_Type->{"Memb"}{$Member_Pos}{"bitfield"}; - $Member_Pos -= 1; - } - return $BitfieldSum; -} - -sub find_MemberPair_Pos_byVal($$) -{ - my ($Member_Value, $Pair_Type) = @_; - foreach my $MemberPair_Pos (sort keys(%{$Pair_Type->{"Memb"}})) - { - if($Pair_Type->{"Memb"}{$MemberPair_Pos}{"value"} eq $Member_Value) - { - return $MemberPair_Pos; - } - } - return "lost"; -} - -my %Priority_Value=( -"High"=>3, -"Medium"=>2, -"Low"=>1 -); - -sub max_priority($$) -{ - my ($Priority1, $Priority2) = @_; - if(cmp_priority($Priority1, $Priority2)) - { - return $Priority1; - } - else - { - return $Priority2; - } -} - -sub cmp_priority($$) -{ - my ($Priority1, $Priority2) = @_; - return ($Priority_Value{$Priority1}>$Priority_Value{$Priority2}); -} - -sub set_Problems_Priority() -{ - foreach my $InterfaceName (sort keys(%CompatProblems)) - { - foreach my $Kind (sort keys(%{$CompatProblems{$InterfaceName}})) - { - foreach my $Location (sort keys(%{$CompatProblems{$InterfaceName}{$Kind}})) - { - my $IsInTypeInternals = $CompatProblems{$InterfaceName}{$Kind}{$Location}{"IsInTypeInternals"}; - my $InitialType_Type = $CompatProblems{$InterfaceName}{$Kind}{$Location}{"InitialType_Type"}; - if($Kind eq "Function_Become_Static") - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "High"; - } - elsif($Kind eq "Function_Become_NonStatic") - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "High"; - } - elsif($Kind eq "Parameter_Type_And_Size") - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "High"; - } - elsif($Kind eq "Parameter_Type") - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; - } - elsif($Kind eq "Withdrawn_Parameter") - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Medium"; - } - elsif($Kind eq "Added_Parameter") - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Medium"; - } - elsif($Kind eq "Parameter_BaseType_And_Size") - { - if($InitialType_Type eq "Pointer") - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; - } - else - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "High"; - } - } - elsif($Kind eq "Parameter_BaseType") - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; - } - elsif($Kind eq "Parameter_PointerLevel") - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "High"; - } - elsif($Kind eq "Return_Type_And_Size") - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Medium"; - } - elsif($Kind eq "Return_Type") - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; - } - elsif($Kind eq "Return_BaseType_And_Size") - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Medium"; - } - elsif($Kind eq "Return_BaseType") - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; - } - elsif($Kind eq "Return_PointerLevel") - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; - } - if($Kind eq "Added_Virtual_Function") - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "High"; - } - elsif($Kind eq "Withdrawn_Virtual_Function") - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "High"; - } - elsif($Kind eq "Virtual_Function_Position") - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "High"; - } - elsif($Kind eq "Virtual_Function_Redefinition") - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; - } - elsif($Kind eq "Virtual_Function_Redefinition_B") - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; - } - elsif($Kind eq "Size") - { - if(($InitialType_Type eq "Pointer") or ($InitialType_Type eq "Array")) - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; - } - else - { - if($IsInTypeInternals) - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Medium"; - } - else - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "High"; - } - } - } - elsif($Kind eq "BaseType") - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; - } - elsif($Kind eq "Added_Member_And_Size") - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; - } - elsif($Kind eq "Added_Middle_Member_And_Size") - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Medium"; - } - elsif($Kind eq "Withdrawn_Member_And_Size") - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Medium"; - } - elsif($Kind eq "Withdrawn_Member") - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; - } - elsif($Kind eq "Withdrawn_Middle_Member_And_Size") - { - if($IsInTypeInternals) - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Medium"; - } - else - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "High"; - } - } - elsif($Kind eq "Withdrawn_Middle_Member") - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Medium"; - } - elsif($Kind eq "Member_Rename") - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; - } - elsif($Kind eq "Enum_Member_Value") - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Medium"; - } - elsif($Kind eq "Enum_Member_Name") - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; - } - elsif($Kind eq "Member_Type_And_Size") - { - if(($InitialType_Type eq "Pointer") or ($InitialType_Type eq "Array")) - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; - } - else - { - if($IsInTypeInternals) - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; - } - else - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "High"; - } - } - } - elsif($Kind eq "Member_Type") - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; - } - elsif($Kind eq "Member_BaseType_And_Size") - { - if(($InitialType_Type eq "Pointer") or ($InitialType_Type eq "Array")) - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; - } - else - { - if($IsInTypeInternals) - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; - } - else - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "High"; - } - } - } - elsif($Kind eq "Member_BaseType") - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; - } - elsif($Kind eq "Member_PointerLevel") - { - if(($InitialType_Type eq "Pointer") or ($InitialType_Type eq "Array")) - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; - } - else - { - if($IsInTypeInternals) - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; - } - else - { - $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Medium"; - } - } - } - } - } - } -} - -sub pushType($$$$) -{ - my %TypeDescriptor=( - "Tid1" => $_[0], - "TDid1" => $_[1], - "Tid2" => $_[2], - "TDid2" => $_[3] ); - push(@RecurTypes, \%TypeDescriptor); -} - -sub mergeTypes($$$$) -{ - my ($Type1_Id, $Type1_DId, $Type2_Id, $Type2_DId) = @_; - my (%Sub_SubProblems, %SubProblems) = (); - if((not $Type1_Id and not $Type1_DId) or (not $Type2_Id and not $Type2_DId)) - {#Not Empty Inputs Only - return (); - } - if($Cache{"mergeTypes"}{$Type1_Id}{$Type1_DId}{$Type2_Id}{$Type2_DId}) - {#Already Merged - return %{$Cache{"mergeTypes"}{$Type1_Id}{$Type1_DId}{$Type2_Id}{$Type2_DId}}; - } - my %Type1 = get_Type($Type1_DId, $Type1_Id, 1); - my %Type2 = get_Type($Type2_DId, $Type2_Id, 2); - my %Type1_Pure = get_PureType($Type1_DId, $Type1_Id, 1); - my %Type2_Pure = get_PureType($Type2_DId, $Type2_Id, 2); - return () if(not $Type1_Pure{"Size"} or not $Type2_Pure{"Size"}); - if(isRecurType($Type1_Pure{"Tid"}, $Type1_Pure{"TDid"}, $Type2_Pure{"Tid"}, $Type2_Pure{"TDid"})) - {#Recursive Declarations - return (); - } - return if(not $Type1_Pure{"Name"} or not $Type2_Pure{"Name"}); - return if($OpaqueTypes{1}{$Type1_Pure{"Name"}} or $OpaqueTypes{2}{$Type1_Pure{"Name"}} or $OpaqueTypes{1}{$Type1{"Name"}} or $OpaqueTypes{2}{$Type1{"Name"}}); - - my %Typedef_1 = goToFirst($Type1{"TDid"}, $Type1{"Tid"}, 1, "Typedef"); - my %Typedef_2 = goToFirst($Type2{"TDid"}, $Type2{"Tid"}, 2, "Typedef"); - if($Typedef_1{"Type"} eq "Typedef" and $Typedef_2{"Type"} eq "Typedef" and $Typedef_1{"Name"} eq $Typedef_2{"Name"}) - { - my %Base_1 = get_OneStep_BaseType($Typedef_1{"TDid"}, $Typedef_1{"Tid"}, 1); - my %Base_2 = get_OneStep_BaseType($Typedef_2{"TDid"}, $Typedef_2{"Tid"}, 2); - if($Base_1{"Name"}!~/anon\-/ and $Base_2{"Name"}!~/anon\-/ - and ($Base_1{"Name"} ne $Base_2{"Name"})) - { - %{$SubProblems{"BaseType"}{$Typedef_1{"Name"}}}=( - "Type_Name"=>$Typedef_1{"Name"}, - "Type_Type"=>"Typedef", - "Header"=>$Typedef_2{"Header"}, - "Line"=>$Typedef_2{"Line"}, - "Old_Value"=>$Base_1{"Name"}, - "New_Value"=>$Base_2{"Name"} ); - } - } - - if(($Type1_Pure{"Name"} ne $Type2_Pure{"Name"}) and ($Type1_Pure{"Type"} ne "Pointer") and $Type1_Pure{"Name"}!~/anon\-/) - {#Different types - return (); - } - - pushType($Type1_Pure{"Tid"}, $Type1_Pure{"TDid"}, $Type2_Pure{"Tid"}, $Type2_Pure{"TDid"}); - if(($Type1_Pure{"Name"} eq $Type2_Pure{"Name"}) and ($Type1_Pure{"Type"} =~ /Struct|Class|Union/)) - {#Check Size - if($Type1_Pure{"Size"} ne $Type2_Pure{"Size"}) - { - %{$SubProblems{"Size"}{$Type1_Pure{"Name"}}}=( - "Type_Name"=>$Type1_Pure{"Name"}, - "Type_Type"=>$Type1_Pure{"Type"}, - "Header"=>$Type2_Pure{"Header"}, - "Line"=>$Type2_Pure{"Line"}, - "Old_Value"=>$Type1_Pure{"Size"}, - "New_Value"=>$Type2_Pure{"Size"} ); - } - } - if($Type1_Pure{"Name"} and $Type2_Pure{"Name"} and ($Type1_Pure{"Name"} ne $Type2_Pure{"Name"}) and ($Type1_Pure{"Name"} !~ /\Avoid[ ]*\*/) and ($Type2_Pure{"Name"} =~ /\Avoid[ ]*\*/)) - {#Check "void *" - pop(@RecurTypes); - return (); - } - if($Type1_Pure{"BaseType"}{"Tid"} and $Type2_Pure{"BaseType"}{"Tid"}) - {#Check Base Types - %Sub_SubProblems = &mergeTypes($Type1_Pure{"BaseType"}{"Tid"}, $Type1_Pure{"BaseType"}{"TDid"}, $Type2_Pure{"BaseType"}{"Tid"}, $Type2_Pure{"BaseType"}{"TDid"}); - foreach my $Sub_SubProblemType (keys(%Sub_SubProblems)) - { - foreach my $Sub_SubLocation (keys(%{$Sub_SubProblems{$Sub_SubProblemType}})) - { - %{$SubProblems{$Sub_SubProblemType}{$Sub_SubLocation}} = %{$Sub_SubProblems{$Sub_SubProblemType}{$Sub_SubLocation}}; - $SubProblems{$Sub_SubProblemType}{$Sub_SubLocation}{"InitialType_Type"} = $Type1_Pure{"Type"}; - } - } - } - foreach my $Member_Pos (sort keys(%{$Type1_Pure{"Memb"}})) - {#Check Members - next if($Type1_Pure{"Memb"}{$Member_Pos}{"access"} eq "private"); - my $Member_Name = $Type1_Pure{"Memb"}{$Member_Pos}{"name"}; - next if(not $Member_Name); - my $Member_Location = $Member_Name; - my $MemberPair_Pos = find_MemberPair_Pos_byName($Member_Name, \%Type2_Pure); - if(($MemberPair_Pos eq "lost") and (($Type2_Pure{"Type"} eq "Struct") or ($Type2_Pure{"Type"} eq "Class"))) - {#Withdrawn_Member - if($Member_Pos > keys(%{$Type2_Pure{"Memb"}}) - 1) - { - if($Type1_Pure{"Size"} ne $Type2_Pure{"Size"}) - { - %{$SubProblems{"Withdrawn_Member_And_Size"}{$Member_Name}}=( - "Target"=>$Member_Name, - "Type_Name"=>$Type1_Pure{"Name"}, - "Type_Type"=>$Type1_Pure{"Type"}, - "Header"=>$Type2_Pure{"Header"}, - "Line"=>$Type2_Pure{"Line"}, - "Old_Size"=>$Type1_Pure{"Size"}, - "New_Size"=>$Type2_Pure{"Size"} ); - } - else - { - %{$SubProblems{"Withdrawn_Member"}{$Member_Name}}=( - "Target"=>$Member_Name, - "Type_Name"=>$Type1_Pure{"Name"}, - "Type_Type"=>$Type1_Pure{"Type"}, - "Header"=>$Type2_Pure{"Header"}, - "Line"=>$Type2_Pure{"Line"} ); - } - next; - } - elsif($Member_Pos < keys(%{$Type1_Pure{"Memb"}}) - 1) - { - my $MemberType_Id = $Type1_Pure{"Memb"}{$Member_Pos}{"type"}; - my %MemberType_Pure = get_PureType($Tid_TDid{1}{$MemberType_Id}, $MemberType_Id, 1); - my $MemberStraightPairType_Id = $Type2_Pure{"Memb"}{$Member_Pos}{"type"}; - my %MemberStraightPairType_Pure = get_PureType($Tid_TDid{2}{$MemberStraightPairType_Id}, $MemberStraightPairType_Id, 2); - - if(($MemberType_Pure{"Size"} eq $MemberStraightPairType_Pure{"Size"}) and find_MemberPair_Pos_byName($Type2_Pure{"Memb"}{$Member_Pos}{"name"}, \%Type1_Pure) eq "lost") - { - %{$SubProblems{"Member_Rename"}{$Member_Name}}=( - "Target"=>$Member_Name, - "Type_Name"=>$Type1_Pure{"Name"}, - "Type_Type"=>$Type1_Pure{"Type"}, - "Header"=>$Type2_Pure{"Header"}, - "Line"=>$Type2_Pure{"Line"}, - "Old_Value"=>$Type1_Pure{"Memb"}{$Member_Pos}{"name"}, - "New_Value"=>$Type2_Pure{"Memb"}{$Member_Pos}{"name"} ); - $MemberPair_Pos = $Member_Pos; - } - else - { - if($Type1_Pure{"Memb"}{$Member_Pos}{"bitfield"}) - { - my $BitfieldSum = getBitfieldSum($Member_Pos-1, \%Type1_Pure)%($POINTER_SIZE*8); - if($BitfieldSum and $BitfieldSum-$Type2_Pure{"Memb"}{$Member_Pos}{"bitfield"}>=0) - { - %{$SubProblems{"Withdrawn_Middle_Member"}{$Member_Name}}=( - "Target"=>$Member_Name, - "Type_Name"=>$Type1_Pure{"Name"}, - "Type_Type"=>$Type1_Pure{"Type"}, - "Header"=>$Type2_Pure{"Header"}, - "Line"=>$Type2_Pure{"Line"} ); - next; - } - } - %{$SubProblems{"Withdrawn_Middle_Member_And_Size"}{$Member_Name}}=( - "Target"=>$Member_Name, - "Type_Name"=>$Type1_Pure{"Name"}, - "Type_Type"=>$Type1_Pure{"Type"}, - "Header"=>$Type2_Pure{"Header"}, - "Line"=>$Type2_Pure{"Line"} ); - next; - } - } - } - if($Type1_Pure{"Type"} eq "Enum") - { - my $Member_Value1 = $Type1_Pure{"Memb"}{$Member_Pos}{"value"}; - next if(not $Member_Value1); - my $Member_Value2 = $Type2_Pure{"Memb"}{$MemberPair_Pos}{"value"}; - if($MemberPair_Pos eq "lost") - { - $MemberPair_Pos = find_MemberPair_Pos_byVal($Member_Value1, \%Type2_Pure); - if($MemberPair_Pos ne "lost") - { - %{$SubProblems{"Enum_Member_Name"}{$Type1_Pure{"Memb"}{$Member_Pos}{"value"}}}=( - "Target"=>$Type1_Pure{"Memb"}{$Member_Pos}{"value"}, - "Type_Name"=>$Type1_Pure{"Name"}, - "Type_Type"=>"Enum", - "Header"=>$Type2_Pure{"Header"}, - "Line"=>$Type2_Pure{"Line"}, - "Old_Value"=>$Type1_Pure{"Memb"}{$Member_Pos}{"name"}, - "New_Value"=>$Type2_Pure{"Memb"}{$MemberPair_Pos}{"name"} ); - } - } - else - { - if($Member_Value1 ne "" and $Member_Value2 ne "") - { - if($Member_Value1 ne $Member_Value2) - { - %{$SubProblems{"Enum_Member_Value"}{$Member_Name}}=( - "Target"=>$Member_Name, - "Type_Name"=>$Type1_Pure{"Name"}, - "Type_Type"=>"Enum", - "Header"=>$Type2_Pure{"Header"}, - "Line"=>$Type2_Pure{"Line"}, - "Old_Value"=>$Type1_Pure{"Memb"}{$Member_Pos}{"value"}, - "New_Value"=>$Type2_Pure{"Memb"}{$MemberPair_Pos}{"value"} ); - } - } - } - next; - } - my $MemberType1_Id = $Type1_Pure{"Memb"}{$Member_Pos}{"type"}; - my $MemberType2_Id = $Type2_Pure{"Memb"}{$MemberPair_Pos}{"type"}; - %Sub_SubProblems = detectTypeChange($MemberType1_Id, $MemberType2_Id, "Member"); - foreach my $Sub_SubProblemType (keys(%Sub_SubProblems)) - { - %{$SubProblems{$Sub_SubProblemType}{$Member_Name}}=( - "Target"=>$Member_Name, - "Member_Position"=>$Member_Pos, - "Type_Name"=>$Type1_Pure{"Name"}, - "Type_Type"=>$Type1_Pure{"Type"}, - "Header"=>$Type2_Pure{"Header"}, - "Line"=>$Type2_Pure{"Line"}); - @{$SubProblems{$Sub_SubProblemType}{$Member_Name}}{keys(%{$Sub_SubProblems{$Sub_SubProblemType}})} = values %{$Sub_SubProblems{$Sub_SubProblemType}}; - } - if($MemberType1_Id and $MemberType2_Id) - {#checking member type change (replace) - %Sub_SubProblems = &mergeTypes($MemberType1_Id, $Tid_TDid{1}{$MemberType1_Id}, $MemberType2_Id, $Tid_TDid{2}{$MemberType2_Id}); - foreach my $Sub_SubProblemType (keys(%Sub_SubProblems)) - { - foreach my $Sub_SubLocation (keys(%{$Sub_SubProblems{$Sub_SubProblemType}})) - { - my $NewLocation = ($Sub_SubLocation)?$Member_Location."->".$Sub_SubLocation:$Member_Location; - %{$SubProblems{$Sub_SubProblemType}{$NewLocation}}=( - "IsInTypeInternals"=>"Yes"); - @{$SubProblems{$Sub_SubProblemType}{$NewLocation}}{keys(%{$Sub_SubProblems{$Sub_SubProblemType}{$Sub_SubLocation}})} = values %{$Sub_SubProblems{$Sub_SubProblemType}{$Sub_SubLocation}}; - if($Sub_SubLocation !~ /\-\>/) - { - $SubProblems{$Sub_SubProblemType}{$NewLocation}{"Member_Type_Name"} = get_TypeName($MemberType1_Id, 1); - $SubProblems{$Sub_SubProblemType}{$NewLocation}{"Start_Type_Name"} = get_TypeName($MemberType1_Id, 1); - } - } - } - } - } - if(($Type2_Pure{"Type"} eq "Struct") or ($Type2_Pure{"Type"} eq "Class")) - { - foreach my $Member_Pos (sort keys(%{$Type2_Pure{"Memb"}})) - {#checking added members - next if(not $Type2_Pure{"Memb"}{$Member_Pos}{"name"}); - my $MemberPair_Pos = find_MemberPair_Pos_byName($Type2_Pure{"Memb"}{$Member_Pos}{"name"}, \%Type1_Pure); - if($MemberPair_Pos eq "lost") - {#Added_Member - if($Member_Pos > keys(%{$Type1_Pure{"Memb"}}) - 1) - { - if($Type1_Pure{"Size"} ne $Type2_Pure{"Size"}) - { - if($Type2_Pure{"Memb"}{$Member_Pos}{"bitfield"}) - { - my $BitfieldSum = getBitfieldSum($Member_Pos-1, \%Type2_Pure)%($POINTER_SIZE*8); - next if($BitfieldSum and $BitfieldSum<=$POINTER_SIZE*8-$Type2_Pure{"Memb"}{$Member_Pos}{"bitfield"}); - } - %{$SubProblems{"Added_Member_And_Size"}{$Type2_Pure{"Memb"}{$Member_Pos}{"name"}}}=( - "Target"=>$Type2_Pure{"Memb"}{$Member_Pos}{"name"}, - "Type_Name"=>$Type1_Pure{"Name"}, - "Type_Type"=>$Type1_Pure{"Type"}, - "Header"=>$Type2_Pure{"Header"}, - "Line"=>$Type2_Pure{"Line"} ); - } - } - else - { - my $MemberType_Id = $Type2_Pure{"Memb"}{$Member_Pos}{"type"}; - my $MemberType_DId = $Tid_TDid{2}{$MemberType_Id}; - my %MemberType_Pure = get_PureType($MemberType_DId, $MemberType_Id, 2); - - my $MemberStraightPairType_Id = $Type1_Pure{"Memb"}{$Member_Pos}{"type"}; - my %MemberStraightPairType_Pure = get_PureType($Tid_TDid{1}{$MemberStraightPairType_Id}, $MemberStraightPairType_Id, 1); - - if(($MemberType_Pure{"Size"} eq $MemberStraightPairType_Pure{"Size"}) and find_MemberPair_Pos_byName($Type1_Pure{"Memb"}{$Member_Pos}{"name"}, \%Type2_Pure) eq "lost") - { - next if($Type1_Pure{"Memb"}{$Member_Pos}{"access"} eq "private"); - %{$SubProblems{"Member_Rename"}{$Type2_Pure{"Memb"}{$Member_Pos}{"name"}}}=( - "Target"=>$Type1_Pure{"Memb"}{$Member_Pos}{"name"}, - "Type_Name"=>$Type1_Pure{"Name"}, - "Type_Type"=>$Type1_Pure{"Type"}, - "Header"=>$Type2_Pure{"Header"}, - "Line"=>$Type2_Pure{"Line"}, - "Old_Value"=>$Type1_Pure{"Memb"}{$Member_Pos}{"name"}, - "New_Value"=>$Type2_Pure{"Memb"}{$Member_Pos}{"name"} ); - } - else - { - if($Type1_Pure{"Size"} ne $Type2_Pure{"Size"}) - { - if($Type2_Pure{"Memb"}{$Member_Pos}{"bitfield"}) - { - my $BitfieldSum = getBitfieldSum($Member_Pos-1, \%Type2_Pure)%($POINTER_SIZE*8); - next if($BitfieldSum and $BitfieldSum<=$POINTER_SIZE*8-$Type2_Pure{"Memb"}{$Member_Pos}{"bitfield"}); - } - %{$SubProblems{"Added_Middle_Member_And_Size"}{$Type2_Pure{"Memb"}{$Member_Pos}{"name"}}}=( - "Target"=>$Type2_Pure{"Memb"}{$Member_Pos}{"name"}, - "Type_Name"=>$Type1_Pure{"Name"}, - "Type_Type"=>$Type1_Pure{"Type"}, - "Header"=>$Type2_Pure{"Header"}, - "Line"=>$Type2_Pure{"Line"} ); - } - } - } - } - } - } - %{$Cache{"mergeTypes"}{$Type1_Id}{$Type1_DId}{$Type2_Id}{$Type2_DId}} = %SubProblems; - pop(@RecurTypes); - return %SubProblems; -} - -sub get_TypeName($$) -{ - my ($TypeId, $LibVersion) = @_; - return $TypeDescr{$LibVersion}{$Tid_TDid{$LibVersion}{$TypeId}}{$TypeId}{"Name"}; -} - -sub goToFirst($$$$) -{ - my ($TypeDId, $TypeId, $LibVersion, $Type_Type) = @_; - if(defined $Cache{"goToFirst"}{$TypeDId}{$TypeId}{$LibVersion}{$Type_Type}) - { - return %{$Cache{"goToFirst"}{$TypeDId}{$TypeId}{$LibVersion}{$Type_Type}}; - } - return () if(not $TypeDescr{$LibVersion}{$TypeDId}{$TypeId}); - my %Type = %{$TypeDescr{$LibVersion}{$TypeDId}{$TypeId}}; - return () if(not $Type{"Type"}); - if($Type{"Type"} ne $Type_Type) - { - return () if(not $Type{"BaseType"}{"TDid"} and not $Type{"BaseType"}{"Tid"}); - %Type = goToFirst($Type{"BaseType"}{"TDid"}, $Type{"BaseType"}{"Tid"}, $LibVersion, $Type_Type); - } - $Cache{"goToFirst"}{$TypeDId}{$TypeId}{$LibVersion}{$Type_Type} = \%Type; - return %Type; -} - -my %TypeSpecAttributes = ( - "Ref" => 1, - "Const" => 1, - "Volatile" => 1, - "Restrict" => 1, - "Typedef" => 1 -); - -sub get_PureType($$$) -{ - my ($TypeDId, $TypeId, $LibVersion) = @_; - return "" if(not $TypeId); - if(defined $Cache{"get_PureType"}{$TypeDId}{$TypeId}{$LibVersion}) - { - return %{$Cache{"get_PureType"}{$TypeDId}{$TypeId}{$LibVersion}}; - } - return "" if(not $TypeDescr{$LibVersion}{$TypeDId}{$TypeId}); - my %Type = %{$TypeDescr{$LibVersion}{$TypeDId}{$TypeId}}; - if($Type{"Type"} =~ /Struct|Union|Typedef|Class|Enum/) - { - $CheckedTypes{$Type{"Name"}} = 1; - } - return %Type if(not $Type{"BaseType"}{"TDid"} and not $Type{"BaseType"}{"Tid"}); - if($TypeSpecAttributes{$Type{"Type"}}) - { - %Type = get_PureType($Type{"BaseType"}{"TDid"}, $Type{"BaseType"}{"Tid"}, $LibVersion); - } - $Cache{"get_PureType"}{$TypeDId}{$TypeId}{$LibVersion} = \%Type; - return %Type; -} - -sub get_PointerLevel($$$) -{ - my ($TypeDId, $TypeId, $LibVersion) = @_; - return "" if(not $TypeId); - if(defined $Cache{"get_PointerLevel"}{$TypeDId}{$TypeId}{$LibVersion}) - { - return $Cache{"get_PointerLevel"}{$TypeDId}{$TypeId}{$LibVersion}; - } - return "" if(not $TypeDescr{$LibVersion}{$TypeDId}{$TypeId}); - my %Type = %{$TypeDescr{$LibVersion}{$TypeDId}{$TypeId}}; - return 0 if(not $Type{"BaseType"}{"TDid"} and not $Type{"BaseType"}{"Tid"}); - my $PointerLevel = 0; - if($Type{"Type"} eq "Pointer") - { - $PointerLevel += 1; - } - $PointerLevel += get_PointerLevel($Type{"BaseType"}{"TDid"}, $Type{"BaseType"}{"Tid"}, $LibVersion); - $Cache{"get_PointerLevel"}{$TypeDId}{$TypeId}{$LibVersion} = $PointerLevel; - return $PointerLevel; -} - -sub get_BaseType($$$) -{ - my ($TypeDId, $TypeId, $LibVersion) = @_; - return "" if(not $TypeId); - if(defined $Cache{"get_BaseType"}{$TypeDId}{$TypeId}{$LibVersion}) - { - return %{$Cache{"get_BaseType"}{$TypeDId}{$TypeId}{$LibVersion}}; - } - return "" if(not $TypeDescr{$LibVersion}{$TypeDId}{$TypeId}); - my %Type = %{$TypeDescr{$LibVersion}{$TypeDId}{$TypeId}}; - if($Type{"Type"} =~ /Struct|Union|Typedef|Class|Enum/) - { - $CheckedTypes{$Type{"Name"}} = 1; - } - return %Type if(not $Type{"BaseType"}{"TDid"} and not $Type{"BaseType"}{"Tid"}); - %Type = get_BaseType($Type{"BaseType"}{"TDid"}, $Type{"BaseType"}{"Tid"}, $LibVersion); - $Cache{"get_BaseType"}{$TypeDId}{$TypeId}{$LibVersion} = \%Type; - return %Type; -} - -sub get_OneStep_BaseType($$$) -{ - my ($TypeDId, $TypeId, $LibVersion) = @_; - return "" if(not $TypeId); - return "" if(not $TypeDescr{$LibVersion}{$TypeDId}{$TypeId}); - my %Type = %{$TypeDescr{$LibVersion}{$TypeDId}{$TypeId}}; - return %Type if(not $Type{"BaseType"}{"TDid"} and not $Type{"BaseType"}{"Tid"}); - return get_Type($Type{"BaseType"}{"TDid"}, $Type{"BaseType"}{"Tid"}, $LibVersion); -} - -sub get_Type($$$) -{ - my ($TypeDId, $TypeId, $LibVersion) = @_; - return "" if(not $TypeId); - return "" if(not $TypeDescr{$LibVersion}{$TypeDId}{$TypeId}); - return %{$TypeDescr{$LibVersion}{$TypeDId}{$TypeId}}; -} - -sub mergeLibs() -{ - foreach my $Interface (sort keys(%AddedInt)) - {#checking added interfaces - next if($InternalInterfaces{1}{$Interface} or $InternalInterfaces{2}{$Interface}); - next if(defined $InterfacesListPath and not $InterfacesList{$Interface}); - next if(defined $AppPath and not $InterfacesList_App{$Interface}); - next if($FuncAttr{2}{$Interface}{"Private"}); - next if(not $FuncAttr{2}{$Interface}{"Header"}); - %{$CompatProblems{$Interface}{"Added_Interface"}{"SharedLibrary"}}=( - "Header"=>$FuncAttr{2}{$Interface}{"Header"}, - "Line"=>$FuncAttr{2}{$Interface}{"Line"}, - "Signature"=>$FuncAttr{2}{$Interface}{"Signature"}, - "New_SoName"=>$Interface_Library{2}{$Interface} ); - } - foreach my $Interface (sort keys(%WithdrawnInt)) - {#checking withdrawn interfaces - next if($InternalInterfaces{1}{$Interface} or $InternalInterfaces{2}{$Interface}); - next if(defined $InterfacesListPath and not $InterfacesList{$Interface}); - next if(defined $AppPath and not $InterfacesList_App{$Interface}); - next if($FuncAttr{1}{$Interface}{"Private"}); - next if(not $FuncAttr{1}{$Interface}{"Header"}); - %{$CompatProblems{$Interface}{"Withdrawn_Interface"}{"SharedLibrary"}}=( - "Header"=>$FuncAttr{1}{$Interface}{"Header"}, - "Line"=>$FuncAttr{1}{$Interface}{"Line"}, - "Signature"=>$FuncAttr{1}{$Interface}{"Signature"}, - "Old_SoName"=>$Interface_Library{1}{$Interface} ); - } -} - -sub mergeSignatures() -{ - my %SubProblems = (); - - prepareInterfaces(1); - prepareInterfaces(2); - %FuncDescr=(); - - initializeClassVirtFunc(1); - initializeClassVirtFunc(2); - - checkVirtFuncRedefinitions(1); - checkVirtFuncRedefinitions(2); - - setVirtFuncPositions(1); - setVirtFuncPositions(2); - - foreach my $Interface (sort keys(%AddedInt)) - {#collecting the attributes of added interfaces - next if($CheckedInterfaces{$Interface}); - if($CompleteSignature{2}{$Interface}) - { - if($CompleteSignature{2}{$Interface}{"Private"}) - { - $FuncAttr{2}{$Interface}{"Private"} = 1; - } - if($CompleteSignature{2}{$Interface}{"Protected"}) - { - $FuncAttr{2}{$Interface}{"Protected"} = 1; - } - if($CompleteSignature{2}{$Interface}{"Header"}) - { - $FuncAttr{2}{$Interface}{"Header"} = $CompleteSignature{2}{$Interface}{"Header"}; - } - if($CompleteSignature{2}{$Interface}{"Line"}) - { - $FuncAttr{2}{$Interface}{"Line"} = $CompleteSignature{2}{$Interface}{"Line"}; - } - $FuncAttr{2}{$Interface}{"Signature"} = get_Signature($Interface, 2); - foreach my $ParamPos (keys(%{$CompleteSignature{2}{$Interface}{"Param"}})) - { - my $ParamType_Id = $CompleteSignature{2}{$Interface}{"Param"}{$ParamPos}{"type"}; - my $ParamType_DId = $Tid_TDid{2}{$ParamType_Id}; - my %ParamType = get_Type($ParamType_DId, $ParamType_Id, 2); - } - #checking virtual table - check_VirtualTable($Interface, 2); - $CheckedInterfaces{$Interface} = 1; - } - } - foreach my $Interface (sort keys(%WithdrawnInt)) - {#collecting the attributes of withdrawn interfaces - next if($CheckedInterfaces{$Interface}); - if($CompleteSignature{1}{$Interface}) - { - if($CompleteSignature{1}{$Interface}{"Private"}) - { - $FuncAttr{1}{$Interface}{"Private"} = 1; - } - if($CompleteSignature{1}{$Interface}{"Protected"}) - { - $FuncAttr{1}{$Interface}{"Protected"} = 1; - } - if($CompleteSignature{1}{$Interface}{"Header"}) - { - $FuncAttr{1}{$Interface}{"Header"} = $CompleteSignature{1}{$Interface}{"Header"}; - } - if($CompleteSignature{1}{$Interface}{"Line"}) - { - $FuncAttr{1}{$Interface}{"Line"} = $CompleteSignature{1}{$Interface}{"Line"}; - } - $FuncAttr{1}{$Interface}{"Signature"} = get_Signature($Interface, 1); - foreach my $ParamPos (keys(%{$CompleteSignature{1}{$Interface}{"Param"}})) - { - my $ParamType_Id = $CompleteSignature{1}{$Interface}{"Param"}{$ParamPos}{"type"}; - my $ParamType_DId = $Tid_TDid{1}{$ParamType_Id}; - my %ParamType = get_Type($ParamType_DId, $ParamType_Id, 1); - } - #checking virtual table - check_VirtualTable($Interface, 1); - $CheckedInterfaces{$Interface} = 1; - } - } - - foreach my $Interface (sort keys(%{$CompleteSignature{1}})) - {#checking interfaces - if(($Interface !~ /\@/) and ($SymVer{1}{$Interface} =~ /\A(.*)[\@]+/)) - { - next if($1 eq $Interface); - } - my ($MnglName, $SymbolVersion) = ($Interface, ""); - if($Interface =~ /\A([^@]+)[\@]+([^@]+)\Z/) - { - ($MnglName, $SymbolVersion) = ($1, $2); - } - next if($InternalInterfaces{1}{$Interface} or $InternalInterfaces{2}{$Interface}); - next if(defined $InterfacesListPath and not $InterfacesList{$Interface}); - next if(defined $AppPath and not $InterfacesList_App{$Interface}); - next if($CheckedInterfaces{$Interface}); - next if($CompleteSignature{1}{$Interface}{"Private"}); - next if(not $CompleteSignature{1}{$Interface}{"Header"} or not $CompleteSignature{2}{$Interface}{"Header"}); - next if(not $CompleteSignature{1}{$Interface}{"MnglName"} or not $CompleteSignature{2}{$Interface}{"MnglName"}); - next if((not $CompleteSignature{1}{$Interface}{"PureVirt"} and $CompleteSignature{2}{$Interface}{"PureVirt"}) or ($CompleteSignature{1}{$Interface}{"PureVirt"} and not $CompleteSignature{2}{$Interface}{"PureVirt"})); - $CheckedInterfaces{$Interface} = 1; - #checking virtual table - check_VirtualTable($Interface, 1); - #checking attributes - if($CompleteSignature{2}{$Interface}{"Static"} and not $CompleteSignature{1}{$Interface}{"Static"}) - { - %{$CompatProblems{$Interface}{"Function_Become_Static"}{"Attributes"}}=( - "Header"=>$CompleteSignature{1}{$Interface}{"Header"}, - "Line"=>$CompleteSignature{1}{$Interface}{"Line"}, - "Signature"=>get_Signature($Interface, 1), - "Old_SoName"=>$Interface_Library{1}{$Interface}, - "New_SoName"=>$Interface_Library{2}{$Interface} ); - } - elsif(not $CompleteSignature{2}{$Interface}{"Static"} and $CompleteSignature{1}{$Interface}{"Static"}) - { - %{$CompatProblems{$Interface}{"Function_Become_NonStatic"}{"Attributes"}}=( - "Header"=>$CompleteSignature{1}{$Interface}{"Header"}, - "Line"=>$CompleteSignature{1}{$Interface}{"Line"}, - "Signature"=>get_Signature($Interface, 1), - "Old_SoName"=>$Interface_Library{1}{$Interface}, - "New_SoName"=>$Interface_Library{2}{$Interface} ); - } - if($CompleteSignature{1}{$Interface}{"Virt"} and $CompleteSignature{2}{$Interface}{"Virt"}) - { - if($CompleteSignature{1}{$Interface}{"Position"}!=$CompleteSignature{2}{$Interface}{"Position"}) - { - my $Class_Id = $CompleteSignature{1}{$Interface}{"Class"}; - my $Class_DId = $Tid_TDid{1}{$Class_Id}; - my %Class_Type = get_Type($Class_DId, $Class_Id, 1); - %{$CompatProblems{$Interface}{"Virtual_Function_Position"}{$tr_name{$MnglName}}}=( - "Type_Name"=>$Class_Type{"Name"}, - "Type_Type"=>$Class_Type{"Type"}, - "Header"=>$Class_Type{"Header"}, - "Line"=>$Class_Type{"Line"}, - "Old_Value"=>$CompleteSignature{1}{$Interface}{"Position"}, - "New_Value"=>$CompleteSignature{2}{$Interface}{"Position"}, - "Signature"=>get_Signature($Interface, 1), - "Target"=>$tr_name{$MnglName}, - "Old_SoName"=>$Interface_Library{1}{$Interface}, - "New_SoName"=>$Interface_Library{2}{$Interface} ); - } - } - foreach my $ParamPos (sort {int($a) <=> int($b)} keys(%{$CompleteSignature{2}{$Interface}{"Param"}})) - {#checking added parameters - last if($Interface=~/\A_Z/); - if(not defined $CompleteSignature{1}{$Interface}{"Param"}{$ParamPos}) - {#checking withdrawn parameters - my $ParamType2_Id = $CompleteSignature{2}{$Interface}{"Param"}{$ParamPos}{"type"}; - my $Parameter_Name = $CompleteSignature{2}{$Interface}{"Param"}{$ParamPos}{"name"}; - last if(get_TypeName($ParamType2_Id, 2) eq "..."); - %{$CompatProblems{$Interface}{"Added_Parameter"}{num_to_str($ParamPos+1)." Parameter"}}=( - "Target"=>$Parameter_Name, - "Parameter_Position"=>$ParamPos, - "Signature"=>get_Signature($Interface, 1), - "Header"=>$CompleteSignature{1}{$Interface}{"Header"}, - "Line"=>$CompleteSignature{1}{$Interface}{"Line"}, - "Old_SoName"=>$Interface_Library{1}{$Interface}, - "New_SoName"=>$Interface_Library{2}{$Interface}); - } - } - foreach my $ParamPos (sort {int($a) <=> int($b)} keys(%{$CompleteSignature{1}{$Interface}{"Param"}})) - {#checking parameters - my $ParamType1_Id = $CompleteSignature{1}{$Interface}{"Param"}{$ParamPos}{"type"}; - my $Parameter_Name = $CompleteSignature{1}{$Interface}{"Param"}{$ParamPos}{"name"}; - if(not defined $CompleteSignature{2}{$Interface}{"Param"}{$ParamPos} and get_TypeName($ParamType1_Id, 1) ne "..." and $Interface!~/\A_Z/) - {#checking withdrawn parameters - %{$CompatProblems{$Interface}{"Withdrawn_Parameter"}{num_to_str($ParamPos+1)." Parameter"}}=( - "Target"=>$Parameter_Name, - "Parameter_Position"=>$ParamPos, - "Signature"=>get_Signature($Interface, 1), - "Header"=>$CompleteSignature{1}{$Interface}{"Header"}, - "Line"=>$CompleteSignature{1}{$Interface}{"Line"}, - "Old_SoName"=>$Interface_Library{1}{$Interface}, - "New_SoName"=>$Interface_Library{2}{$Interface}); - next; - } - my $ParamType2_Id = $CompleteSignature{2}{$Interface}{"Param"}{$ParamPos}{"type"}; - next if(not $ParamType1_Id or not $ParamType2_Id); - my $Parameter_Location = ($Parameter_Name)?$Parameter_Name:num_to_str($ParamPos+1)." Parameter"; - - #checking type change(replace) - %SubProblems = detectTypeChange($ParamType1_Id, $ParamType2_Id, "Parameter"); - foreach my $SubProblemType (keys(%SubProblems)) - { - %{$CompatProblems{$Interface}{$SubProblemType}{$Parameter_Location}}=( - "Target"=>$Parameter_Name, - "Parameter_Position"=>$ParamPos, - "Signature"=>get_Signature($Interface, 1), - "Header"=>$CompleteSignature{1}{$Interface}{"Header"}, - "Line"=>$CompleteSignature{1}{$Interface}{"Line"}, - "Old_SoName"=>$Interface_Library{1}{$Interface}, - "New_SoName"=>$Interface_Library{2}{$Interface}); - @{$CompatProblems{$Interface}{$SubProblemType}{$Parameter_Location}}{keys(%{$SubProblems{$SubProblemType}})} = values %{$SubProblems{$SubProblemType}}; - } - @RecurTypes = (); - #checking type definition changes - %SubProblems = mergeTypes($ParamType1_Id, $Tid_TDid{1}{$ParamType1_Id}, $ParamType2_Id, $Tid_TDid{2}{$ParamType2_Id}); - foreach my $SubProblemType (keys(%SubProblems)) - { - foreach my $SubLocation (keys(%{$SubProblems{$SubProblemType}})) - { - my $NewLocation = ($SubLocation)?$Parameter_Location."->".$SubLocation:$Parameter_Location; - %{$CompatProblems{$Interface}{$SubProblemType}{$NewLocation}}=( - "Signature"=>get_Signature($Interface, 1), - "Header"=>$CompleteSignature{1}{$Interface}{"Header"}, - "Line"=>$CompleteSignature{1}{$Interface}{"Line"}, - "Old_SoName"=>$Interface_Library{1}{$Interface}, - "New_SoName"=>$Interface_Library{2}{$Interface}, - "Parameter_Type_Name"=>get_TypeName($ParamType1_Id, 1), - "Parameter_Position"=>$ParamPos, - "Parameter_Name"=>$Parameter_Name); - @{$CompatProblems{$Interface}{$SubProblemType}{$NewLocation}}{keys(%{$SubProblems{$SubProblemType}{$SubLocation}})} = values %{$SubProblems{$SubProblemType}{$SubLocation}}; - if($SubLocation !~ /\-\>/) - { - $CompatProblems{$Interface}{$SubProblemType}{$NewLocation}{"Start_Type_Name"} = get_TypeName($ParamType1_Id, 1); - } - } - } - } - #checking return type - my $ReturnType1_Id = $CompleteSignature{1}{$Interface}{"Return"}; - my $ReturnType2_Id = $CompleteSignature{2}{$Interface}{"Return"}; - %SubProblems = detectTypeChange($ReturnType1_Id, $ReturnType2_Id, "Return"); - foreach my $SubProblemType (keys(%SubProblems)) - { - %{$CompatProblems{$Interface}{$SubProblemType}{"RetVal"}}=( - "Signature"=>get_Signature($Interface, 1), - "Header"=>$CompleteSignature{1}{$Interface}{"Header"}, - "Line"=>$CompleteSignature{1}{$Interface}{"Line"}, - "Old_SoName"=>$Interface_Library{1}{$Interface}, - "New_SoName"=>$Interface_Library{2}{$Interface}); - @{$CompatProblems{$Interface}{$SubProblemType}{"RetVal"}}{keys(%{$SubProblems{$SubProblemType}})} = values %{$SubProblems{$SubProblemType}}; - } - if($ReturnType1_Id and $ReturnType2_Id) - { - @RecurTypes = (); - %SubProblems = mergeTypes($ReturnType1_Id, $Tid_TDid{1}{$ReturnType1_Id}, $ReturnType2_Id, $Tid_TDid{2}{$ReturnType2_Id}); - foreach my $SubProblemType (keys(%SubProblems)) - { - foreach my $SubLocation (keys(%{$SubProblems{$SubProblemType}})) - { - my $NewLocation = ($SubLocation)?"RetVal->".$SubLocation:"RetVal"; - %{$CompatProblems{$Interface}{$SubProblemType}{$NewLocation}}=( - "Signature"=>get_Signature($Interface, 1), - "Header"=>$CompleteSignature{1}{$Interface}{"Header"}, - "Line"=>$CompleteSignature{1}{$Interface}{"Line"}, - "Old_SoName"=>$Interface_Library{1}{$Interface}, - "New_SoName"=>$Interface_Library{2}{$Interface}, - "Return_Type_Name"=>get_TypeName($ReturnType1_Id, 1) ); - @{$CompatProblems{$Interface}{$SubProblemType}{$NewLocation}}{keys(%{$SubProblems{$SubProblemType}{$SubLocation}})} = values %{$SubProblems{$SubProblemType}{$SubLocation}}; - if($SubLocation !~ /\-\>/) - { - $CompatProblems{$Interface}{$SubProblemType}{$NewLocation}{"Start_Type_Name"} = get_TypeName($ReturnType1_Id, 1); - } - } - } - } - - #checking object type - my $ObjectType1_Id = $CompleteSignature{1}{$Interface}{"Class"}; - my $ObjectType2_Id = $CompleteSignature{2}{$Interface}{"Class"}; - if($ObjectType1_Id and $ObjectType2_Id) - { - my $ThisType1_Id = getTypeIdByName(get_TypeName($ObjectType1_Id, 1)."*const", 1); - my $ThisType2_Id = getTypeIdByName(get_TypeName($ObjectType2_Id, 2)."*const", 2); - if($ThisType1_Id and $ThisType2_Id) - { - @RecurTypes = (); - %SubProblems = mergeTypes($ThisType1_Id, $Tid_TDid{1}{$ThisType1_Id}, $ThisType2_Id, $Tid_TDid{2}{$ThisType2_Id}); - foreach my $SubProblemType (keys(%SubProblems)) - { - foreach my $SubLocation (keys(%{$SubProblems{$SubProblemType}})) - { - my $NewLocation = ($SubLocation)?"Obj->".$SubLocation:"Obj"; - %{$CompatProblems{$Interface}{$SubProblemType}{$NewLocation}}=( - "Signature"=>get_Signature($Interface, 1), - "Header"=>$CompleteSignature{1}{$Interface}{"Header"}, - "Line"=>$CompleteSignature{1}{$Interface}{"Line"}, - "Old_SoName"=>$Interface_Library{1}{$Interface}, - "New_SoName"=>$Interface_Library{2}{$Interface}, - "Object_Type_Name"=>get_TypeName($ObjectType1_Id, 1) ); - @{$CompatProblems{$Interface}{$SubProblemType}{$NewLocation}}{keys(%{$SubProblems{$SubProblemType}{$SubLocation}})} = values %{$SubProblems{$SubProblemType}{$SubLocation}}; - if($SubLocation !~ /\-\>/) - { - $CompatProblems{$Interface}{$SubProblemType}{$NewLocation}{"Start_Type_Name"} = get_TypeName($ObjectType1_Id, 1); - } - } - } - } - } - } - set_Problems_Priority(); -} - -sub getTypeIdByName($$) -{ - my ($TypeName, $Version) = @_; - return $TName_Tid{$Version}{correctName($TypeName)}; -} - -sub detectTypeChange($$$) -{ - my ($Type1_Id, $Type2_Id, $Prefix) = @_; - my %LocalProblems = (); - my $Type1_DId = $Tid_TDid{1}{$Type1_Id}; - my $Type2_DId = $Tid_TDid{2}{$Type2_Id}; - my %Type1 = get_Type($Type1_DId, $Type1_Id, 1); - my %Type2 = get_Type($Type2_DId, $Type2_Id, 2); - my %Type1_Base = get_BaseType($Type1_DId, $Type1_Id, 1); - my %Type2_Base = get_BaseType($Type2_DId, $Type2_Id, 2); - my %Type1_Pure = get_PureType($Type1_DId, $Type1_Id, 1); - my %Type2_Pure = get_PureType($Type2_DId, $Type2_Id, 2); - my $Type1_PointerLevel = get_PointerLevel($Type1_DId, $Type1_Id, 1); - my $Type2_PointerLevel = get_PointerLevel($Type2_DId, $Type2_Id, 2); - return () if(not $Type1{"Name"} or not $Type2{"Name"} or not $Type1{"Size"} or not $Type2{"Size"} or not $Type1_Pure{"Size"} or not $Type2_Pure{"Size"} or not $Type1_Base{"Name"} or not $Type2_Base{"Name"} or not $Type1_Base{"Size"} or not $Type2_Base{"Size"} or $Type1_PointerLevel eq "" or $Type2_PointerLevel eq ""); - if($Type1_Base{"Name"} ne $Type2_Base{"Name"}) - {#base type change - if($Type1_Base{"Name"}!~/anon\-/ and $Type2_Base{"Name"}!~/anon\-/) - { - if($Type1_Base{"Size"}!=$Type2_Base{"Size"}) - { - %{$LocalProblems{$Prefix."_BaseType_And_Size"}}=( - "Old_Value"=>$Type1_Base{"Name"}, - "New_Value"=>$Type2_Base{"Name"}, - "Old_Size"=>$Type1_Base{"Size"}, - "New_Size"=>$Type2_Base{"Size"}, - "InitialType_Type"=>$Type1_Pure{"Type"}); - } - else - { - %{$LocalProblems{$Prefix."_BaseType"}}=( - "Old_Value"=>$Type1_Base{"Name"}, - "New_Value"=>$Type2_Base{"Name"}, - "InitialType_Type"=>$Type1_Pure{"Type"}); - } - } - } - elsif($Type1{"Name"} ne $Type2{"Name"}) - {#type change - if($Type1{"Name"}!~/anon\-/ and $Type2{"Name"}!~/anon\-/) - { - if($Type1{"Size"}!=$Type2{"Size"}) - { - %{$LocalProblems{$Prefix."_Type_And_Size"}}=( - "Old_Value"=>$Type1{"Name"}, - "New_Value"=>$Type2{"Name"}, - "Old_Size"=>($Type1{"Type"} eq "Array")?$Type1{"Size"}*$Type1_Base{"Size"}:$Type1{"Size"}, - "New_Size"=>($Type2{"Type"} eq "Array")?$Type2{"Size"}*$Type2_Base{"Size"}:$Type2{"Size"}, - "InitialType_Type"=>$Type1_Pure{"Type"}); - } - else - { - %{$LocalProblems{$Prefix."_Type"}}=( - "Old_Value"=>$Type1{"Name"}, - "New_Value"=>$Type2{"Name"}, - "InitialType_Type"=>$Type1_Pure{"Type"}); - } - } - } - - if($Type1_PointerLevel!=$Type2_PointerLevel) - { - %{$LocalProblems{$Prefix."_PointerLevel"}}=( - "Old_Value"=>$Type1_PointerLevel, - "New_Value"=>$Type2_PointerLevel); - } - return %LocalProblems; -} - -sub htmlSpecChars($) -{ - my $Str = $_[0]; - $Str =~ s/\&([^#])/&$1/g; - $Str =~ s//>/g; - $Str =~ s/([^ ])( )([^ ])/$1\@ALONE_SP\@$3/g; - $Str =~ s/ / /g; - $Str =~ s/\@ALONE_SP\@/ /g; - $Str =~ s/\n//g; - return $Str; -} - -sub highLight_Signature($) -{ - my $Signature = $_[0]; - return highLight_Signature_PPos_Italic($Signature, "", 0, 0); -} - -sub highLight_Signature_Italic($) -{ - my $Signature = $_[0]; - return highLight_Signature_PPos_Italic($Signature, "", 1, 0); -} - -sub highLight_Signature_Italic_Color($) -{ - my $Signature = $_[0]; - return highLight_Signature_PPos_Italic($Signature, "", 1, 1); -} - -sub highLight_Signature_PPos_Italic($$$$) -{ - my ($FullSignature, $Parameter_Position, $ItalicParams, $ColorParams) = @_; - my ($Signature, $SymbolVersion) = ($FullSignature, ""); - if($FullSignature =~ /\A(.+)[\@]+(.+)\Z/) - { - ($Signature, $SymbolVersion) = ($1, $2); - } - if($Signature=~/\Atypeinfo\W/) - { - return $Signature.(($SymbolVersion)?" \@ $SymbolVersion":""); - } - if($Signature!~/\)(| const)\Z/) - { - return $Signature.(($SymbolVersion)?" \@ $SymbolVersion":""); - } - $Signature =~ /(.+?)\(.*\)(| const)\Z/; - my ($Begin, $End) = ($1, $2); - my @Parts = (); - my $Part_Num = 0; - foreach my $Part (get_Signature_Parts($Signature, 1)) - { - $Part =~ s/\A\s+|\s+\Z//g; - my ($Part_Styled, $ParamName) = ($Part, ""); - if($Part=~/\([\*]+(\w+)\)/i) - {#func-ptr - $ParamName = $1; - } - elsif($Part=~/(\w+)[\,\)]*\Z/i) - { - $ParamName = $1; - } - if(not $ParamName) - { - push(@Parts, $Part); - next; - } - if($ItalicParams and not $TName_Tid{1}{$Part} and not $TName_Tid{2}{$Part}) - { - if(($Parameter_Position ne "") and ($Part_Num == $Parameter_Position)) - { - $Part_Styled =~ s!(\W)$ParamName([\,\)]|\Z)!$1$ParamName$2!ig; - } - elsif($ColorParams) - { - $Part_Styled =~ s!(\W)$ParamName([\,\)]|\Z)!$1$ParamName$2!ig; - } - else - { - $Part_Styled =~ s!(\W)$ParamName([\,\)]|\Z)!$1$ParamName$2!ig; - } - } - $Part_Styled = "".$Part_Styled.""; - push(@Parts, $Part_Styled); - $Part_Num += 1; - } - $Signature = $Begin.""."(".join(" ", @Parts).")"."".$End; - $Signature =~ s!\[\]![]!g; - $Signature =~ s!operator=!operator=!g; - $Signature =~ s!(\[in-charge\]|\[not-in-charge\]|\[in-charge-deleting\])!$1!g; - return $Signature.(($SymbolVersion)?" \@ $SymbolVersion":""); -} - -sub get_Signature_Parts($$) -{ - my ($Signature, $Comma) = @_; - my @Parts = (); - my $Bracket_Num = 0; - my $Bracket2_Num = 0; - my $Parameters = $Signature; - if($Signature=~/>|</) - { - $Parameters=~s/>/>/g; - $Parameters=~s/</"); - if($Symbol eq "," and $Bracket_Num==0 and $Bracket2_Num==0) - { - $Parts[$Part_Num] .= $Symbol if($Comma); - $Part_Num += 1; - } - else - { - $Parts[$Part_Num] .= $Symbol; - } - } - if($Signature=~/>|</) - { - foreach my $Part (@Parts) - { - $Part=~s/\>/>/g; - $Part=~s/\1, - "Withdrawn_Virtual_Function"=>1, - "Virtual_Function_Position"=>1, - "Virtual_Function_Redefinition"=>1, - "Virtual_Function_Redefinition_B"=>1, - "Size"=>1, - "Added_Member_And_Size"=>1, - "Added_Middle_Member_And_Size"=>1, - "Withdrawn_Member_And_Size"=>1, - "Withdrawn_Member"=>1, - "Withdrawn_Middle_Member_And_Size"=>1, - "Member_Rename"=>1, - "Enum_Member_Value"=>1, - "Enum_Member_Name"=>1, - "Member_Type_And_Size"=>1, - "Member_Type"=>1, - "Member_BaseType_And_Size"=>1, - "Member_BaseType"=>1, - "Member_PointerLevel"=>1, - "BaseType"=>1 -); - -my %InterfaceProblems_Kind=( - "Added_Interface"=>1, - "Withdrawn_Interface"=>1, - "Function_Become_Static"=>1, - "Function_Become_NonStatic"=>1, - "Parameter_Type_And_Size"=>1, - "Parameter_Type"=>1, - "Parameter_BaseType_And_Size"=>1, - "Parameter_BaseType"=>1, - "Parameter_PointerLevel"=>1, - "Return_Type_And_Size"=>1, - "Return_Type"=>1, - "Return_BaseType_And_Size"=>1, - "Return_BaseType"=>1, - "Return_PointerLevel"=>1, - "Withdrawn_Parameter"=>1, - "Added_Parameter"=>1 -); - -sub testSystem_cpp() -{ - print "testing for C++ library changes\n"; - my (@DataDefs_v1, @Sources_v1, @DataDefs_v2, @Sources_v2) = (); - - #Withdrawn_Parameter - @DataDefs_v1 = (@DataDefs_v1, "int func_withdrawn_parameter(int param, int withdrawn_param);"); - @Sources_v1 = (@Sources_v1, "int func_withdrawn_parameter(int param, int withdrawn_param)\n{\n return 0;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "int func_withdrawn_parameter(int param);"); - @Sources_v2 = (@Sources_v2, "int func_withdrawn_parameter(int param)\n{\n return 0;\n}"); - - #Added_Parameter - @DataDefs_v1 = (@DataDefs_v1, "int func_added_parameter(int param);"); - @Sources_v1 = (@Sources_v1, "int func_added_parameter(int param)\n{\n return 0;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "int func_added_parameter(int param, int added_param);"); - @Sources_v2 = (@Sources_v2, "int func_added_parameter(int param, int added_param)\n{\n return 0;\n}"); - - #Added_Virtual_Function - @DataDefs_v1 = (@DataDefs_v1, "class type_test_added_virtual_function\n{\npublic:\n int func1(int param);\n virtual int func2(int param);\n};"); - @Sources_v1 = (@Sources_v1, "int type_test_added_virtual_function::func1(int param)\n{\n return param;\n}"); - @Sources_v1 = (@Sources_v1, "int type_test_added_virtual_function::func2(int param)\n{\n return param;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "class type_test_added_virtual_function\n{\npublic:\n virtual int func1(int param);\n virtual int func2(int param);\n};"); - @Sources_v2 = (@Sources_v2, "int type_test_added_virtual_function::func1(int param)\n{\n return param;\n}"); - @Sources_v2 = (@Sources_v2, "int type_test_added_virtual_function::func2(int param)\n{\n return param;\n}"); - - #added simple function - @DataDefs_v2 = (@DataDefs_v2, "typedef int (*FUNCPTR_TYPE)(int a, int b);\nint added_function_param_funcptr(FUNCPTR_TYPE*const** f);"); - @Sources_v2 = (@Sources_v2, "int added_function_param_funcptr(FUNCPTR_TYPE*const** f)\n{\n return 0;\n}"); - - #Withdrawn_Virtual_Function - @DataDefs_v1 = (@DataDefs_v1, "class type_test_withdrawn_virtual_function\n{\npublic:\n virtual int func1(int param);\n virtual int func2(int param);\n};"); - @Sources_v1 = (@Sources_v1, "int type_test_withdrawn_virtual_function::func1(int param)\n{\n return param;\n}"); - @Sources_v1 = (@Sources_v1, "int type_test_withdrawn_virtual_function::func2(int param)\n{\n return param;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "class type_test_withdrawn_virtual_function\n{\npublic:\n int func1(int param);\n virtual int func2(int param);\n};"); - @Sources_v2 = (@Sources_v2, "int type_test_withdrawn_virtual_function::func1(int param)\n{\n return param;\n}"); - @Sources_v2 = (@Sources_v2, "int type_test_withdrawn_virtual_function::func2(int param)\n{\n return param;\n}"); - - #Virtual_Function_Position - @DataDefs_v1 = (@DataDefs_v1, "class type_test_virtual_function_position\n{\npublic:\n virtual int func1(int param);\n virtual int func2(int param);\n};"); - @Sources_v1 = (@Sources_v1, "int type_test_virtual_function_position::func1(int param)\n{\n return param;\n}"); - @Sources_v1 = (@Sources_v1, "int type_test_virtual_function_position::func2(int param)\n{\n return param;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "class type_test_virtual_function_position\n{\npublic:\n virtual int func2(int param);\n virtual int func1(int param);\n};"); - @Sources_v2 = (@Sources_v2, "int type_test_virtual_function_position::func1(int param)\n{\n return param;\n}"); - @Sources_v2 = (@Sources_v2, "int type_test_virtual_function_position::func2(int param)\n{\n return param;\n}"); - - #virtual functions safe replace - @DataDefs_v1 = (@DataDefs_v1, "class type_test_virtual_function_position_safe_replace_base\n{\npublic:\n virtual int func1(int param);\n virtual int func2(int param);\n};"); - @Sources_v1 = (@Sources_v1, "int type_test_virtual_function_position_safe_replace_base::func1(int param)\n{\n return param;\n}"); - @Sources_v1 = (@Sources_v1, "int type_test_virtual_function_position_safe_replace_base::func2(int param)\n{\n return param;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "class type_test_virtual_function_position_safe_replace_base\n{\npublic:\n virtual int func1(int param);\n virtual int func2(int param);\n};"); - @Sources_v2 = (@Sources_v2, "int type_test_virtual_function_position_safe_replace_base::func1(int param)\n{\n return param;\n}"); - @Sources_v2 = (@Sources_v2, "int type_test_virtual_function_position_safe_replace_base::func2(int param)\n{\n return param;\n}"); - - @DataDefs_v1 = (@DataDefs_v1, "class type_test_virtual_function_position_safe_replace:public type_test_virtual_function_position_safe_replace_base\n{\npublic:\n virtual int func1(int param);\n virtual int func2(int param);\n};"); - @Sources_v1 = (@Sources_v1, "int type_test_virtual_function_position_safe_replace::func1(int param)\n{\n return param;\n}"); - @Sources_v1 = (@Sources_v1, "int type_test_virtual_function_position_safe_replace::func2(int param)\n{\n return param;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "class type_test_virtual_function_position_safe_replace:public type_test_virtual_function_position_safe_replace_base\n{\npublic:\n virtual int func2(int param);\n virtual int func1(int param);\n};"); - @Sources_v2 = (@Sources_v2, "int type_test_virtual_function_position_safe_replace::func1(int param)\n{\n return param;\n}"); - @Sources_v2 = (@Sources_v2, "int type_test_virtual_function_position_safe_replace::func2(int param)\n{\n return param;\n}"); - - #virtual table changes - @DataDefs_v1 = (@DataDefs_v1, "class type_test_virtual_table_base\n{\npublic:\n virtual int func1(int param);\n virtual int func2(int param);\n};"); - @DataDefs_v1 = (@DataDefs_v1, "class type_test_virtual_table:public type_test_virtual_table_base\n{\npublic:\n virtual int func1(int param);\n virtual int func2(int param);\n};"); - @Sources_v1 = (@Sources_v1, "int type_test_virtual_table_base::func1(int param)\n{\n return param;\n}"); - @Sources_v1 = (@Sources_v1, "int type_test_virtual_table_base::func2(int param)\n{\n return param;\n}"); - @Sources_v1 = (@Sources_v1, "int type_test_virtual_table::func1(int param)\n{\n return param;\n}"); - @Sources_v1 = (@Sources_v1, "int type_test_virtual_table::func2(int param)\n{\n return param;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "class type_test_virtual_table_base\n{\npublic:\n virtual int func1(int param);\n virtual int func2(int param);\n};"); - @DataDefs_v2 = (@DataDefs_v2, "class type_test_virtual_table:public type_test_virtual_table_base\n{\npublic:\n virtual int func2(int param);\n virtual int func1(int param);\n};"); - @Sources_v2 = (@Sources_v2, "int type_test_virtual_table_base::func1(int param)\n{\n return param;\n}"); - @Sources_v2 = (@Sources_v2, "int type_test_virtual_table_base::func2(int param)\n{\n return param;\n}"); - @Sources_v2 = (@Sources_v2, "int type_test_virtual_table::func1(int param)\n{\n return param;\n}"); - @Sources_v2 = (@Sources_v2, "int type_test_virtual_table::func2(int param)\n{\n return param;\n}"); - - #Virtual_Function_Redefinition - @DataDefs_v1 = (@DataDefs_v1, "class type_test_virtual_function_redefinition_base\n{\npublic:\n virtual int func1(int param);\n virtual int func2(int param);\n};"); - @DataDefs_v1 = (@DataDefs_v1, "class type_test_virtual_function_redefinition:public type_test_virtual_function_redefinition_base\n{\npublic:\n virtual int func3(int param);\n};"); - @Sources_v1 = (@Sources_v1, "int type_test_virtual_function_redefinition_base::func1(int param)\n{\n return param;\n}"); - @Sources_v1 = (@Sources_v1, "int type_test_virtual_function_redefinition_base::func2(int param)\n{\n return param;\n}"); - @Sources_v1 = (@Sources_v1, "int type_test_virtual_function_redefinition::func3(int param)\n{\n return param;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "class type_test_virtual_function_redefinition_base\n{\npublic:\n virtual int func1(int param);\n virtual int func2(int param);\n};"); - @DataDefs_v2 = (@DataDefs_v2, "class type_test_virtual_function_redefinition:public type_test_virtual_function_redefinition_base\n{\npublic:\n virtual int func2(int param);\n virtual int func3(int param);\n};"); - @Sources_v2 = (@Sources_v2, "int type_test_virtual_function_redefinition_base::func1(int param){\n return param;\n}"); - @Sources_v2 = (@Sources_v2, "int type_test_virtual_function_redefinition_base::func2(int param){\n return param;\n}"); - @Sources_v2 = (@Sources_v2, "int type_test_virtual_function_redefinition::func2(int param)\n{\n return param;\n}"); - @Sources_v2 = (@Sources_v2, "int type_test_virtual_function_redefinition::func3(int param)\n{\n return param;\n}"); - - #size change - @DataDefs_v1 = (@DataDefs_v1, "struct type_test_size\n{\npublic:\n virtual type_test_size func1(type_test_size param);\n int i;\n long j;\n double k;\n type_test_size* p;\n};"); - @Sources_v1 = (@Sources_v1, "type_test_size type_test_size::func1(type_test_size param)\n{\n return param;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "struct type_test_size\n{\npublic:\n virtual type_test_size func1(type_test_size param);\n int i;\n long j;\n double k;\n type_test_size* p;\n int added_member;\n};"); - @Sources_v2 = (@Sources_v2, "type_test_size type_test_size::func1(type_test_size param)\n{\n return param;\n}"); - - #Added_Member_And_Size - @DataDefs_v1 = (@DataDefs_v1, "struct type_test_added_member\n{\npublic:\n virtual type_test_added_member func1(type_test_added_member param);\n int i;\n long j;\n double k;\n type_test_added_member* p;\n};"); - @Sources_v1 = (@Sources_v1, "type_test_added_member type_test_added_member::func1(type_test_added_member param)\n{\n return param;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "struct type_test_added_member\n{\npublic:\n virtual type_test_added_member func1(type_test_added_member param);\n int i;\n long j;\n double k;\n type_test_added_member* p;\n int added_member;\n};"); - @Sources_v2 = (@Sources_v2, "type_test_added_member type_test_added_member::func1(type_test_added_member param)\n{\n return param;\n}"); - - #Method object changes - @DataDefs_v1 = (@DataDefs_v1, "class type_test_object_added_member\n{\npublic:\n virtual int func1(int param);\n int i;\n long j;\n double k;\n type_test_added_member* p;\n};"); - @Sources_v1 = (@Sources_v1, "int type_test_object_added_member::func1(int param)\n{\n return param;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "class type_test_object_added_member\n{\npublic:\n virtual int func1(int param);\n int i;\n long j;\n double k;\n type_test_added_member* p;\n int added_member;\n};"); - @Sources_v2 = (@Sources_v2, "int type_test_object_added_member::func1(int param)\n{\n return param;\n}"); - - #added bitfield - @DataDefs_v1 = (@DataDefs_v1, "struct type_test_added_bitfield\n{\npublic:\n virtual type_test_added_bitfield func1(type_test_added_bitfield param);\n int i;\n long j;\n double k;\n int b1 : 32;\n int b2 : 31;\n type_test_added_bitfield* p;\n};"); - @Sources_v1 = (@Sources_v1, "type_test_added_bitfield type_test_added_bitfield::func1(type_test_added_bitfield param)\n{\n return param;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "struct type_test_added_bitfield\n{\npublic:\n virtual type_test_added_bitfield func1(type_test_added_bitfield param);\n int i;\n long j;\n double k;\n int b1 : 32;\n int b2 : 31;\n int added_bitfield : 1;\n type_test_added_bitfield* p;\n};"); - @Sources_v2 = (@Sources_v2, "type_test_added_bitfield type_test_added_bitfield::func1(type_test_added_bitfield param)\n{\n return param;\n}"); - - #withdrawn bitfield - @DataDefs_v1 = (@DataDefs_v1, "struct type_test_withdrawn_bitfield\n{\npublic:\n virtual type_test_withdrawn_bitfield func1(type_test_withdrawn_bitfield param);\n int i;\n long j;\n double k;\n int b1 : 32;\n int b2 : 31;\n int withdrawn_bitfield : 1;\n type_test_withdrawn_bitfield* p;\n};"); - @Sources_v1 = (@Sources_v1, "type_test_withdrawn_bitfield type_test_withdrawn_bitfield::func1(type_test_withdrawn_bitfield param)\n{\n return param;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "struct type_test_withdrawn_bitfield\n{\npublic:\n virtual type_test_withdrawn_bitfield func1(type_test_withdrawn_bitfield param);\n int i;\n long j;\n double k;\n int b1 : 32;\n int b2 : 31;\n type_test_withdrawn_bitfield* p;\n};"); - @Sources_v2 = (@Sources_v2, "type_test_withdrawn_bitfield type_test_withdrawn_bitfield::func1(type_test_withdrawn_bitfield param)\n{\n return param;\n}"); - - #Added_Middle_Member_And_Size - @DataDefs_v1 = (@DataDefs_v1, "struct type_test_added_middle_member\n{\npublic:\n virtual type_test_added_middle_member func1(type_test_added_middle_member param);\n int i;\n long j;\n double k;\n type_test_added_middle_member* p;\n};"); - @Sources_v1 = (@Sources_v1, "type_test_added_middle_member type_test_added_middle_member::func1(type_test_added_middle_member param)\n{\n return param;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "struct type_test_added_middle_member\n{\npublic:\n virtual type_test_added_middle_member func1(type_test_added_middle_member param);\n int i;\n int added_middle_member;\n long j;\n double k;\n type_test_added_middle_member* p;\n};"); - @Sources_v2 = (@Sources_v2, "type_test_added_middle_member type_test_added_middle_member::func1(type_test_added_middle_member param)\n{\n return param;\n}"); - - #Member_Rename - @DataDefs_v1 = (@DataDefs_v1, "struct type_test_member_rename\n{\npublic:\n virtual type_test_member_rename func1(type_test_member_rename param);\n long i;\n long j;\n double k;\n type_test_member_rename* p;\n};"); - @Sources_v1 = (@Sources_v1, "type_test_member_rename type_test_member_rename::func1(type_test_member_rename param)\n{\n return param;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "struct type_test_member_rename\n{\npublic:\n virtual type_test_member_rename func1(type_test_member_rename param);\n long renamed_member;\n long j;\n double k;\n type_test_member_rename* p;\n};"); - @Sources_v2 = (@Sources_v2, "type_test_member_rename type_test_member_rename::func1(type_test_member_rename param)\n{\n return param;\n}"); - - #Withdrawn_Member_And_Size - @DataDefs_v1 = (@DataDefs_v1, "struct type_test_withdrawn_member\n{\npublic:\n virtual type_test_withdrawn_member func1(type_test_withdrawn_member param);\n int i;\n long j;\n double k;\n type_test_withdrawn_member* p;\n int withdrawn_member;\n};"); - @Sources_v1 = (@Sources_v1, "type_test_withdrawn_member type_test_withdrawn_member::func1(type_test_withdrawn_member param)\n{\n return param;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "struct type_test_withdrawn_member\n{\npublic:\n virtual type_test_withdrawn_member func1(type_test_withdrawn_member param);\n int i;\n long j;\n double k;\n type_test_withdrawn_member* p;\n};"); - @Sources_v2 = (@Sources_v2, "type_test_withdrawn_member type_test_withdrawn_member::func1(type_test_withdrawn_member param)\n{\n return param;\n}"); - - #Withdrawn_Middle_Member_And_Size - @DataDefs_v1 = (@DataDefs_v1, "struct type_test_withdrawn_middle_member\n{\npublic:\n virtual type_test_withdrawn_middle_member func1(type_test_withdrawn_middle_member param);\n int i;\n int withdrawn_middle_member;\n long j;\n double k;\n type_test_withdrawn_middle_member* p;\n};"); - @Sources_v1 = (@Sources_v1, "type_test_withdrawn_middle_member type_test_withdrawn_middle_member::func1(type_test_withdrawn_middle_member param)\n{\n return param;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "struct type_test_withdrawn_middle_member\n{\npublic:\n virtual type_test_withdrawn_middle_member func1(type_test_withdrawn_middle_member param);\n int i;\n long j;\n double k;\n type_test_withdrawn_middle_member* p;\n};"); - @Sources_v2 = (@Sources_v2, "type_test_withdrawn_middle_member type_test_withdrawn_middle_member::func1(type_test_withdrawn_middle_member param)\n{\n return param;\n}"); - - #Enum_Member_Value - @DataDefs_v1 = (@DataDefs_v1, "enum type_test_enum_member_value_change\n{\n MEMBER_1=1,\n MEMBER_2=2\n};"); - @DataDefs_v1 = (@DataDefs_v1, "int func_test_enum_member_value_change(enum type_test_enum_member_value_change param);"); - @Sources_v1 = (@Sources_v1, -"int func_test_enum_member_value_change(enum type_test_enum_member_value_change param) -{ - switch(param) - { - case 1: - return 1; - case 2: - return 2; - } - return 0; -}"); - - @DataDefs_v2 = (@DataDefs_v2, "enum type_test_enum_member_value_change\n{\n MEMBER_1=2,\n MEMBER_2=1\n};"); - @DataDefs_v2 = (@DataDefs_v2, "int func_test_enum_member_value_change(enum type_test_enum_member_value_change param);"); - @Sources_v2 = (@Sources_v2, -"int func_test_enum_member_value_change(enum type_test_enum_member_value_change param) -{ - switch(param) - { - case 1: - return 1; - case 2: - return 2; - } - return 0; -}"); - - #Enum_Member_Name - @DataDefs_v1 = (@DataDefs_v1, "enum type_test_enum_member_rename\n{\n BRANCH_1=1,\n BRANCH_2=2\n};"); - @DataDefs_v1 = (@DataDefs_v1, "int func_test_enum_member_rename(enum type_test_enum_member_rename param);"); - @Sources_v1 = (@Sources_v1, -"int func_test_enum_member_rename(enum type_test_enum_member_rename param) -{ - switch(param) - { - case 1: - return 1; - case 2: - return 2; - } - return 0; -}"); - - @DataDefs_v2 = (@DataDefs_v2, "enum type_test_enum_member_rename\n{\n BRANCH_FIRST=1,\n BRANCH_SECOND=1\n};"); - @DataDefs_v2 = (@DataDefs_v2, "int func_test_enum_member_rename(enum type_test_enum_member_rename param);"); - @Sources_v2 = (@Sources_v2, -"int func_test_enum_member_rename(enum type_test_enum_member_rename param) -{ - switch(param) - { - case 1: - return 1; - case 2: - return 2; - } - return 0; -}"); - - #Member_Type_And_Size - @DataDefs_v1 = (@DataDefs_v1, "struct type_test_member_type_and_size\n{\npublic:\n type_test_member_type_and_size func1(type_test_member_type_and_size param);\n int i;\n long j;\n double k;\n type_test_member_type_and_size* p;\n};"); - @Sources_v1 = (@Sources_v1, "type_test_member_type_and_size type_test_member_type_and_size::func1(type_test_member_type_and_size param)\n{\n return param;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "struct type_test_member_type_and_size\n{\npublic:\n type_test_member_type_and_size func1(type_test_member_type_and_size param);\n long long i;\n long j;\n double k;\n type_test_member_type_and_size* p;\n};"); - @Sources_v2 = (@Sources_v2, "type_test_member_type_and_size type_test_member_type_and_size::func1(type_test_member_type_and_size param)\n{\n return param;\n}"); - - #Member_Type - @DataDefs_v1 = (@DataDefs_v1, "struct type_test_member_type\n{\npublic:\n type_test_member_type func1(type_test_member_type param);\n int i;\n long j;\n double k;\n type_test_member_type* p;\n};"); - @Sources_v1 = (@Sources_v1, "type_test_member_type type_test_member_type::func1(type_test_member_type param)\n{\n return param;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "struct type_test_member_type\n{\npublic:\n type_test_member_type func1(type_test_member_type param);\n float i;\n long j;\n double k;\n type_test_member_type* p;\n};"); - @Sources_v2 = (@Sources_v2, "type_test_member_type type_test_member_type::func1(type_test_member_type param)\n{\n return param;\n}"); - - #Member_BaseType - @DataDefs_v1 = (@DataDefs_v1, "struct type_test_member_basetype\n{\npublic:\n type_test_member_basetype func1(type_test_member_basetype param);\n int *i;\n long j;\n double k;\n type_test_member_basetype* p;\n};"); - @Sources_v1 = (@Sources_v1, "type_test_member_basetype type_test_member_basetype::func1(type_test_member_basetype param)\n{\n return param;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "struct type_test_member_basetype\n{\npublic:\n type_test_member_basetype func1(type_test_member_basetype param);\n long long *i;\n long j;\n double k;\n type_test_member_basetype* p;\n};"); - @Sources_v2 = (@Sources_v2, "type_test_member_basetype type_test_member_basetype::func1(type_test_member_basetype param)\n{\n return param;\n}"); - - #Member_PointerLevel_And_Size - @DataDefs_v1 = (@DataDefs_v1, "struct type_test_member_pointerlevel_and_size\n{\npublic:\n type_test_member_pointerlevel_and_size func1(type_test_member_pointerlevel_and_size param);\n long long i;\n long j;\n double k;\n type_test_member_pointerlevel_and_size* p;\n};"); - @Sources_v1 = (@Sources_v1, "type_test_member_pointerlevel_and_size type_test_member_pointerlevel_and_size::func1(type_test_member_pointerlevel_and_size param)\n{\n return param;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "struct type_test_member_pointerlevel_and_size\n{\npublic:\n type_test_member_pointerlevel_and_size func1(type_test_member_pointerlevel_and_size param);\n long long *i;\n long j;\n double k;\n type_test_member_pointerlevel_and_size* p;\n};"); - @Sources_v2 = (@Sources_v2, "type_test_member_pointerlevel_and_size type_test_member_pointerlevel_and_size::func1(type_test_member_pointerlevel_and_size param)\n{\n return param;\n}"); - - #Member_PointerLevel - @DataDefs_v1 = (@DataDefs_v1, "struct type_test_member_pointerlevel\n{\npublic:\n type_test_member_pointerlevel func1(type_test_member_pointerlevel param);\n int **i;\n long j;\n double k;\n type_test_member_pointerlevel* p;\n};"); - @Sources_v1 = (@Sources_v1, "type_test_member_pointerlevel type_test_member_pointerlevel::func1(type_test_member_pointerlevel param)\n{\n return param;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "struct type_test_member_pointerlevel\n{\npublic:\n type_test_member_pointerlevel func1(type_test_member_pointerlevel param);\n int *i;\n long j;\n double k;\n type_test_member_pointerlevel* p;\n};"); - @Sources_v2 = (@Sources_v2, "type_test_member_pointerlevel type_test_member_pointerlevel::func1(type_test_member_pointerlevel param)\n{\n return param;\n}"); - - #Added_Interface (function) - @DataDefs_v1 = (@DataDefs_v1, "struct type_test_added_interface\n{\npublic:\n type_test_added_interface func1(type_test_added_interface param);\n int i;\n long j;\n double k;\n type_test_added_interface* p;\n};"); - @Sources_v1 = (@Sources_v1, "type_test_added_interface type_test_added_interface::func1(type_test_added_interface param)\n{\n return param;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "struct type_test_added_interface\n{\npublic:\n type_test_added_interface func1(type_test_added_interface param);\n type_test_added_interface added_func(type_test_added_interface param);\n int i;\n long j;\n double k;\n type_test_added_interface* p;\n};"); - @DataDefs_v2 = (@DataDefs_v2, "int added_func_2(void *** param);"); - @Sources_v2 = (@Sources_v2, "type_test_added_interface type_test_added_interface::func1(type_test_added_interface param)\n{\n return param;\n}"); - @Sources_v2 = (@Sources_v2, "type_test_added_interface type_test_added_interface::added_func(type_test_added_interface param)\n{\n return param;\n}"); - @Sources_v2 = (@Sources_v2, "int added_func_2(void *** param)\n{\n return 0;\n}"); - - #Added_Interface (global variable) - @DataDefs_v1 = (@DataDefs_v1, "struct type_test_added_variable\n{\npublic:\n int func1(type_test_added_variable param);\n int i;\n long j;\n double k;\n type_test_added_variable* p;\n};"); - @Sources_v1 = (@Sources_v1, "int type_test_added_variable::func1(type_test_added_variable param)\n{\n return i;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "struct type_test_added_variable\n{\npublic:\n int func1(type_test_added_variable param);\n static int i;\n long j;\n double k;\n type_test_added_variable* p;\n};"); - @Sources_v2 = (@Sources_v2, "int type_test_added_variable::func1(type_test_added_variable param)\n{\n return type_test_added_variable::i;\n}"); - @Sources_v2 = (@Sources_v2, "int type_test_added_variable::i=0;"); - - #Withdrawn_Interface - @DataDefs_v1 = (@DataDefs_v1, "struct type_test_withdrawn_interface\n{\npublic:\n type_test_withdrawn_interface func1(type_test_withdrawn_interface param);\n type_test_withdrawn_interface withdrawn_func(type_test_withdrawn_interface param);\n int i;\n long j;\n double k;\n type_test_withdrawn_interface* p;\n};"); - @DataDefs_v1 = (@DataDefs_v1, "int withdrawn_func_2(void *** param);"); - @Sources_v1 = (@Sources_v1, "type_test_withdrawn_interface type_test_withdrawn_interface::func1(type_test_withdrawn_interface param)\n{\n return param;\n}"); - @Sources_v1 = (@Sources_v1, "type_test_withdrawn_interface type_test_withdrawn_interface::withdrawn_func(type_test_withdrawn_interface param)\n{\n return param;\n}"); - @Sources_v1 = (@Sources_v1, "int withdrawn_func_2(void *** param)\n{\n return 0;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "struct type_test_withdrawn_interface\n{\npublic:\n type_test_withdrawn_interface func1(type_test_withdrawn_interface param);\n int i;\n long j;\n double k;\n type_test_withdrawn_interface* p;\n};"); - @Sources_v2 = (@Sources_v2, "type_test_withdrawn_interface type_test_withdrawn_interface::func1(type_test_withdrawn_interface param)\n{\n return param;\n}"); - - #Function_Become_Static - @DataDefs_v1 = (@DataDefs_v1, "struct type_test_become_static\n{\npublic:\n type_test_become_static func_become_static(type_test_become_static param);\n int **i;\n long j;\n double k;\n type_test_become_static* p;\n};"); - @Sources_v1 = (@Sources_v1, "type_test_become_static type_test_become_static::func_become_static(type_test_become_static param)\n{\n return param;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "struct type_test_become_static\n{\npublic:\n static type_test_become_static func_become_static(type_test_become_static param);\n int **i;\n long j;\n double k;\n type_test_become_static* p;\n};"); - @Sources_v2 = (@Sources_v2, "type_test_become_static type_test_become_static::func_become_static(type_test_become_static param)\n{\n return param;\n}"); - - #Function_Become_NonStatic - @DataDefs_v1 = (@DataDefs_v1, "struct type_test_become_nonstatic\n{\npublic:\n static type_test_become_nonstatic func_become_nonstatic(type_test_become_nonstatic param);\n int **i;\n long j;\n double k;\n type_test_become_nonstatic* p;\n};"); - @Sources_v1 = (@Sources_v1, "type_test_become_nonstatic type_test_become_nonstatic::func_become_nonstatic(type_test_become_nonstatic param)\n{\n return param;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "struct type_test_become_nonstatic\n{\npublic:\n type_test_become_nonstatic func_become_nonstatic(type_test_become_nonstatic param);\n int **i;\n long j;\n double k;\n type_test_become_nonstatic* p;\n};"); - @Sources_v2 = (@Sources_v2, "type_test_become_nonstatic type_test_become_nonstatic::func_become_nonstatic(type_test_become_nonstatic param)\n{\n return param;\n}"); - - #Parameter_Type_And_Size - @DataDefs_v1 = (@DataDefs_v1, "int func_parameter_type_and_size(int param, int other_param);"); - @Sources_v1 = (@Sources_v1, "int func_parameter_type_and_size(int param, int other_param)\n{\n return other_param;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "int func_parameter_type_and_size(long long param, int other_param);"); - @Sources_v2 = (@Sources_v2, "int func_parameter_type_and_size(long long param, int other_param)\n{\n return other_param;\n}"); - - #Parameter_Type - @DataDefs_v1 = (@DataDefs_v1, "int func_parameter_type(int param, int other_param);"); - @Sources_v1 = (@Sources_v1, "int func_parameter_type(int param, int other_param)\n{\n return other_param;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "int func_parameter_type(float param, int other_param);"); - @Sources_v2 = (@Sources_v2, "int func_parameter_type(float param, int other_param)\n{\n return other_param;\n}"); - - #Parameter_BaseType - @DataDefs_v1 = (@DataDefs_v1, "int func_parameter_basetypechange(int *param);"); - @Sources_v1 = (@Sources_v1, "int func_parameter_basetypechange(int *param)\n{\n return sizeof(*param);\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "int func_parameter_basetypechange(long long *param);"); - @Sources_v2 = (@Sources_v2, "int func_parameter_basetypechange(long long *param)\n{\n return sizeof(*param);\n}"); - - #Parameter_PointerLevel_And_Size - @DataDefs_v1 = (@DataDefs_v1, "long long func_parameter_pointerlevel_and_size(long long param);"); - @Sources_v1 = (@Sources_v1, "long long func_parameter_pointerlevel_and_size(long long param)\n{\n return param;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "long long func_parameter_pointerlevel_and_size(long long *param);"); - @Sources_v2 = (@Sources_v2, "long long func_parameter_pointerlevel_and_size(long long *param)\n{\n return param[5];\n}"); - - #Parameter_PointerLevel - @DataDefs_v1 = (@DataDefs_v1, "int func_parameter_pointerlevel(int *param);"); - @Sources_v1 = (@Sources_v1, "int func_parameter_pointerlevel(int *param)\n{\n return param[5];\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "int func_parameter_pointerlevel(int **param);"); - @Sources_v2 = (@Sources_v2, "int func_parameter_pointerlevel(int **param)\n{\n return param[5][5];\n}"); - - #Return_Type_And_Size - @DataDefs_v1 = (@DataDefs_v1, "int func_return_type_and_size(int param);"); - @Sources_v1 = (@Sources_v1, "int func_return_type_and_size(int param)\n{\n return 2^(sizeof(int)*8-1)-1;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "long long func_return_type_and_size(int param);"); - @Sources_v2 = (@Sources_v2, "long long func_return_type_and_size(int param)\n{\n return 2^(sizeof(long long)*8-1)-1;\n}"); - - #Return_Type - @DataDefs_v1 = (@DataDefs_v1, "int func_return_type(int param);"); - @Sources_v1 = (@Sources_v1, "int func_return_type(int param)\n{\n return 2^(sizeof(int)*8-1)-1;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "float func_return_type(int param);"); - @Sources_v2 = (@Sources_v2, "float func_return_type(int param)\n{\n return 0.7;\n}"); - - #Return_BaseType - @DataDefs_v1 = (@DataDefs_v1, "int *func_return_basetype(int param);"); - @Sources_v1 = (@Sources_v1, "int *func_return_basetype(int param)\n{\n int *x = new int[10];\n return x;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "long long *func_return_basetype(int param);"); - @Sources_v2 = (@Sources_v2, "long long *func_return_basetype(int param)\n{\n long long *x = new long long[10];\n return x;\n}"); - - #Return_PointerLevel_And_Size - @DataDefs_v1 = (@DataDefs_v1, "long long func_return_pointerlevel_and_size(int param);"); - @Sources_v1 = (@Sources_v1, "long long func_return_pointerlevel_and_size(int param)\n{\n return 100;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "long long *func_return_pointerlevel_and_size(int param);"); - @Sources_v2 = (@Sources_v2, "long long *func_return_pointerlevel_and_size(int param)\n{\n long long* x = new long long[10];\n return x;\n}"); - - #Return_PointerLevel - @DataDefs_v1 = (@DataDefs_v1, "int* func_return_pointerlevel(int param);"); - @Sources_v1 = (@Sources_v1, "int* func_return_pointerlevel(int param)\n{\n int* x = new int[10];\n return x;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "int **func_return_pointerlevel(int param);"); - @Sources_v2 = (@Sources_v2, "int **func_return_pointerlevel(int param)\n{\n int** x = new int*[10];\n return x;\n}"); - - #typedef to anon struct - @DataDefs_v1 = (@DataDefs_v1, " -typedef struct -{ -public: - int i; - long j; - double k; -} type_test_anon_typedef; -int func_test_anon_typedef(type_test_anon_typedef param);"); - @Sources_v1 = (@Sources_v1, "int func_test_anon_typedef(type_test_anon_typedef param)\n{\n return 0;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, " -typedef struct -{ -public: - int i; - long j; - double k; - union { - int dummy[256]; - struct { - char q_skiptable[256]; - const char *p; - int l; - } p; - }; -} type_test_anon_typedef; -int func_test_anon_typedef(type_test_anon_typedef param);"); - @Sources_v2 = (@Sources_v2, "int func_test_anon_typedef(type_test_anon_typedef param)\n{\n return 0;\n}"); - - #opaque type - @DataDefs_v1 = (@DataDefs_v1, "struct type_test_opaque\n{\npublic:\n virtual type_test_opaque func1(type_test_opaque param);\n int i;\n long j;\n double k;\n type_test_opaque* p;\n};"); - @Sources_v1 = (@Sources_v1, "type_test_opaque type_test_opaque::func1(type_test_opaque param)\n{\n return param;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "struct type_test_opaque\n{\npublic:\n virtual type_test_opaque func1(type_test_opaque param);\n int i;\n long j;\n double k;\n type_test_opaque* p;\n int added_member;\n};"); - @Sources_v2 = (@Sources_v2, "type_test_opaque type_test_opaque::func1(type_test_opaque param)\n{\n return param;\n}"); - - #internal function - @DataDefs_v1 = (@DataDefs_v1, "struct type_test_internal\n{\npublic:\n virtual type_test_internal func1(type_test_internal param);\n int i;\n long j;\n double k;\n type_test_internal* p;\n};"); - @Sources_v1 = (@Sources_v1, "type_test_internal type_test_internal::func1(type_test_internal param)\n{\n return param;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "struct type_test_internal\n{\npublic:\n virtual type_test_internal func1(type_test_internal param);\n int i;\n long j;\n double k;\n type_test_internal* p;\n int added_member;\n};"); - @Sources_v2 = (@Sources_v2, "type_test_internal type_test_internal::func1(type_test_internal param)\n{\n return param;\n}"); - - #starting versioning - @DataDefs_v1 = (@DataDefs_v1, "int func_return_type_and_start_versioning(int param);"); - @Sources_v1 = (@Sources_v1, "int func_return_type_and_start_versioning(int param)\n{\n return 2^(sizeof(int)*8-1)-1;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "int func_return_type_and_start_versioning(int param);"); - @Sources_v2 = (@Sources_v2, "int func_return_type_and_start_versioning(int param)\n{\n return 2^(sizeof(int)*8-1)-1;\n}\n__asm__(\".symver _Z37func_return_type_and_start_versioningi,_Z37func_return_type_and_start_versioningi\@TEST_2.0\");"); - - #Return_Type And Good Versioning - @DataDefs_v1 = (@DataDefs_v1, "int func_return_type_and_good_versioning(int param);"); - @Sources_v1 = (@Sources_v1, "int func_return_type_and_good_versioning(int param)\n{\n return 2^(sizeof(int)*8-1)-1;\n}\n__asm__(\".symver _Z36func_return_type_and_good_versioningi,_Z36func_return_type_and_good_versioningi\@TEST_1.0\");"); - - @DataDefs_v2 = (@DataDefs_v2, "int func_return_type_and_good_versioning_old(int param);"); - @Sources_v2 = (@Sources_v2, "int func_return_type_and_good_versioning_old(int param)\n{\n return 2^(sizeof(int)*8-1)-1;\n}\n__asm__(\".symver _Z40func_return_type_and_good_versioning_oldi,_Z36func_return_type_and_good_versioningi\@TEST_1.0\");"); - - @DataDefs_v2 = (@DataDefs_v2, "float func_return_type_and_good_versioning(int param);"); - @Sources_v2 = (@Sources_v2, "float func_return_type_and_good_versioning(int param)\n{\n return 0.7;\n}\n__asm__(\".symver _Z36func_return_type_and_good_versioningi,_Z36func_return_type_and_good_versioningi\@TEST_2.0\");"); - - #Return_Type and bad versioning - @DataDefs_v1 = (@DataDefs_v1, "int func_return_type_and_bad_versioning(int param);"); - @Sources_v1 = (@Sources_v1, "int func_return_type_and_bad_versioning(int param)\n{\n return 2^(sizeof(int)*8-1)-1;\n}\n__asm__(\".symver _Z35func_return_type_and_bad_versioningi,_Z35func_return_type_and_bad_versioningi\@TEST_1.0\");"); - - @DataDefs_v2 = (@DataDefs_v2, "float func_return_type_and_bad_versioning_old(int param);"); - @Sources_v2 = (@Sources_v2, "float func_return_type_and_bad_versioning_old(int param)\n{\n return 0.7;\n}\n__asm__(\".symver _Z39func_return_type_and_bad_versioning_oldi,_Z35func_return_type_and_bad_versioningi\@TEST_1.0\");"); - - @DataDefs_v2 = (@DataDefs_v2, "float func_return_type_and_bad_versioning(int param);"); - @Sources_v2 = (@Sources_v2, "float func_return_type_and_bad_versioning(int param)\n{\n return 0.7;\n}\n__asm__(\".symver _Z35func_return_type_and_bad_versioningi,_Z35func_return_type_and_bad_versioningi\@TEST_2.0\");"); - - #unnamed struct fields within structs - @DataDefs_v1 = (@DataDefs_v1, " -typedef struct { - int a; - struct { - int b; - float c; - }; - int d; -} type_test_unnamed; -int func_test_unnamed(type_test_unnamed param);"); - @Sources_v1 = (@Sources_v1, "int func_test_unnamed(type_test_unnamed param)\n{\n return 0;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, " -typedef struct { - int a; - struct { - long double b; - float c; - }; - int d; -} type_test_unnamed; -int func_test_unnamed(type_test_unnamed param);"); - @Sources_v2 = (@Sources_v2, "int func_test_unnamed(type_test_unnamed param)\n{\n return 0;\n}"); - - #constants - @DataDefs_v1 = (@DataDefs_v1, "#define TEST_PUBLIC_CONSTANT \"old_value\""); - @DataDefs_v2 = (@DataDefs_v2, "#define TEST_PUBLIC_CONSTANT \"new_value\""); - - @DataDefs_v1 = (@DataDefs_v1, "#define TEST_PRIVATE_CONSTANT \"old_value\"\n#undef TEST_PRIVATE_CONSTANT"); - @DataDefs_v2 = (@DataDefs_v2, "#define TEST_PRIVATE_CONSTANT \"new_value\"\n#undef TEST_PRIVATE_CONSTANT"); - - #unions - @DataDefs_v1 = (@DataDefs_v1, " -union type_test_union { - int a; - struct { - int b; - float c; - }; - int d; -}; -int func_test_union(type_test_union param);"); - @Sources_v1 = (@Sources_v1, "int func_test_union(type_test_union param)\n{\n return 0;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, " -union type_test_union { - int a; - long double new_member; - struct { - int b; - float c; - }; - int d; -}; -int func_test_union(type_test_union param);"); - @Sources_v2 = (@Sources_v2, "int func_test_union(type_test_union param)\n{\n return 0;\n}"); - - #typedefs - @DataDefs_v1 = (@DataDefs_v1, "typedef float TYPEDEF_TYPE;\nint func_parameter_typedef_change(TYPEDEF_TYPE param);"); - @Sources_v1 = (@Sources_v1, "int func_parameter_typedef_change(TYPEDEF_TYPE param)\n{\n return 1;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "typedef int TYPEDEF_TYPE;\nint func_parameter_typedef_change(TYPEDEF_TYPE param);"); - @Sources_v2 = (@Sources_v2, "int func_parameter_typedef_change(TYPEDEF_TYPE param)\n{\n return 1;\n}"); - - #typedefs in member type - @DataDefs_v1 = (@DataDefs_v1, "typedef float TYPEDEF_TYPE_2;\nstruct type_test_member_typedef_change{\n public:\nTYPEDEF_TYPE_2 m;};\nint func_test_member_typedef_change(type_test_member_typedef_change param);"); - @Sources_v1 = (@Sources_v1, "int func_test_member_typedef_change(type_test_member_typedef_change param)\n{\n return 1;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "typedef int TYPEDEF_TYPE_2;\nstruct type_test_member_typedef_change{\n public:\nTYPEDEF_TYPE_2 m;};\nint func_test_member_typedef_change(type_test_member_typedef_change param);"); - @Sources_v2 = (@Sources_v2, "int func_test_member_typedef_change(type_test_member_typedef_change param)\n{\n return 1;\n}"); - - create_TestSuite("abi_changes_test_cpp", "C++", join("\n\n", @DataDefs_v1), join("\n\n", @Sources_v1), join("\n\n", @DataDefs_v2), join("\n\n", @Sources_v2), "type_test_opaque", "_ZN18type_test_internal5func1ES_"); -} - -sub testSystem_c() -{ - print "\ntesting for C library changes\n"; - my (@DataDefs_v1, @Sources_v1, @DataDefs_v2, @Sources_v2) = (); - - #Withdrawn_Parameter - @DataDefs_v1 = (@DataDefs_v1, "int func_withdrawn_parameter(int param, int withdrawn_param);"); - @Sources_v1 = (@Sources_v1, "int func_withdrawn_parameter(int param, int withdrawn_param)\n{\n return 0;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "int func_withdrawn_parameter(int param);"); - @Sources_v2 = (@Sources_v2, "int func_withdrawn_parameter(int param)\n{\n return 0;\n}"); - - #Added_Parameter - @DataDefs_v1 = (@DataDefs_v1, "int func_added_parameter(int param);"); - @Sources_v1 = (@Sources_v1, "int func_added_parameter(int param)\n{\n return 0;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "int func_added_parameter(int param, int added_param);"); - @Sources_v2 = (@Sources_v2, "int func_added_parameter(int param, int added_param)\n{\n return 0;\n}"); - - #added function with typedef funcptr parameter - @DataDefs_v2 = (@DataDefs_v2, "typedef int (*FUNCPTR_TYPE)(int a, int b);\nint added_function_param_typedef_funcptr(FUNCPTR_TYPE*const** f);"); - @Sources_v2 = (@Sources_v2, "int added_function_param_typedef_funcptr(FUNCPTR_TYPE*const** f)\n{\n return 0;\n}"); - - #added function with funcptr parameter - @DataDefs_v2 = (@DataDefs_v2, "int added_function_param_funcptr(int(*func)(int, int));"); - @Sources_v2 = (@Sources_v2, "int added_function_param_funcptr(int(*func)(int, int))\n{\n return 0;\n}"); - - #added function with no limited parameters - @DataDefs_v2 = (@DataDefs_v2, "int added_function_nolimit_param(float p1, ...);"); - @Sources_v2 = (@Sources_v2, "int added_function_nolimit_param(float p1, ...)\n{\n return 0;\n}"); - - #size change - @DataDefs_v1 = (@DataDefs_v1, "struct type_test_size\n{\n long long i[5];\n long j;\n double k;\n struct type_test_size* p;\n};"); - @DataDefs_v1 = (@DataDefs_v1, "int func_test_type_size(struct type_test_size param, int param_2);"); - @Sources_v1 = (@Sources_v1, "int func_test_type_size(struct type_test_size param, int param_2)\n{\n return param_2;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "struct type_test_size\n{\n long long i[5];\n long long j;\n double k;\n struct type_test_size* p;\n};"); - @DataDefs_v2 = (@DataDefs_v2, "int func_test_type_size(struct type_test_size param, int param_2);"); - @Sources_v2 = (@Sources_v2, "int func_test_type_size(struct type_test_size param, int param_2)\n{\n return param_2;\n}"); - - #Added_Member_And_Size - @DataDefs_v1 = (@DataDefs_v1, "struct type_test_added_member\n{\n int i;\n long j;\n double k;\n struct type_test_added_member* p;\n};"); - @DataDefs_v1 = (@DataDefs_v1, "int func_test_added_member(struct type_test_added_member param, int param_2);"); - @Sources_v1 = (@Sources_v1, "int func_test_added_member(struct type_test_added_member param, int param_2)\n{\n return param_2;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "struct type_test_added_member\n{\n int i;\n long j;\n double k;\n struct type_test_added_member* p;\n int added_member;\n};"); - @DataDefs_v2 = (@DataDefs_v2, "int func_test_added_member(struct type_test_added_member param, int param_2);"); - @Sources_v2 = (@Sources_v2, "int func_test_added_member(struct type_test_added_member param, int param_2)\n{\n return param_2;\n}"); - - #Added_Middle_Member_And_Size - @DataDefs_v1 = (@DataDefs_v1, "struct type_test_added_middle_member\n{\n int i;\n long j;\n double k;\n struct type_test_added_member* p;\n};"); - @DataDefs_v1 = (@DataDefs_v1, "int func_test_added_middle_member(struct type_test_added_middle_member param, int param_2);"); - @Sources_v1 = (@Sources_v1, "int func_test_added_middle_member(struct type_test_added_middle_member param, int param_2)\n{\n return param_2;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "struct type_test_added_middle_member\n{\n int i;\n int added_middle_member;\n long j;\n double k;\n struct type_test_added_member* p;\n};"); - @DataDefs_v2 = (@DataDefs_v2, "int func_test_added_middle_member(struct type_test_added_middle_member param, int param_2);"); - @Sources_v2 = (@Sources_v2, "int func_test_added_middle_member(struct type_test_added_middle_member param, int param_2)\n{\n return param_2;\n}"); - - #Member_Rename - @DataDefs_v1 = (@DataDefs_v1, "struct type_test_member_rename\n{\n long i;\n long j;\n double k;\n struct type_test_member_rename* p;\n};"); - @DataDefs_v1 = (@DataDefs_v1, "int func_test_member_rename(struct type_test_member_rename param, int param_2);"); - @Sources_v1 = (@Sources_v1, "int func_test_member_rename(struct type_test_member_rename param, int param_2)\n{\n return param_2;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "struct type_test_member_rename\n{\n long renamed_member;\n long j;\n double k;\n struct type_test_member_rename* p;\n};"); - @DataDefs_v2 = (@DataDefs_v2, "int func_test_member_rename(struct type_test_member_rename param, int param_2);"); - @Sources_v2 = (@Sources_v2, "int func_test_member_rename(struct type_test_member_rename param, int param_2)\n{\n return param_2;\n}"); - - #Withdrawn_Member_And_Size - @DataDefs_v1 = (@DataDefs_v1, "struct type_test_withdrawn_member\n{\n int i;\n long j;\n double k;\n struct type_test_withdrawn_member* p;\n int withdrawn_member;\n};"); - @DataDefs_v1 = (@DataDefs_v1, "int func_test_withdrawn_member(struct type_test_withdrawn_member param, int param_2);"); - @Sources_v1 = (@Sources_v1, "int func_test_withdrawn_member(struct type_test_withdrawn_member param, int param_2)\n{\n return param_2;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "struct type_test_withdrawn_member\n{\n int i;\n long j;\n double k;\n struct type_test_withdrawn_member* p;\n};"); - @DataDefs_v2 = (@DataDefs_v2, "int func_test_withdrawn_member(struct type_test_withdrawn_member param, int param_2);"); - @Sources_v2 = (@Sources_v2, "int func_test_withdrawn_member(struct type_test_withdrawn_member param, int param_2)\n{\n return param_2;\n}"); - - #Withdrawn_Middle_Member - @DataDefs_v1 = (@DataDefs_v1, "struct type_test_withdrawn_middle_member\n{\n int i;\n int withdrawn_middle_member;\n long j;\n double k;\n struct type_test_withdrawn_middle_member* p;\n};"); - @DataDefs_v1 = (@DataDefs_v1, "int func_test_withdrawn_middle_member(struct type_test_withdrawn_middle_member param, int param_2);"); - @Sources_v1 = (@Sources_v1, "int func_test_withdrawn_middle_member(struct type_test_withdrawn_middle_member param, int param_2)\n{\n return param_2;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "struct type_test_withdrawn_middle_member\n{\n int i;\n long j;\n double k;\n struct type_test_withdrawn_middle_member* p;\n};"); - @DataDefs_v2 = (@DataDefs_v2, "int func_test_withdrawn_middle_member(struct type_test_withdrawn_middle_member param, int param_2);"); - @Sources_v2 = (@Sources_v2, "int func_test_withdrawn_middle_member(struct type_test_withdrawn_middle_member param, int param_2)\n{\n return param_2;\n}"); - - #Enum_Member_Value - @DataDefs_v1 = (@DataDefs_v1, "enum type_test_enum_member_value_change\n{\n MEMBER_1=1,\n MEMBER_2=2\n};"); - @DataDefs_v1 = (@DataDefs_v1, "int func_test_enum_member_value_change(enum type_test_enum_member_value_change param);"); - @Sources_v1 = (@Sources_v1, -"int func_test_enum_member_value_change(enum type_test_enum_member_value_change param) -{ - switch(param) - { - case 1: - return 1; - case 2: - return 2; - } - return 0; -}"); - - @DataDefs_v2 = (@DataDefs_v2, "enum type_test_enum_member_value_change\n{\n MEMBER_1=2,\n MEMBER_2=1\n};"); - @DataDefs_v2 = (@DataDefs_v2, "int func_test_enum_member_value_change(enum type_test_enum_member_value_change param);"); - @Sources_v2 = (@Sources_v2, -"int func_test_enum_member_value_change(enum type_test_enum_member_value_change param) -{ - switch(param) - { - case 1: - return 1; - case 2: - return 2; - } - return 0; -}"); - - #Enum_Member_Name - @DataDefs_v1 = (@DataDefs_v1, "enum type_test_enum_member_rename\n{\n BRANCH_1=1,\n BRANCH_2=2\n};"); - @DataDefs_v1 = (@DataDefs_v1, "int func_test_enum_member_rename(enum type_test_enum_member_rename param);"); - @Sources_v1 = (@Sources_v1, -"int func_test_enum_member_rename(enum type_test_enum_member_rename param) -{ - switch(param) - { - case 1: - return 1; - case 2: - return 2; - } - return 0; -}"); - - @DataDefs_v2 = (@DataDefs_v2, "enum type_test_enum_member_rename\n{\n BRANCH_FIRST=1,\n BRANCH_SECOND=1\n};"); - @DataDefs_v2 = (@DataDefs_v2, "int func_test_enum_member_rename(enum type_test_enum_member_rename param);"); - @Sources_v2 = (@Sources_v2, -"int func_test_enum_member_rename(enum type_test_enum_member_rename param) -{ - switch(param) - { - case 1: - return 1; - case 2: - return 2; - } - return 0; -}"); - - #Member_Type_And_Size - @DataDefs_v1 = (@DataDefs_v1, "struct type_test_member_type_and_size\n{\n int i;\n long j;\n double k;\n struct type_test_member_type_and_size* p;\n};"); - @DataDefs_v1 = (@DataDefs_v1, "int func_test_member_type_and_size(struct type_test_member_type_and_size param, int param_2);"); - @Sources_v1 = (@Sources_v1, "int func_test_member_type_and_size(struct type_test_member_type_and_size param, int param_2)\n{\n return param_2;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "struct type_test_member_type_and_size\n{\n int i;\n long j;\n long double k;\n struct type_test_member_type_and_size* p;\n};"); - @DataDefs_v2 = (@DataDefs_v2, "int func_test_member_type_and_size(struct type_test_member_type_and_size param, int param_2);"); - @Sources_v2 = (@Sources_v2, "int func_test_member_type_and_size(struct type_test_member_type_and_size param, int param_2)\n{\n return param_2;\n}"); - - #Member_Type - @DataDefs_v1 = (@DataDefs_v1, "struct type_test_member_type\n{\n int i;\n long j;\n double k;\n struct type_test_member_type* p;\n};"); - @DataDefs_v1 = (@DataDefs_v1, "int func_test_member_type(struct type_test_member_type param, int param_2);"); - @Sources_v1 = (@Sources_v1, "int func_test_member_type(struct type_test_member_type param, int param_2)\n{\n return param_2;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "struct type_test_member_type\n{\n float i;\n long j;\n double k;\n struct type_test_member_type* p;\n};"); - @DataDefs_v2 = (@DataDefs_v2, "int func_test_member_type(struct type_test_member_type param, int param_2);"); - @Sources_v2 = (@Sources_v2, "int func_test_member_type(struct type_test_member_type param, int param_2)\n{\n return param_2;\n}"); - - #Member_BaseType - @DataDefs_v1 = (@DataDefs_v1, "struct type_test_member_basetype\n{\n int i;\n long *j;\n double k;\n struct type_test_member_basetype* p;\n};"); - @DataDefs_v1 = (@DataDefs_v1, "int func_test_member_basetype(struct type_test_member_basetype param, int param_2);"); - @Sources_v1 = (@Sources_v1, "int func_test_member_basetype(struct type_test_member_basetype param, int param_2)\n{\n return param_2;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "struct type_test_member_basetype\n{\n int i;\n long long *j;\n double k;\n struct type_test_member_basetype* p;\n};"); - @DataDefs_v2 = (@DataDefs_v2, "int func_test_member_basetype(struct type_test_member_basetype param, int param_2);"); - @Sources_v2 = (@Sources_v2, "int func_test_member_basetype(struct type_test_member_basetype param, int param_2)\n{\n return param_2;\n}"); - - #Member_PointerLevel_And_Size - @DataDefs_v1 = (@DataDefs_v1, "struct type_test_member_pointerlevel_and_size\n{\n int i;\n long long j;\n double k;\n struct type_test_member_pointerlevel_and_size* p;\n};"); - @DataDefs_v1 = (@DataDefs_v1, "int func_test_member_pointerlevel_and_size(struct type_test_member_pointerlevel_and_size param, int param_2);"); - @Sources_v1 = (@Sources_v1, "int func_test_member_pointerlevel_and_size(struct type_test_member_pointerlevel_and_size param, int param_2)\n{\n return param_2;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "struct type_test_member_pointerlevel_and_size\n{\n int i;\n long long *j;\n double k;\n struct type_test_member_pointerlevel_and_size* p;\n};"); - @DataDefs_v2 = (@DataDefs_v2, "int func_test_member_pointerlevel_and_size(struct type_test_member_pointerlevel_and_size param, int param_2);"); - @Sources_v2 = (@Sources_v2, "int func_test_member_pointerlevel_and_size(struct type_test_member_pointerlevel_and_size param, int param_2)\n{\n return param_2;\n}"); - - #Member_PointerLevel - @DataDefs_v1 = (@DataDefs_v1, "struct type_test_member_pointerlevel\n{\n int i;\n long *j;\n double k;\n struct type_test_member_pointerlevel* p;\n};"); - @DataDefs_v1 = (@DataDefs_v1, "int func_test_member_pointerlevel(struct type_test_member_pointerlevel param, int param_2);"); - @Sources_v1 = (@Sources_v1, "int func_test_member_pointerlevel(struct type_test_member_pointerlevel param, int param_2)\n{\n return param_2;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "struct type_test_member_pointerlevel\n{\n int i;\n long **j;\n double k;\n struct type_test_member_pointerlevel* p;\n};"); - @DataDefs_v2 = (@DataDefs_v2, "int func_test_member_pointerlevel(struct type_test_member_pointerlevel param, int param_2);"); - @Sources_v2 = (@Sources_v2, "int func_test_member_pointerlevel(struct type_test_member_pointerlevel param, int param_2)\n{\n return param_2;\n}"); - - #Added_Interface - @DataDefs_v2 = (@DataDefs_v2, "int added_func(int param);"); - @Sources_v2 = (@Sources_v2, "int added_func(int param)\n{\n return param;\n}"); - - #Withdrawn_Interface - @DataDefs_v1 = (@DataDefs_v1, "int withdrawn_func(int param);"); - @Sources_v1 = (@Sources_v1, "int withdrawn_func(int param)\n{\n return param;\n}"); - - #Parameter_Type_And_Size - @DataDefs_v1 = (@DataDefs_v1, "int func_parameter_type_and_size(int param, int other_param);"); - @Sources_v1 = (@Sources_v1, "int func_parameter_type_and_size(int param, int other_param)\n{\n return other_param;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "int func_parameter_type_and_size(long long param, int other_param);"); - @Sources_v2 = (@Sources_v2, "int func_parameter_type_and_size(long long param, int other_param)\n{\n return other_param;\n}"); - - #Parameter_Type - @DataDefs_v1 = (@DataDefs_v1, "int func_parameter_type(int param, int other_param);"); - @Sources_v1 = (@Sources_v1, "int func_parameter_type(int param, int other_param)\n{\n return other_param;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "int func_parameter_type(float param, int other_param);"); - @Sources_v2 = (@Sources_v2, "int func_parameter_type(float param, int other_param)\n{\n return other_param;\n}"); - - #Parameter_BaseType (Typedef) - @DataDefs_v1 = (@DataDefs_v1, "typedef int* PARAM_TYPEDEF;\nint func_parameter_basetypechange_typedef(PARAM_TYPEDEF param);"); - @Sources_v1 = (@Sources_v1, "int func_parameter_basetypechange_typedef(PARAM_TYPEDEF param)\n{\n return 0;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "typedef const int* PARAM_TYPEDEF;\nint func_parameter_basetypechange_typedef(PARAM_TYPEDEF param);"); - @Sources_v2 = (@Sources_v2, "int func_parameter_basetypechange_typedef(PARAM_TYPEDEF param)\n{\n return 0;\n}"); - - #Parameter_BaseType - @DataDefs_v1 = (@DataDefs_v1, "int func_parameter_basetypechange(int *param);"); - @Sources_v1 = (@Sources_v1, "int func_parameter_basetypechange(int *param)\n{\n return sizeof(*param);\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "int func_parameter_basetypechange(long long *param);"); - @Sources_v2 = (@Sources_v2, "int func_parameter_basetypechange(long long *param)\n{\n return sizeof(*param);\n}"); - - #Parameter_PointerLevel_And_Size - @DataDefs_v1 = (@DataDefs_v1, "long long func_parameter_pointerlevel_and_size(long long param);"); - @Sources_v1 = (@Sources_v1, "long long func_parameter_pointerlevel_and_size(long long param)\n{\n return param;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "long long func_parameter_pointerlevel_and_size(long long *param);"); - @Sources_v2 = (@Sources_v2, "long long func_parameter_pointerlevel_and_size(long long *param)\n{\n return param[5];\n}"); - - #Parameter_PointerLevel - @DataDefs_v1 = (@DataDefs_v1, "int func_parameter_pointerlevel(int *param);"); - @Sources_v1 = (@Sources_v1, "int func_parameter_pointerlevel(int *param)\n{\n return param[5];\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "int func_parameter_pointerlevel(int **param);"); - @Sources_v2 = (@Sources_v2, "int func_parameter_pointerlevel(int **param)\n{\n return param[5][5];\n}"); - - #Return_Type_And_Size - @DataDefs_v1 = (@DataDefs_v1, "int func_return_type_and_size(int param);"); - @Sources_v1 = (@Sources_v1, "int func_return_type_and_size(int param)\n{\n return 2^(sizeof(int)*8-1)-1;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "long long func_return_type_and_size(int param);"); - @Sources_v2 = (@Sources_v2, "long long func_return_type_and_size(int param)\n{\n return 2^(sizeof(long long)*8-1)-1;\n}"); - - #Return_Type - @DataDefs_v1 = (@DataDefs_v1, "int func_return_type(int param);"); - @Sources_v1 = (@Sources_v1, "int func_return_type(int param)\n{\n return 2^(sizeof(int)*8-1)-1;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "float func_return_type(int param);"); - @Sources_v2 = (@Sources_v2, "float func_return_type(int param)\n{\n return 0.7;\n}"); - - #Return_BaseType - @DataDefs_v1 = (@DataDefs_v1, "int *func_return_basetypechange(int param);"); - @Sources_v1 = (@Sources_v1, "int *func_return_basetypechange(int param)\n{\n int *x = (int*)malloc(10*sizeof(int));\n *x = 2^(sizeof(int)*8-1)-1;\n return x;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "long long *func_return_basetypechange(int param);"); - @Sources_v2 = (@Sources_v2, "long long *func_return_basetypechange(int param)\n{\n long long *x = (long long*)malloc(10*sizeof(long long));\n *x = 2^(sizeof(long long)*8-1)-1;\n return x;\n}"); - - #Return_PointerLevel_And_Size - @DataDefs_v1 = (@DataDefs_v1, "long long func_return_pointerlevel_and_size(int param);"); - @Sources_v1 = (@Sources_v1, "long long func_return_pointerlevel_and_size(int param)\n{\n return 100;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "long long *func_return_pointerlevel_and_size(int param);"); - @Sources_v2 = (@Sources_v2, "long long *func_return_pointerlevel_and_size(int param)\n{\n long long *x = (long long*)malloc(10*sizeof(long long));\n *x = 2^(sizeof(long long)*8-1)-1;\n return x;\n}"); - - #Return_PointerLevel - @DataDefs_v1 = (@DataDefs_v1, "long long *func_return_pointerlevel(int param);"); - @Sources_v1 = (@Sources_v1, "long long *func_return_pointerlevel(int param)\n{\n long long *x = (long long*)malloc(10*sizeof(long long));\n *x = 2^(sizeof(long long)*8-1)-1;\n return x;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "long long **func_return_pointerlevel(int param);"); - @Sources_v2 = (@Sources_v2, "long long **func_return_pointerlevel(int param)\n{\n long long *x = (long long*)malloc(10*sizeof(long long));\n *x = 2^(sizeof(long long)*8-1)-1;\n long *y = (long*)malloc(sizeof(long long));\n *y=(long)&x;\n return (long long **)y;\n}"); - - #typedef to anon struct - @DataDefs_v1 = (@DataDefs_v1, " -typedef struct -{ - int i; - long j; - double k; -} type_test_anon_typedef; -int func_test_anon_typedef(type_test_anon_typedef param);"); - @Sources_v1 = (@Sources_v1, "int func_test_anon_typedef(type_test_anon_typedef param)\n{\n return 0;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, " -typedef struct -{ - int i; - long j; - double k; - union { - int dummy[256]; - struct { - char q_skiptable[256]; - const char *p; - int l; - } p; - }; -} type_test_anon_typedef; -int func_test_anon_typedef(type_test_anon_typedef param);"); - @Sources_v2 = (@Sources_v2, "int func_test_anon_typedef(type_test_anon_typedef param)\n{\n return 0;\n}"); - - #opaque type - @DataDefs_v1 = (@DataDefs_v1, "struct type_test_opaque\n{\n long long i[5];\n long j;\n double k;\n struct type_test_opaque* p;\n};"); - @DataDefs_v1 = (@DataDefs_v1, "int func_test_opaque(struct type_test_opaque param, int param_2);"); - @Sources_v1 = (@Sources_v1, "int func_test_opaque(struct type_test_opaque param, int param_2)\n{\n return param_2;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "struct type_test_opaque\n{\n long long i[5];\n long long j;\n double k;\n struct type_test_opaque* p;\n};"); - @DataDefs_v2 = (@DataDefs_v2, "int func_test_opaque(struct type_test_opaque param, int param_2);"); - @Sources_v2 = (@Sources_v2, "int func_test_opaque(struct type_test_opaque param, int param_2)\n{\n return param_2;\n}"); - - #internal function - @DataDefs_v1 = (@DataDefs_v1, "struct type_test_internal\n{\n long long i[5];\n long j;\n double k;\n struct type_test_internal* p;\n};"); - @DataDefs_v1 = (@DataDefs_v1, "int func_test_internal(struct type_test_internal param, int param_2);"); - @Sources_v1 = (@Sources_v1, "int func_test_internal(struct type_test_internal param, int param_2)\n{\n return param_2;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "struct type_test_internal\n{\n long long i[5];\n long long j;\n double k;\n struct type_test_internal* p;\n};"); - @DataDefs_v2 = (@DataDefs_v2, "int func_test_internal(struct type_test_internal param, int param_2);"); - @Sources_v2 = (@Sources_v2, "int func_test_internal(struct type_test_internal param, int param_2)\n{\n return param_2;\n}"); - - #starting versioning - @DataDefs_v1 = (@DataDefs_v1, "int func_return_type_and_start_versioning(int param);"); - @Sources_v1 = (@Sources_v1, "int func_return_type_and_start_versioning(int param)\n{\n return 2^(sizeof(int)*8-1)-1;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "int func_return_type_and_start_versioning(int param);"); - @Sources_v2 = (@Sources_v2, "int func_return_type_and_start_versioning(int param)\n{\n return 2^(sizeof(int)*8-1)-1;\n}\n__asm__(\".symver func_return_type_and_start_versioning,func_return_type_and_start_versioning\@TEST_2.0\");"); - - #Return_Type and good versioning - @DataDefs_v1 = (@DataDefs_v1, "int func_return_type_and_good_versioning(int param);"); - @Sources_v1 = (@Sources_v1, "int func_return_type_and_good_versioning(int param)\n{\n return 2^(sizeof(int)*8-1)-1;\n}\n__asm__(\".symver func_return_type_and_good_versioning,func_return_type_and_good_versioning\@TEST_1.0\");"); - - @DataDefs_v2 = (@DataDefs_v2, "int func_return_type_and_good_versioning_old(int param);"); - @Sources_v2 = (@Sources_v2, "int func_return_type_and_good_versioning_old(int param)\n{\n return 2^(sizeof(int)*8-1)-1;\n}\n__asm__(\".symver func_return_type_and_good_versioning_old,func_return_type_and_good_versioning\@TEST_1.0\");"); - - @DataDefs_v2 = (@DataDefs_v2, "float func_return_type_and_good_versioning(int param);"); - @Sources_v2 = (@Sources_v2, "float func_return_type_and_good_versioning(int param)\n{\n return 0.7;\n}\n__asm__(\".symver func_return_type_and_good_versioning,func_return_type_and_good_versioning\@TEST_2.0\");"); - - #Return_Type and bad versioning - @DataDefs_v1 = (@DataDefs_v1, "int func_return_type_and_bad_versioning(int param);"); - @Sources_v1 = (@Sources_v1, "int func_return_type_and_bad_versioning(int param)\n{\n return 2^(sizeof(int)*8-1)-1;\n}\n__asm__(\".symver func_return_type_and_bad_versioning,func_return_type_and_bad_versioning\@TEST_1.0\");"); - - @DataDefs_v2 = (@DataDefs_v2, "float func_return_type_and_bad_versioning_old(int param);"); - @Sources_v2 = (@Sources_v2, "float func_return_type_and_bad_versioning_old(int param)\n{\n return 0.7;\n}\n__asm__(\".symver func_return_type_and_bad_versioning_old,func_return_type_and_bad_versioning\@TEST_1.0\");"); - - @DataDefs_v2 = (@DataDefs_v2, "float func_return_type_and_bad_versioning(int param);"); - @Sources_v2 = (@Sources_v2, "float func_return_type_and_bad_versioning(int param)\n{\n return 0.7;\n}\n__asm__(\".symver func_return_type_and_bad_versioning,func_return_type_and_bad_versioning\@TEST_2.0\");"); - - #unnamed struct/union fields within structs/unions - @DataDefs_v1 = (@DataDefs_v1, " -typedef struct { - int a; - union { - int b; - float c; - }; - int d; -} type_test_unnamed; -int func_test_unnamed(type_test_unnamed param);"); - @Sources_v1 = (@Sources_v1, "int func_test_unnamed(type_test_unnamed param)\n{\n return 0;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, " -typedef struct { - int a; - union { - long double b; - float c; - }; - int d; -} type_test_unnamed; -int func_test_unnamed(type_test_unnamed param);"); - @Sources_v2 = (@Sources_v2, "int func_test_unnamed(type_test_unnamed param)\n{\n return 0;\n}"); - - #constants - @DataDefs_v1 = (@DataDefs_v1, "#define TEST_PUBLIC_CONSTANT \"old_value\""); - @DataDefs_v2 = (@DataDefs_v2, "#define TEST_PUBLIC_CONSTANT \"new_value\""); - - @DataDefs_v1 = (@DataDefs_v1, "#define TEST_PRIVATE_CONSTANT \"old_value\"\n#undef TEST_PRIVATE_CONSTANT"); - @DataDefs_v2 = (@DataDefs_v2, "#define TEST_PRIVATE_CONSTANT \"new_value\"\n#undef TEST_PRIVATE_CONSTANT"); - - #anon ptr typedef - @DataDefs_v1 = (@DataDefs_v1, " -#ifdef __cplusplus -extern \"C\" { -#endif -typedef struct { - int a; -} *type_test_anonptr_typedef; -extern __attribute__ ((visibility(\"default\"))) int func_test_anonptr_typedef(type_test_anonptr_typedef param); -#ifdef __cplusplus -} -#endif"); - @Sources_v1 = (@Sources_v1, "__attribute__ ((visibility(\"default\"))) int func_test_anonptr_typedef(type_test_anonptr_typedef param)\n{\n return 0;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, " -#ifdef __cplusplus -extern \"C\" { -#endif -typedef struct { - float a; -} *type_test_anonptr_typedef; -extern __attribute__ ((visibility(\"default\"))) int func_test_anonptr_typedef(type_test_anonptr_typedef param); -#ifdef __cplusplus -} -#endif"); - @Sources_v2 = (@Sources_v2, "__attribute__ ((visibility(\"default\"))) int func_test_anonptr_typedef(type_test_anonptr_typedef param)\n{\n return 0;\n}"); - - #typedefs - @DataDefs_v1 = (@DataDefs_v1, "typedef float TYPEDEF_TYPE;\nint func_parameter_typedef_change(TYPEDEF_TYPE param);"); - @Sources_v1 = (@Sources_v1, "int func_parameter_typedef_change(TYPEDEF_TYPE param)\n{\n return 1.0;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "typedef int TYPEDEF_TYPE;\nint func_parameter_typedef_change(TYPEDEF_TYPE param);"); - @Sources_v2 = (@Sources_v2, "int func_parameter_typedef_change(TYPEDEF_TYPE param)\n{\n return 1;\n}"); - - #typedefs in member type - @DataDefs_v1 = (@DataDefs_v1, "typedef float TYPEDEF_TYPE_2;\nstruct type_test_member_typedef_change{\nTYPEDEF_TYPE_2 m;};\nint func_test_member_typedef_change(struct type_test_member_typedef_change param);"); - @Sources_v1 = (@Sources_v1, "int func_test_member_typedef_change(struct type_test_member_typedef_change param)\n{\n return 1;\n}"); - - @DataDefs_v2 = (@DataDefs_v2, "typedef int TYPEDEF_TYPE_2;\nstruct type_test_member_typedef_change{\nTYPEDEF_TYPE_2 m;};\nint func_test_member_typedef_change(struct type_test_member_typedef_change param);"); - @Sources_v2 = (@Sources_v2, "int func_test_member_typedef_change(struct type_test_member_typedef_change param)\n{\n return 1;\n}"); - - create_TestSuite("abi_changes_test_c", "C", join("\n\n", @DataDefs_v1), join("\n\n", @Sources_v1), join("\n\n", @DataDefs_v2), join("\n\n", @Sources_v2), "type_test_opaque", "func_test_internal"); -} - -sub create_TestSuite($$$$$$$$) -{ - my ($Dir, $Lang, $DataDefs_v1, $Sources_v1, $DataDefs_v2, $Sources_v2, $Opaque, $Private) = @_; - my $Ext = ($Lang eq "C++")?"cpp":"c"; - my $Gcc = ($Lang eq "C++")?"g++":"gcc"; - #creating test suite - my $Path_v1 = "$Dir/lib_abi_changes_test.v1"; - my $Path_v2 = "$Dir/lib_abi_changes_test.v2"; - - system("rm", "-fr", $Path_v1, $Path_v2); - system("mkdir", "-p", $Path_v1, $Path_v2); - - writeFile("$Path_v1/version", "TEST_1.0 {\n};\nTEST_2.0 {\n};\n"); - writeFile("$Path_v1/lib_abi_changes_test.h", "#include \n".$DataDefs_v1."\n"); - writeFile("$Path_v1/lib_abi_changes_test.$Ext", "#include \"lib_abi_changes_test.h\"\n".$Sources_v1."\n"); - writeFile("$Dir/descriptor.v1", "\n 1.0.0\n\n\n\n ".$ENV{"PWD"}."/$Path_v1/\n\n\n\n ".$ENV{"PWD"}."/$Path_v1/\n\n\n\n $Opaque\n\n\n\n $Private\n\n\n\n ".$ENV{"PWD"}."/$Path_v1\n\n"); - - writeFile("$Path_v2/version", "TEST_1.0 {\n};\nTEST_2.0 {\n};\n"); - writeFile("$Path_v2/lib_abi_changes_test.h", "#include \n".$DataDefs_v2."\n"); - writeFile("$Path_v2/lib_abi_changes_test.$Ext", "#include \"lib_abi_changes_test.h\"\n".$Sources_v2."\n"); - writeFile("$Dir/descriptor.v2", "\n 2.0.0\n\n\n\n ".$ENV{"PWD"}."/$Path_v2/\n\n\n\n ".$ENV{"PWD"}."/$Path_v2/\n\n\n\n $Opaque\n\n\n\n $Private\n\n\n\n ".$ENV{"PWD"}."/$Path_v2\n\n"); - - system("$Gcc $Path_v1/lib_abi_changes_test.h"); - if($?) - { - print "ERROR: can't compile \'$Path_v1/lib_abi_changes_test.h\'\n"; - return; - } - system("$Gcc -Wl,--version-script $Path_v1/version -shared $Path_v1/lib_abi_changes_test.$Ext -o $Path_v1/lib_abi_changes_test.so"); - if($?) - { - print "ERROR: can't compile \'$Path_v1/lib_abi_changes_test.$Ext\'\n"; - return; - } - system("$Gcc $Path_v2/lib_abi_changes_test.h"); - if($?) - { - print "ERROR: can't compile \'$Path_v2/lib_abi_changes_test.h\'\n"; - return; - } - system("$Gcc -Wl,--version-script $Path_v2/version -shared $Path_v2/lib_abi_changes_test.$Ext -o $Path_v2/lib_abi_changes_test.so"); - if($?) - { - print "ERROR: can't compile \'$Path_v2/lib_abi_changes_test.$Ext\'\n"; - return; - } - - #running abi-compliance-checker - system("$0 -l lib_$Dir -d1 $Dir/descriptor.v1 -d2 $Dir/descriptor.v2"); -} - -sub writeFile($$) -{ - my ($Path, $Content) = @_; - return if(not $Path); - open (FILE, ">".$Path) || die ("Can't open file $Path\n"); - print FILE $Content; - close(FILE); -} - -sub readFile($) -{ - my $Path = $_[0]; - return "" if(not $Path or not -f $Path); - open (FILE, $Path); - my $Content = join("\n", ); - close(FILE); - return toUnix($Content); -} - -sub toUnix($) -{ - my $Text = $_[0]; - $Text=~s/\r//g; - return $Text; -} - -sub getArch() -{ - my $Arch = $ENV{"CPU"}; - if(not $Arch) - { - $Arch = `uname -m`; - chomp($Arch); - } - if(not $Arch) - { - $Arch = `uname -p`; - chomp($Arch); - } - $Arch = "x86" if($Arch =~ /i[3-7]86/); - return $Arch; -} - -sub get_Report_Header() -{ - my $Report_Header = "

ABI compliance report for the library $TargetLibraryName from version ".$Descriptor{1}{"Version"}." to ".$Descriptor{2}{"Version"}." on ".getArch()." ".(($AppPath)?"relating to the portability of application ".get_FileName($AppPath)."":"")."

\n"; - return "\n".$Report_Header."\n"; -} - -sub get_SourceInfo() -{ - my $CheckedHeaders = "\n

Checked header files (".keys(%{$Headers{1}}).")

\n"; - foreach my $Header_Dest (sort {lc($Headers{1}{$a}{"Name"}) cmp lc($Headers{1}{$b}{"Name"})} keys(%{$Headers{1}})) - { - my $Header_Name = $Headers{1}{$Header_Dest}{"Name"}; - my $Dest_Count = keys(%{$HeaderName_Destinations{1}{$Header_Name}}); - my $Identity = $Headers{1}{$Header_Dest}{"Identity"}; - my $Dest_Comment = ($Dest_Count>1 and $Identity=~/\//)?" ($Identity)":""; - $CheckedHeaders .= "$Header_Name"."$Dest_Comment
\n"; - } - $CheckedHeaders .= "
to the top
\n"; - my $CheckedLibs = "\n

Checked shared objects (".keys(%{$SoNames_All{1}}).")

\n"; - foreach my $Library (sort {lc($a) cmp lc($b)} keys(%{$SoNames_All{1}})) - { - $CheckedLibs .= "$Library
\n"; - } - $CheckedLibs .= "
to the top
\n"; - return $CheckedHeaders.$CheckedLibs; -} - -sub get_TypeProblems_Count($$) -{ - my ($TypeChanges, $TargetPriority) = @_; - my $Type_Problems_Count = 0; - foreach my $TypeName (sort keys(%{$TypeChanges})) - { - my %Kinds_Target = (); - foreach my $Kind (keys(%{$TypeChanges->{$TypeName}})) - { - foreach my $Location (keys(%{$TypeChanges->{$TypeName}{$Kind}})) - { - my $Priority = $TypeChanges->{$TypeName}{$Kind}{$Location}{"Priority"}; - next if($Priority ne $TargetPriority); - my $Target = $TypeChanges->{$TypeName}{$Kind}{$Location}{"Target"}; - next if($Kinds_Target{$Kind}{$Target}); - $Kinds_Target{$Kind}{$Target} = 1; - $Type_Problems_Count += 1; - } - } - } - return $Type_Problems_Count; -} - -sub get_Summary() -{ - my ($Added, $Withdrawn, $I_Problems_High, $I_Problems_Medium, $I_Problems_Low, $T_Problems_High, $T_Problems_Medium, $T_Problems_Low) = (0,0,0,0,0,0,0,0); - foreach my $Interface (sort keys(%CompatProblems)) - { - foreach my $Kind (sort keys(%{$CompatProblems{$Interface}})) - { - if($InterfaceProblems_Kind{$Kind}) - { - foreach my $Location (sort keys(%{$CompatProblems{$Interface}{$Kind}})) - { - if($Kind eq "Added_Interface") - { - $Added += 1; - } - elsif($Kind eq "Withdrawn_Interface") - { - $Withdrawn += 1; - } - else - { - if($CompatProblems{$Interface}{$Kind}{$Location}{"Priority"} eq "High") - { - $I_Problems_High += 1; - } - elsif($CompatProblems{$Interface}{$Kind}{$Location}{"Priority"} eq "Medium") - { - $I_Problems_Medium += 1; - } - elsif($CompatProblems{$Interface}{$Kind}{$Location}{"Priority"} eq "Low") - { - $I_Problems_Low += 1; - } - } - } - } - } - } - - my (%TypeChanges, %Type_MaxPriority); - foreach my $Interface (sort keys(%CompatProblems)) - { - foreach my $Kind (keys(%{$CompatProblems{$Interface}})) - { - if($TypeProblems_Kind{$Kind}) - { - foreach my $Location (keys(%{$CompatProblems{$Interface}{$Kind}})) - { - my $Type_Name = $CompatProblems{$Interface}{$Kind}{$Location}{"Type_Name"}; - my $Priority = $CompatProblems{$Interface}{$Kind}{$Location}{"Priority"}; - %{$TypeChanges{$Type_Name}{$Kind}{$Location}} = %{$CompatProblems{$Interface}{$Kind}{$Location}}; - $Type_MaxPriority{$Type_Name}{$Kind} = max_priority($Type_MaxPriority{$Type_Name}{$Kind}, $Priority); - } - } - } - } - - foreach my $Type_Name (keys(%TypeChanges)) - { - foreach my $Kind (keys(%{$TypeChanges{$Type_Name}})) - { - foreach my $Location (keys(%{$TypeChanges{$Type_Name}{$Kind}})) - { - my $Priority = $TypeChanges{$Type_Name}{$Kind}{$Location}{"Priority"}; - if(cmp_priority($Type_MaxPriority{$Type_Name}{$Kind}, $Priority)) - { - delete($TypeChanges{$Type_Name}{$Kind}{$Location}); - } - } - } - } - - $T_Problems_High = get_TypeProblems_Count(\%TypeChanges, "High"); - $T_Problems_Medium = get_TypeProblems_Count(\%TypeChanges, "Medium"); - $T_Problems_Low = get_TypeProblems_Count(\%TypeChanges, "Low"); - - #summary - my $Summary = "

Summary

"; - $Summary .= ""; - - - my $Checked_Headers_Link = "0"; - $Checked_Headers_Link = "".keys(%{$Headers{1}})."" if(keys(%{$Headers{1}})>0); - $Summary .= ""; - - my $Checked_Libs_Link = "0"; - $Checked_Libs_Link = "".keys(%{$SoNames_All{1}})."" if(keys(%{$SoNames_All{1}})>0); - $Summary .= ""; - $Summary .= ""; - - my $Verdict = "Compatible"; - $Verdict = "Incompatible" if(($Withdrawn>0) or ($I_Problems_High>0) or ($T_Problems_High>0)); - $Summary .= ""; - - $Summary .= "
Total header files checked$Checked_Headers_Link
Total shared objects checked$Checked_Libs_Link
Total interfaces / types checked".keys(%CheckedInterfaces)." / ".keys(%CheckedTypes)."
Verdict$Verdict
\n"; - - #problem summary - my $Problem_Summary = "

Problem Summary

"; - $Problem_Summary .= ""; - - my $Added_Link = "0"; - $Added_Link = "$Added" if($Added>0); - $Problem_Summary .= ""; - - my $WIthdrawn_Link = "0"; - $WIthdrawn_Link = "$Withdrawn" if($Withdrawn>0); - $Problem_Summary .= ""; - - my $TH_Link = "0"; - $TH_Link = "$T_Problems_High" if($T_Problems_High>0); - $Problem_Summary .= ""; - - my $TM_Link = "0"; - $TM_Link = "$T_Problems_Medium" if($T_Problems_Medium>0); - $Problem_Summary .= ""; - - my $TL_Link = "0"; - $TL_Link = "$T_Problems_Low" if($T_Problems_Low>0); - $Problem_Summary .= ""; - - my $IH_Link = "0"; - $IH_Link = "$I_Problems_High" if($I_Problems_High>0); - $Problem_Summary .= ""; - - my $IM_Link = "0"; - $IM_Link = "$I_Problems_Medium" if($I_Problems_Medium>0); - $Problem_Summary .= ""; - - my $IL_Link = "0"; - $IL_Link = "$I_Problems_Low" if($I_Problems_Low>0); - $Problem_Summary .= ""; - - my $ChangedConstants_Link = "0"; - $ChangedConstants_Link = "".keys(%ConstantProblems)."" if(keys(%ConstantProblems)>0); - $Problem_Summary .= ""; - - $Problem_Summary .= "
Added interfaces$Added_Link
Withdrawn interfaces$WIthdrawn_Link
Problems in
Data Types		High risk$TH_Link
Medium risk$TM_Link
Low risk$TL_Link
Interface
problems		High risk$IH_Link
Medium risk$IM_Link
Low risk$IL_Link
Constants Problems$ChangedConstants_Link
\n"; - return "\n".$Summary.$Problem_Summary."\n"; -} - -sub get_Report_ChangedConstants() -{ - my ($CHANGED_CONSTANTS, %HeaderConstant); - foreach my $Name (keys(%ConstantProblems)) - { - $HeaderConstant{$ConstantProblems{$Name}{"Header"}}{$Name} = 1; - } - my $Constants_Number = 0; - foreach my $HeaderName (sort {lc($a) cmp lc($b)} keys(%HeaderConstant)) - { - $CHANGED_CONSTANTS .= "$HeaderName
\n"; - foreach my $Name (sort {lc($a) cmp lc($b)} keys(%{$HeaderConstant{$HeaderName}})) - { - $Constants_Number += 1; - my $Old_Value = htmlSpecChars($ConstantProblems{$Name}{"Old_Value"}); - my $New_Value = htmlSpecChars($ConstantProblems{$Name}{"New_Value"}); - my $Incompatibility = "The value of constant $Name has been changed from $Old_Value to $New_Value."; - my $Effect = "If application uses this constant as a parameter of some interface than its execution may change."; - my $ConstantProblemsReport = "1".$Incompatibility."$Effect\n"; - $CHANGED_CONSTANTS .= $ContentSpanStart."[+] ".$Name.$ContentSpanEnd."
\n$ContentDivStart$ConstantProblemsReport
IncompatibilityEffect

$ContentDivEnd\n"; - $CHANGED_CONSTANTS = insertIDs($CHANGED_CONSTANTS); - } - $CHANGED_CONSTANTS .= "
\n"; - } - if($CHANGED_CONSTANTS) - { - $CHANGED_CONSTANTS = "

Constants Problems ($Constants_Number)

\n"."\n".$CHANGED_CONSTANTS."\n"."to the top
\n"; - } - return $CHANGED_CONSTANTS; -} - -sub get_Report_Added() -{ - my $ADDED_INTERFACES; - #added interfaces - my %FuncAddedInHeaderLib; - foreach my $Interface (sort keys(%CompatProblems)) - { - foreach my $Kind (sort keys(%{$CompatProblems{$Interface}})) - { - foreach my $Location (sort keys(%{$CompatProblems{$Interface}{$Kind}})) - { - if($Kind eq "Added_Interface") - { - $FuncAddedInHeaderLib{$CompatProblems{$Interface}{$Kind}{$Location}{"Header"}}{$CompatProblems{$Interface}{$Kind}{$Location}{"New_SoName"}}{$Interface} = 1; - last; - } - } - } - } - my $Added_Number = 0; - foreach my $HeaderName (sort {lc($a) cmp lc($b)} keys(%FuncAddedInHeaderLib)) - { - foreach my $SoName (sort {lc($a) cmp lc($b)} keys(%{$FuncAddedInHeaderLib{$HeaderName}})) - { - if($HeaderName) - { - $ADDED_INTERFACES .= "$HeaderName, $SoName
\n"; - } - else - { - $ADDED_INTERFACES .= "$SoName
\n"; - } - foreach my $Interface (sort {lc($CompatProblems{$a}{"Added_Interface"}{"SharedLibrary"}{"Signature"}) cmp lc($CompatProblems{$b}{"Added_Interface"}{"SharedLibrary"}{"Signature"})} keys(%{$FuncAddedInHeaderLib{$HeaderName}{$SoName}})) - { - $Added_Number += 1; - my $SubReport = ""; - my $Signature = $CompatProblems{$Interface}{"Added_Interface"}{"SharedLibrary"}{"Signature"}; - if($Interface =~ /\A_Z/) - { - if($Signature) - { - $SubReport = insertIDs($ContentSpanStart.highLight_Signature_Italic_Color(htmlSpecChars($Signature)).$ContentSpanEnd."
\n".$ContentDivStart."[ symbol: $Interface ]

".$ContentDivEnd."\n"); - } - else - { - $SubReport = "".$Interface.""."
\n"; - } - } - else - { - if($Signature) - { - $SubReport = "".highLight_Signature_Italic_Color($Signature).""."
\n"; - } - else - { - $SubReport = "".$Interface.""."
\n"; - } - } - $ADDED_INTERFACES .= $SubReport; - } - $ADDED_INTERFACES .= "
\n"; - } - } - if($ADDED_INTERFACES) - { - $ADDED_INTERFACES = "

Added Interfaces ($Added_Number)

\n"."\n".$ADDED_INTERFACES."\n"."to the top
\n"; - } - return $ADDED_INTERFACES; -} - -sub get_Report_Withdrawn() -{ - my $WITHDRAWN_INTERFACES; - #withdrawn interfaces - my %FuncWithdrawnFromHeaderLib; - foreach my $Interface (sort keys(%CompatProblems)) - { - foreach my $Kind (sort keys(%{$CompatProblems{$Interface}})) - { - foreach my $Location (sort keys(%{$CompatProblems{$Interface}{$Kind}})) - { - if($Kind eq "Withdrawn_Interface") - { - $FuncWithdrawnFromHeaderLib{$CompatProblems{$Interface}{$Kind}{$Location}{"Header"}}{$CompatProblems{$Interface}{$Kind}{$Location}{"Old_SoName"}}{$Interface} = 1; - last; - } - } - } - } - my $Withdrawn_Number = 0; - foreach my $HeaderName (sort {lc($a) cmp lc($b)} keys(%FuncWithdrawnFromHeaderLib)) - { - foreach my $SoName (sort {lc($a) cmp lc($b)} keys(%{$FuncWithdrawnFromHeaderLib{$HeaderName}})) - { - if($HeaderName) - { - $WITHDRAWN_INTERFACES .= "$HeaderName, $SoName
\n"; - } - else - { - $WITHDRAWN_INTERFACES .= "$SoName
\n"; - } - foreach my $Interface (sort {lc($CompatProblems{$a}{"Withdrawn_Interface"}{"SharedLibrary"}{"Signature"}) cmp lc($CompatProblems{$b}{"Withdrawn_Interface"}{"SharedLibrary"}{"Signature"})} keys(%{$FuncWithdrawnFromHeaderLib{$HeaderName}{$SoName}})) - { - $Withdrawn_Number += 1; - my $SubReport = ""; - my $Signature = $CompatProblems{$Interface}{"Withdrawn_Interface"}{"SharedLibrary"}{"Signature"}; - if($Interface =~ /\A_Z/) - { - if($Signature) - { - $SubReport = insertIDs($ContentSpanStart.highLight_Signature_Italic_Color(htmlSpecChars($Signature)).$ContentSpanEnd."
\n".$ContentDivStart."[ symbol: $Interface ]

".$ContentDivEnd."\n"); - } - else - { - $SubReport = "".$Interface.""."
\n"; - } - } - else - { - if($Signature) - { - $SubReport = "".highLight_Signature_Italic_Color($Signature).""."
\n"; - } - else - { - $SubReport = "".$Interface.""."
\n"; - } - } - $WITHDRAWN_INTERFACES .= $SubReport; - } - $WITHDRAWN_INTERFACES .= "
\n"; - } - } - if($WITHDRAWN_INTERFACES) - { - $WITHDRAWN_INTERFACES = "

Withdrawn Interfaces ($Withdrawn_Number)

\n"."\n".$WITHDRAWN_INTERFACES."\n"."to the top
\n"; - } - return $WITHDRAWN_INTERFACES; -} - -sub get_Report_InterfaceProblems($) -{ - my $TargetPriority = $_[0]; - my ($INTERFACE_PROBLEMS, %FuncHeaderLib); - foreach my $Interface (sort keys(%CompatProblems)) - { - foreach my $Kind (sort keys(%{$CompatProblems{$Interface}})) - { - if($InterfaceProblems_Kind{$Kind} and ($Kind ne "Added_Interface") and ($Kind ne "Withdrawn_Interface")) - { - foreach my $Location (sort keys(%{$CompatProblems{$Interface}{$Kind}})) - { - my $SoName = $CompatProblems{$Interface}{$Kind}{$Location}{"Old_SoName"}; - my $HeaderName = $CompatProblems{$Interface}{$Kind}{$Location}{"Header"}; - $FuncHeaderLib{$HeaderName}{$SoName}{$Interface} = 1; - last; - } - } - } - } - my $Problems_Number = 0; - #interface problems - foreach my $HeaderName (sort {lc($a) cmp lc($b)} keys(%FuncHeaderLib)) - { - foreach my $SoName (sort {lc($a) cmp lc($b)} keys(%{$FuncHeaderLib{$HeaderName}})) - { - my $HEADER_LIB_REPORT = ""; - foreach my $Interface (sort {lc($tr_name{$a}) cmp lc($tr_name{$b})} keys(%{$FuncHeaderLib{$HeaderName}{$SoName}})) - { - my $Signature = ""; - my $InterfaceProblemsReport = ""; - my $ProblemNum = 1; - foreach my $Kind (keys(%{$CompatProblems{$Interface}})) - { - foreach my $Location (keys(%{$CompatProblems{$Interface}{$Kind}})) - { - my $Incompatibility = ""; - my $Effect = ""; - my $Old_Value = htmlSpecChars($CompatProblems{$Interface}{$Kind}{$Location}{"Old_Value"}); - my $New_Value = htmlSpecChars($CompatProblems{$Interface}{$Kind}{$Location}{"New_Value"}); - my $Priority = $CompatProblems{$Interface}{$Kind}{$Location}{"Priority"}; - my $Target = $CompatProblems{$Interface}{$Kind}{$Location}{"Target"}; - my $Old_Size = $CompatProblems{$Interface}{$Kind}{$Location}{"Old_Size"}; - my $New_Size = $CompatProblems{$Interface}{$Kind}{$Location}{"New_Size"}; - my $InitialType_Type = $CompatProblems{$Interface}{$Kind}{$Location}{"InitialType_Type"}; - my $Parameter_Position = $CompatProblems{$Interface}{$Kind}{$Location}{"Parameter_Position"}; - my $Parameter_Position_Str = num_to_str($Parameter_Position + 1); - $Signature = $CompatProblems{$Interface}{$Kind}{$Location}{"Signature"} if(not $Signature); - next if($Priority ne $TargetPriority); - if($Kind eq "Function_Become_Static") - { - $Incompatibility = "Function become static.\n"; - $Effect = "Layout of parameter's stack has been changed and therefore parameters in higher positions in the stack may be incorrectly initialized by applications."; - } - elsif($Kind eq "Function_Become_NonStatic") - { - $Incompatibility = "Function become non-static.\n"; - $Effect = "Layout of parameter's stack has been changed and therefore parameters in higher positions in the stack may be incorrectly initialized by applications."; - } - elsif($Kind eq "Parameter_Type_And_Size") - { - $Incompatibility = "Type of $Parameter_Position_Str parameter $Target has been changed from $Old_Value ($Old_Size bytes) to $New_Value ($New_Size bytes).\n"; - $Effect = "Layout of parameter's stack has been changed and therefore parameters in higher positions in the stack may be incorrectly initialized by applications."; - } - elsif($Kind eq "Parameter_Type") - { - $Incompatibility = "Type of $Parameter_Position_Str parameter $Target has been changed from $Old_Value to $New_Value.\n"; - $Effect = "Replacement of parameter data type may indicate a change in the semantic meaning of this parameter."; - } - elsif($Kind eq "Withdrawn_Parameter") - { - $Incompatibility = "$Parameter_Position_Str parameter $Target has been withdrawn from the interface signature.\n"; - $Effect = "This parameter will be ignored by the interface."; - } - elsif($Kind eq "Added_Parameter") - { - $Incompatibility = "$Parameter_Position_Str parameter $Target has been added to the interface signature.\n"; - $Effect = "This parameter will not be initialized by applications."; - } - elsif($Kind eq "Parameter_BaseType_And_Size") - { - if($InitialType_Type eq "Pointer") - { - $Incompatibility = "Base type of $Parameter_Position_Str parameter $Target (pointer) has been changed from $Old_Value ($Old_Size bytes) to $New_Value ($New_Size bytes).\n"; - $Effect = "Memory stored by pointer may be incorrectly initialized by applications."; - } - else - { - $Incompatibility = "Base type of $Parameter_Position_Str parameter $Target has been changed from $Old_Value ($Old_Size bytes) to $New_Value ($New_Size bytes).\n"; - $Effect = "Layout of parameter's stack has been changed and therefore parameters in higher positions in the stack may be incorrectly initialized by applications."; - } - } - elsif($Kind eq "Parameter_BaseType") - { - if($InitialType_Type eq "Pointer") - { - $Incompatibility = "Base type of $Parameter_Position_Str parameter $Target (pointer) has been changed from $Old_Value to $New_Value.\n"; - $Effect = "Memory stored by pointer may be incorrectly initialized by applications."; - } - else - { - $Incompatibility = "Base type of $Parameter_Position_Str parameter $Target has been changed from $Old_Value to $New_Value.\n"; - $Effect = "Replacement of parameter base type may indicate a change in the semantic meaning of this parameter."; - } - } - elsif($Kind eq "Parameter_PointerLevel") - { - $Incompatibility = "Type pointer level of $Parameter_Position_Str parameter $Target has been changed from $Old_Value to $New_Value.\n"; - $Effect = "Possible incorrect initialization of $Parameter_Position_Str parameter $Target by applications."; - } - elsif($Kind eq "Return_Type_And_Size") - { - $Incompatibility = "Type of return value has been changed from $Old_Value ($Old_Size bytes) to $New_Value ($New_Size bytes).\n"; - $Effect = "Applications will get a different return value and execution may change."; - } - elsif($Kind eq "Return_Type") - { - $Incompatibility = "Type of return value has been changed from $Old_Value to $New_Value.\n"; - $Effect = "Replacement of return type may indicate a change in its semantic meaning."; - } - elsif($Kind eq "Return_BaseType_And_Size") - { - $Incompatibility = "Base type of return value has been changed from $Old_Value ($Old_Size bytes) to $New_Value ($New_Size bytes).\n"; - $Effect = "Applications will get a different return value and execution may change."; - } - elsif($Kind eq "Return_BaseType") - { - $Incompatibility = "Base type of return value has been changed from $Old_Value to $New_Value.\n"; - $Effect = "Replacement of return base type may indicate a change in its semantic meaning."; - } - elsif($Kind eq "Return_PointerLevel") - { - $Incompatibility = "Type pointer level of return value has been changed from $Old_Value to $New_Value.\n"; - $Effect = "Applications will get a different return value and execution may change."; - } - if($Incompatibility) - { - $InterfaceProblemsReport .= "$ProblemNum".$Incompatibility."".$Effect."\n"; - $ProblemNum += 1; - $Problems_Number += 1; - } - } - } - $ProblemNum -= 1; - if($InterfaceProblemsReport) - { - if($Interface =~ /\A_Z/) - { - if($Signature) - { - $HEADER_LIB_REPORT .= $ContentSpanStart."[+] ".highLight_Signature_Italic_Color(htmlSpecChars($Signature))." ($ProblemNum)".$ContentSpanEnd."
\n$ContentDivStart[ symbol: $Interface ]
\n"; - } - else - { - $HEADER_LIB_REPORT .= $ContentSpanStart."[+] ".$Interface." ($ProblemNum)".$ContentSpanEnd."
\n$ContentDivStart\n"; - } - } - else - { - if($Signature) - { - $HEADER_LIB_REPORT .= $ContentSpanStart."[+] ".highLight_Signature_Italic_Color(htmlSpecChars($Signature))." ($ProblemNum)".$ContentSpanEnd."
\n$ContentDivStart\n"; - } - else - { - $HEADER_LIB_REPORT .= $ContentSpanStart."[+] ".$Interface." ($ProblemNum)".$ContentSpanEnd."
\n$ContentDivStart\n"; - } - } - $HEADER_LIB_REPORT .= "$InterfaceProblemsReport
IncompatibilityEffect

$ContentDivEnd\n"; - $HEADER_LIB_REPORT = insertIDs($HEADER_LIB_REPORT); - } - } - if($HEADER_LIB_REPORT) - { - $INTERFACE_PROBLEMS .= "$HeaderName, $SoName
\n".$HEADER_LIB_REPORT."
"; - } - } - } - if($INTERFACE_PROBLEMS) - { - $INTERFACE_PROBLEMS = "\n

Interface problems, $TargetPriority risk ($Problems_Number)

\n"."\n".$INTERFACE_PROBLEMS."\n"."to the top
\n"; - } - return $INTERFACE_PROBLEMS; -} - -sub get_Report_TypeProblems($) -{ - my $TargetPriority = $_[0]; - my ($TYPE_PROBLEMS, %TypeHeader, %TypeChanges, %Type_MaxPriority) = (); - foreach my $Interface (sort keys(%CompatProblems)) - { - foreach my $Kind (keys(%{$CompatProblems{$Interface}})) - { - if($TypeProblems_Kind{$Kind}) - { - foreach my $Location (keys(%{$CompatProblems{$Interface}{$Kind}})) - { - my $Type_Name = $CompatProblems{$Interface}{$Kind}{$Location}{"Type_Name"}; - my $Priority = $CompatProblems{$Interface}{$Kind}{$Location}{"Priority"}; - my $Type_Header = $CompatProblems{$Interface}{$Kind}{$Location}{"Header"}; - %{$TypeChanges{$Type_Name}{$Kind}{$Location}} = %{$CompatProblems{$Interface}{$Kind}{$Location}}; - $TypeHeader{$Type_Header}{$Type_Name} = 1; - $Type_MaxPriority{$Type_Name}{$Kind} = max_priority($Type_MaxPriority{$Type_Name}{$Kind}, $Priority); - } - } - } - } - foreach my $Type_Name (keys(%TypeChanges)) - { - foreach my $Kind (keys(%{$TypeChanges{$Type_Name}})) - { - foreach my $Location (keys(%{$TypeChanges{$Type_Name}{$Kind}})) - { - my $Priority = $TypeChanges{$Type_Name}{$Kind}{$Location}{"Priority"}; - if(cmp_priority($Type_MaxPriority{$Type_Name}{$Kind}, $Priority)) - { - delete($TypeChanges{$Type_Name}{$Kind}{$Location}); - } - } - } - } - my $Problems_Number = 0; - foreach my $HeaderName (sort {lc($a) cmp lc($b)} keys(%TypeHeader)) - { - my $HEADER_REPORT = ""; - foreach my $TypeName (sort {lc($a) cmp lc($b)} keys(%{$TypeHeader{$HeaderName}})) - { - my $ProblemNum = 1; - my $TypeProblemsReport = ""; - my %Kinds_Locations = (); - my %Kinds_Target = (); - foreach my $Kind (keys(%{$TypeChanges{$TypeName}})) - { - foreach my $Location (keys(%{$TypeChanges{$TypeName}{$Kind}})) - { - my $Priority = $TypeChanges{$TypeName}{$Kind}{$Location}{"Priority"}; - next if($Priority ne $TargetPriority); - $Kinds_Locations{$Kind}{$Location} = 1; - my $Incompatibility = ""; - my $Effect = ""; - my $Target = $TypeChanges{$TypeName}{$Kind}{$Location}{"Target"}; - next if($Kinds_Target{$Kind}{$Target}); - $Kinds_Target{$Kind}{$Target} = 1; - my $Old_Value = htmlSpecChars($TypeChanges{$TypeName}{$Kind}{$Location}{"Old_Value"}); - my $New_Value = htmlSpecChars($TypeChanges{$TypeName}{$Kind}{$Location}{"New_Value"}); - my $Old_Size = $TypeChanges{$TypeName}{$Kind}{$Location}{"Old_Size"}; - my $New_Size = $TypeChanges{$TypeName}{$Kind}{$Location}{"New_Size"}; - my $Type_Type = $TypeChanges{$TypeName}{$Kind}{$Location}{"Type_Type"}; - my $InitialType_Type = $TypeChanges{$TypeName}{$Kind}{$Location}{"InitialType_Type"}; - - if($Kind eq "Added_Virtual_Function") - { - $Incompatibility = "Virtual method "."".highLight_Signature(htmlSpecChars($Target)).""." has been added to this class and therefore the layout of virtual table has been changed."; - $Effect = "Call of any virtual method in this class or its subclasses will result in crash of application."; - } - elsif($Kind eq "Withdrawn_Virtual_Function") - { - $Incompatibility = "Virtual method "."".highLight_Signature(htmlSpecChars($Target)).""." has been withdrawn from this class and therefore the layout of virtual table has been changed."; - $Effect = "Call of any virtual method in this class or its subclasses will result in crash of application."; - } - elsif($Kind eq "Virtual_Function_Position") - { - $Incompatibility = "The relative position of virtual method "."".highLight_Signature(htmlSpecChars($Target)).""." has been changed from $Old_Value to $New_Value and therefore the layout of virtual table has been changed."; - $Effect = "Call of this virtual method will result in crash of application."; - } - elsif($Kind eq "Virtual_Function_Redefinition") - { - $Incompatibility = "Virtual method "."".highLight_Signature(htmlSpecChars($Old_Value)).""." has been redefined by "."".highLight_Signature(htmlSpecChars($New_Value)).""; - $Effect = "Method ".highLight_Signature(htmlSpecChars($New_Value))." will be called instead of ".highLight_Signature(htmlSpecChars($Old_Value)).""; - } - elsif($Kind eq "Virtual_Function_Redefinition_B") - { - $Incompatibility = "Virtual method "."".highLight_Signature(htmlSpecChars($New_Value)).""." has been redefined by "."".highLight_Signature(htmlSpecChars($Old_Value)).""; - $Effect = "Method ".highLight_Signature(htmlSpecChars($Old_Value))." will be called instead of ".highLight_Signature(htmlSpecChars($New_Value)).""; - } - elsif($Kind eq "Size") - { - $Incompatibility = "Size of this type has been changed from $Old_Value to $New_Value bytes."; - $Effect = "Change of type size may lead to different effects in different contexts. $ContentSpanStart"."[+] ..."."$ContentSpanEnd "; - } - elsif($Kind eq "BaseType") - { - $Incompatibility = "Base of this type has been changed from $Old_Value to $New_Value."; - $Effect = "Possible incorrect initialization of interface parameters by applications."; - } - elsif($Kind eq "Added_Member_And_Size") - { - $Incompatibility = "Member $Target has been added to this type."; - $Effect = "The size of the inclusive type has been changed."; - } - elsif($Kind eq "Added_Middle_Member_And_Size") - { - $Incompatibility = "Member $Target has been added between the first member and the last member of this structural type."; - $Effect = "1) Layout of structure members has been changed and therefore members in higher positions in the structure definition may be incorrectly accessed by applications.
2) The size of the inclusive type will also be affected."; - } - elsif($Kind eq "Member_Rename") - { - $Incompatibility = "Member $Target has been renamed to $New_Value."; - $Effect = "Renaming of a member in a structural data type may indicate a change in the semantic meaning of the member."; - } - elsif($Kind eq "Withdrawn_Member_And_Size") - { - $Incompatibility = "Member $Target has been withdrawn from this type."; - $Effect = "1) Applications will access incorrect memory when attempting to access this member.
2) The size of the inclusive type will also be affected."; - } - elsif($Kind eq "Withdrawn_Member") - { - $Incompatibility = "Member $Target has been withdrawn from this type."; - $Effect = "Applications will access incorrect memory when attempting to access this member."; - } - elsif($Kind eq "Withdrawn_Middle_Member_And_Size") - { - $Incompatibility = "Member $Target has been withdrawn from this structural type between the first member and the last member."; - $Effect = "1) Layout of structure members has been changed and therefore members in higher positions in the structure definition may be incorrectly accessed by applications.
2) Previous accesses of applications to the withdrawn member will be incorrect."; - } - elsif($Kind eq "Withdrawn_Middle_Member") - { - $Incompatibility = "Member $Target has been withdrawn from this structural type between the first member and the last member."; - $Effect = "1) Layout of structure members has been changed and therefore members in higher positions in the structure definition may be incorrectly accessed by applications.
2) Applications will access incorrect memory when attempting to access this member."; - } - elsif($Kind eq "Enum_Member_Value") - { - $Incompatibility = "Value of member $Target has been changed from $Old_Value to $New_Value."; - $Effect = "Applications may execute another branch of library code."; - } - elsif($Kind eq "Enum_Member_Name") - { - $Incompatibility = "Name of member with value $Target has been changed from $Old_Value to $New_Value."; - $Effect = "Applications may execute another branch of library code."; - } - elsif($Kind eq "Member_Type_And_Size") - { - $Incompatibility = "Type of member $Target has been changed from $Old_Value ($Old_Size bytes) to $New_Value ($New_Size bytes)."; - $Effect = "Layout of structure members has been changed and therefore members in higher positions in the structure definition may be incorrectly accessed by applications."; - } - elsif($Kind eq "Member_Type") - { - $Incompatibility = "Type of member $Target has been changed from $Old_Value to $New_Value."; - $Effect = "Replacement of the member data type may indicate a change in the semantic meaning of the member."; - } - elsif($Kind eq "Member_BaseType_And_Size") - { - if($InitialType_Type eq "Pointer") - { - $Incompatibility = "Base type of member $Target (pointer) has been changed from $Old_Value ($Old_Size bytes) to $New_Value ($New_Size bytes)."; - $Effect = "Possible access of applications to incorrect memory via member pointer."; - } - else - { - $Incompatibility = "Base type of member $Target has been changed from $Old_Value ($Old_Size bytes) to $New_Value ($New_Size bytes)."; - $Effect = "Layout of structure members has been changed and therefore members in higher positions in structure definition may be incorrectly accessed by applications."; - } - } - elsif($Kind eq "Member_BaseType") - { - if($InitialType_Type eq "Pointer") - { - $Incompatibility = "Base type of member $Target (pointer) has been changed from $Old_Value to $New_Value."; - $Effect = "Possible access of applications to incorrect memory via member pointer."; - } - else - { - $Incompatibility = "Base type of member $Target has been changed from $Old_Value to $New_Value."; - $Effect = "Replacement of member base type may indicate a change in the semantic meaning of this member."; - } - } - elsif($Kind eq "Member_PointerLevel") - { - $Incompatibility = "Type pointer level of member $Target has been changed from $Old_Value to $New_Value."; - $Effect = "Possible incorrect initialization of member $Target by applications."; - } - if($Incompatibility) - { - $TypeProblemsReport .= "$ProblemNum".$Incompatibility."$Effect\n"; - $ProblemNum += 1; - $Problems_Number += 1; - $Kinds_Locations{$Kind}{$Location} = 1; - } - } - } - $ProblemNum -= 1; - if($TypeProblemsReport) - { - my ($Affected_Interfaces_Header, $Affected_Interfaces) = getAffectedInterfaces($TypeName, \%Kinds_Locations); - $HEADER_REPORT .= $ContentSpanStart."[+] ".htmlSpecChars($TypeName)." ($ProblemNum)".$ContentSpanEnd."
\n$ContentDivStart$TypeProblemsReport
IncompatibilityEffect
"."$Affected_Interfaces_Header$Affected_Interfaces

$ContentDivEnd\n"; - $HEADER_REPORT = insertIDs($HEADER_REPORT); - } - } - if($HEADER_REPORT) - { - $TYPE_PROBLEMS .= "$HeaderName
\n".$HEADER_REPORT."
"; - } - } - if($TYPE_PROBLEMS) - { - my $Notations = ""; - if($TYPE_PROBLEMS =~ /'RetVal|'Obj/) - { - my @Notations_Array = (); - if($TYPE_PROBLEMS =~ /'RetVal/) - { - @Notations_Array = (@Notations_Array, "RetVal - function's return value"); - } - if($TYPE_PROBLEMS =~ /'Obj/) - { - @Notations_Array = (@Notations_Array, "Obj - method's object (C++)"); - } - $Notations = "Shorthand notations: ".join("; ", @Notations_Array).".
\n"; - } - $TYPE_PROBLEMS = "\n

Problems in Data Types, $TargetPriority risk ($Problems_Number)

\n".$Notations."\n".$TYPE_PROBLEMS."\n"."to the top
\n"; - } - return $TYPE_PROBLEMS; -} - -my $ContentSpanStart_2 = "\n"; - -sub getAffectedInterfaces($$) -{ - my ($Target_TypeName, $Kinds_Locations) = @_; - my ($Affected_Interfaces_Header, $Affected_Interfaces, %FunctionNumber) = (); - foreach my $Interface (sort {lc($tr_name{$a}) cmp lc($tr_name{$b})} keys(%CompatProblems)) - { - next if(($Interface =~ /C2/) or ($Interface =~ /D2/) or ($Interface =~ /D0/)); - next if(keys(%FunctionNumber)>1000); - my $FunctionProblem = ""; - my $MinPath_Length = ""; - my $MaxPriority = 0; - my $Location_Last = ""; - foreach my $Kind (keys(%{$CompatProblems{$Interface}})) - { - foreach my $Location (keys(%{$CompatProblems{$Interface}{$Kind}})) - { - next if(not $Kinds_Locations->{$Kind}{$Location}); - my $Type_Name = $CompatProblems{$Interface}{$Kind}{$Location}{"Type_Name"}; - my $Signature = $CompatProblems{$Interface}{$Kind}{$Location}{"Signature"}; - my $Parameter_Position = $CompatProblems{$Interface}{$Kind}{$Location}{"Parameter_Position"}; - my $Priority = $CompatProblems{$Interface}{$Kind}{$Location}{"Priority"}; - if($Type_Name eq $Target_TypeName) - { - $FunctionNumber{$Interface} = 1; - my $Path_Length = 0; - while($Location =~ /\-\>/g){$Path_Length += 1;} - if(($MinPath_Length eq "") or ($Path_Length<$MinPath_Length and $Priority_Value{$Priority}>$MaxPriority) or (($Location_Last =~ /RetVal/ or $Location_Last =~ /Obj/) and $Location !~ /RetVal|Obj/ and $Location !~ /\-\>/) or ($Location_Last =~ /RetVal|Obj/ and $Location_Last =~ /\-\>/ and $Location !~ /RetVal|Obj/ and $Location =~ /\-\>/)) - { - $MinPath_Length = $Path_Length; - $MaxPriority = $Priority_Value{$Priority}; - $Location_Last = $Location; - my $Description = get_AffectDescription($Interface, $Kind, $Location); - $FunctionProblem = "".highLight_Signature_PPos_Italic(htmlSpecChars($Signature), $Parameter_Position, 1, 0).":
"."".addArrows($Description)."
 
\n"; - } - } - } - } - $Affected_Interfaces .= $FunctionProblem; - } - $Affected_Interfaces .= "and other...
" if(keys(%FunctionNumber)>5000); - if($Affected_Interfaces) - { - $Affected_Interfaces_Header = $ContentSpanStart_2."[+] affected interfaces (".keys(%FunctionNumber).")".$ContentSpanEnd; - $Affected_Interfaces = $ContentDivStart.$Affected_Interfaces.$ContentDivEnd; - } - return ($Affected_Interfaces_Header, $Affected_Interfaces); -} - -my %Kind_TypeStructureChanged=( - "Size"=>1, - "Added_Member_And_Size"=>1, - "Added_Middle_Member_And_Size"=>1, - "Member_Rename"=>1, - "Withdrawn_Member_And_Size"=>1, - "Withdrawn_Member"=>1, - "Withdrawn_Middle_Member_And_Size"=>1, - "Enum_Member_Value"=>1, - "Enum_Member_Name"=>1, - "Member_Type_And_Size"=>1, - "Member_Type"=>1, - "Member_BaseType_And_Size"=>1, - "Member_BaseType"=>1, - "Member_PointerLevel"=>1, - "BaseType"=>1 -); - -my %Kind_VirtualTableChanged=( - "Added_Virtual_Function"=>1, - "Withdrawn_Virtual_Function"=>1, - "Virtual_Function_Position"=>1, - "Virtual_Function_Redefinition"=>1, - "Virtual_Function_Redefinition_B"=>1 -); - -sub get_AffectDescription($$$) -{ - my ($Interface, $Kind, $Location) = @_; - my $Target = $CompatProblems{$Interface}{$Kind}{$Location}{"Target"}; - my $Old_Value = $CompatProblems{$Interface}{$Kind}{$Location}{"Old_Value"}; - my $New_Value = $CompatProblems{$Interface}{$Kind}{$Location}{"New_Value"}; - my $Type_Name = $CompatProblems{$Interface}{$Kind}{$Location}{"Type_Name"}; - my $Parameter_Position = $CompatProblems{$Interface}{$Kind}{$Location}{"Parameter_Position"}; - my $Parameter_Name = $CompatProblems{$Interface}{$Kind}{$Location}{"Parameter_Name"}; - my $Parameter_Type_Name = $CompatProblems{$Interface}{$Kind}{$Location}{"Parameter_Type_Name"}; - my $Member_Type_Name = $CompatProblems{$Interface}{$Kind}{$Location}{"Member_Type_Name"}; - my $Object_Type_Name = $CompatProblems{$Interface}{$Kind}{$Location}{"Object_Type_Name"}; - my $Return_Type_Name = $CompatProblems{$Interface}{$Kind}{$Location}{"Return_Type_Name"}; - my $Start_Type_Name = $CompatProblems{$Interface}{$Kind}{$Location}{"Start_Type_Name"}; - my $InitialType_Type = $CompatProblems{$Interface}{$Kind}{$Location}{"InitialType_Type"}; - my $Parameter_Position_Str = num_to_str($Parameter_Position + 1); - my @Sentence_Parts = (); - my $Location_To_Type = $Location; - $Location_To_Type =~ s/\-\>[^>]+?\Z//; - if($Kind_VirtualTableChanged{$Kind}) - { - if($Kind eq "Virtual_Function_Redefinition") - { - @Sentence_Parts = (@Sentence_Parts, "This method become virtual and will be called instead of redefined method '".highLight_Signature(htmlSpecChars($Old_Value))."'."); - } - elsif($Kind eq "Virtual_Function_Redefinition_B") - { - @Sentence_Parts = (@Sentence_Parts, "This method become non-virtual and redefined method '".highLight_Signature(htmlSpecChars($Old_Value))."' will be called instead of it."); - } - else - { - @Sentence_Parts = (@Sentence_Parts, "Call of this virtual method will result in crash of application because the layout of virtual table has been changed."); - } - } - elsif($Kind_TypeStructureChanged{$Kind}) - { - if($Location_To_Type =~ /RetVal/) - {#return value - if($Location_To_Type =~ /\-\>/) - { - @Sentence_Parts = (@Sentence_Parts, "Member \'$Location_To_Type\' in return value"); - } - else - { - @Sentence_Parts = (@Sentence_Parts, "Return value"); - } - } - elsif($Location_To_Type =~ /Obj/) - {#object - if($Location_To_Type =~ /\-\>/) - { - @Sentence_Parts = (@Sentence_Parts, "Member \'$Location_To_Type\' in the object of this method"); - } - else - { - @Sentence_Parts = (@Sentence_Parts, "Object"); - } - } - else - {#parameters - if($Location_To_Type =~ /\-\>/) - { - @Sentence_Parts = (@Sentence_Parts, "Member \'$Location_To_Type\' of $Parameter_Position_Str parameter"); - } - else - { - @Sentence_Parts = (@Sentence_Parts, "$Parameter_Position_Str parameter"); - } - if($Parameter_Name) - { - @Sentence_Parts = (@Sentence_Parts, "\'$Parameter_Name\'"); - } - if($InitialType_Type eq "Pointer") - { - @Sentence_Parts = (@Sentence_Parts, "(pointer)"); - } - } - if($Start_Type_Name eq $Type_Name) - { - @Sentence_Parts = (@Sentence_Parts, "has type \'$Type_Name\'."); - } - else - { - @Sentence_Parts = (@Sentence_Parts, "has base type \'$Type_Name\'."); - } - } - return join(" ", @Sentence_Parts); -} - -sub create_HtmlReport() -{ - my $CssStyles = ""; - - my $JScripts = ""; - - writeFile("$REPORT_PATH/abi_compat_report.html", "\n\n\n - ABI compliance report for the library $TargetLibraryName from version ".$Descriptor{1}{"Version"}." to ".$Descriptor{2}{"Version"}." on ".getArch()."\n\n\n".$CssStyles."\n\n"."\n".$JScripts."\n\n\n\n
\n".get_Report_Header()."
\n".get_Summary()."
\n".get_Report_Added().get_Report_Withdrawn().get_Report_TypeProblems("High").get_Report_TypeProblems("Medium").get_Report_TypeProblems("Low").get_Report_InterfaceProblems("High").get_Report_InterfaceProblems("Medium").get_Report_InterfaceProblems("Low").get_Report_ChangedConstants().get_SourceInfo()."
\n"."


Generated on ".(localtime time)." for $TargetLibraryName by ABI-compliance-checker $ABI_COMPLIANCE_CHECKER_VERSION  
\n
\n"); -} - -sub trivialCmp($$) -{ - if(int($_[0]) > int($_[1])) - { - return 1; - } - elsif($_[0] eq $_[1]) - { - return 0; - } - else - { - return -1; - } -} - -sub addArrows($) -{ - my $Text = $_[0]; - #$Text =~ s/\-\>/→/g; - $Text =~ s/\-\>/−>/g; - return $Text; -} - -sub insertIDs($) -{ - my $Text = $_[0]; - while($Text =~ /CONTENT_ID/) - { - if(int($Content_Counter)%2) - { - $ContentID -= 1; - } - $Text =~ s/CONTENT_ID/c_$ContentID/; - $ContentID += 1; - $Content_Counter += 1; - } - return $Text; -} - -sub restrict_num_decimal_digits -{ - my $num=shift; - my $digs_to_cut=shift; - - if ($num=~/\d+\.(\d){$digs_to_cut,}/) - { - $num=sprintf("%.".($digs_to_cut-1)."f", $num); - } - return $num; -} - -sub parse_constants() -{ - my $CurHeader = ""; - foreach my $String (split("\n", $ConstantsSrc{$Version})) - {#detecting public and private constants using sources - if($String=~/#[ \t]+\d+[ \t]+\"(.+)\"/) - { - $CurHeader=$1; - } - if($String=~/\#[ \t]*define[ \t]+([_A-Z]+)[ \t]+(.*)[ \t]*\Z/) - { - my ($Name, $Value) = ($1, $2); - if(not $Constants{$Version}{$Name}{"Access"}) - { - $Constants{$Version}{$Name}{"Access"} = "public"; - $Constants{$Version}{$Name}{"Value"} = $Value; - $Constants{$Version}{$Name}{"Header"} = get_FileName($CurHeader); - } - } - elsif($String=~/\#[ \t]*undef[ \t]+([_A-Z]+)[ \t]*/) - { - my $Name = $1; - $Constants{$Version}{$Name}{"Access"} = "private"; - } - } - foreach my $Constant (keys(%{$Constants{$Version}})) - { - if(($Constants{$Version}{$Constant}{"Access"} eq "private") or not $Constants{$Version}{$Constant}{"Value"} - or $Constant=~/_h\Z/i) - { - delete($Constants{$Version}{$Constant}); - } - else - { - delete($Constants{$Version}{$Constant}{"Access"}); - } - } -} - -sub mergeConstants() -{ - return if(defined $AppPath); - foreach my $Constant (keys(%{$Constants{1}})) - { - my $Old_Value = $Constants{1}{$Constant}{"Value"}; - my $New_Value = $Constants{2}{$Constant}{"Value"}; - my $Header = $Constants{1}{$Constant}{"Header"}; - if($New_Value and $Old_Value and ($New_Value ne $Old_Value)) - { - %{$ConstantProblems{$Constant}} = ( - "Old_Value"=>$Old_Value, - "New_Value"=>$New_Value, - "Header"=>$Header - ); - } - } -} - -sub mergeHeaders_Separately() -{ - system("mkdir", "-p", "header_compile_errors/".$TargetLibraryName); - system("rm", "-fr", $ERR_PATH{1}, $ERR_PATH{2}); - my ($Header_Num, $Prev_Header_Length) = (0, 0); - my $All_Count = keys(%{$Headers{1}}); - foreach my $Header_Dest (sort {int($Headers{1}{$a}{"Position"})<=>int($Headers{1}{$b}{"Position"})} keys(%{$Headers{1}})) - { - my $Header_Name = $Headers{1}{$Header_Dest}{"Name"}; - my $Dest_Count = keys(%{$HeaderName_Destinations{1}{$Header_Name}}); - my $Identity = $Headers{1}{$Header_Dest}{"Identity"}; - my $Dest_Comment = ($Dest_Count>1 and $Identity=~/\//)?" ($Identity)":""; - print get_one_step_title($Header_Name.$Dest_Comment, $Header_Num, $All_Count, $Prev_Header_Length, 1)."\r"; - %TypeDescr = (); - %FuncDescr = (); - %ClassFunc = (); - %ClassVirtFunc = (); - %LibInfo = (); - %CompleteSignature = (); - %Cache = (); - $Version = 1; - parseHeader($Header_Dest); - $Version = 2; - my $PairHeaderDest = find_pair_header($Header_Dest); - if(not $PairHeaderDest) - { - $Header_Num += 1; - next; - } - parseHeader($PairHeaderDest); - mergeSignatures(); - mergeConstants(); - $Header_Num += 1; - $Prev_Header_Length = length($Header_Name.$Dest_Comment); - } - print get_one_step_title("", $All_Count, $All_Count, $Prev_Header_Length, 0)."\n"; -} - -sub get_one_step_title($$$$$) -{ - my ($Header_Name, $Num, $All_Count, $SpacesAtTheEnd, $ShowCurrent) = @_; - my ($Spaces_1, $Spaces_2, $Title) = (); - my $Title_1 = "checking headers: $Num/$All_Count [".restrict_num_decimal_digits($Num*100/$All_Count, 3)."%]".(($ShowCurrent)?",":""); - foreach (0 .. length("checking headers: ")+length($All_Count)*2+11 - length($Title_1)) - { - $Spaces_1 .= " "; - } - $Title .= $Title_1.$Spaces_1; - if($ShowCurrent) - { - my $Title_2 = "current: $Header_Name"; - foreach (0 .. $SpacesAtTheEnd - length($Header_Name)-1) - { - $Spaces_2 .= " "; - } - $Title .= $Title_2.$Spaces_2; - } - else - { - foreach (0 .. $SpacesAtTheEnd + length(" current: ") - 1) - { - $Title .= " "; - } - } - return $Title."\r"; -} - -sub find_pair_header($) -{ - my $Header_Dest = $_[0]; - my $Header_Name = $Headers{1}{$Header_Dest}{"Name"}; - my $Identity = $Headers{1}{$Header_Dest}{"Identity"}; - my @Pair_Dest = keys(%{$HeaderName_Destinations{2}{$Header_Name}}); - if($#Pair_Dest==0) - { - return $Pair_Dest[0]; - } - elsif($#Pair_Dest==-1) - { - return ""; - } - else - { - foreach my $Pair_Dest (@Pair_Dest) - { - my $Pair_Identity = $Headers{2}{$Pair_Dest}{"Identity"}; - if($Identity eq $Pair_Identity) - { - return $Pair_Dest; - } - } - return ""; - } -} - -sub getSymbols($) -{ - my $LibVersion = $_[0]; - my @SoLibPaths = getSoPaths($LibVersion); - if($#SoLibPaths eq -1 and not $CheckHeadersOnly) - { - print "ERROR: shared objects were not found\n"; - exit(1); - } - foreach my $SoLibPath (@SoLibPaths) - { - getSymbols_Lib($LibVersion, $SoLibPath, 0); - } -} - -sub separatePath($) -{ - return ("", $_[0])if($_[0] !~ /\//); - if($_[0] =~ /\A(.*\/)([^\/]*)\Z/) - { - return ($1, $2); - } - else - { - return ("", $_[0]); - } -} - -sub translateSymbols($) -{ - my $LibVersion = $_[0]; - my (@MnglNames, @UnMnglNames) = (); - foreach my $Interface (sort keys(%{$Interface_Library{$LibVersion}})) - { - if($Interface =~ /\A_Z/) - { - $Interface =~ s/[\@]+(.*)\Z//; - push(@MnglNames, $Interface); - } - else - { - $tr_name{$Interface} = $Interface; - $mangled_name{$tr_name{$Interface}} = $Interface; - } - } - if($#MnglNames > -1) - { - @UnMnglNames = reverse(unmangleArray(@MnglNames)); - foreach my $Interface (sort keys(%{$Interface_Library{$LibVersion}})) - { - if($Interface =~ /\A_Z/) - { - $Interface =~ s/[\@]+(.*)\Z//; - $tr_name{$Interface} = pop(@UnMnglNames); - $mangled_name{correctName($tr_name{$Interface})} = $Interface; - } - } - } -} - -sub detectAdded() -{ - #detecting added - foreach my $Interface (keys(%{$Interface_Library{2}})) - { - if(not $Interface_Library{1}{$Interface}) - { - $AddedInt{$Interface} = 1; - my ($MnglName, $SymbolVersion) = ($Interface, ""); - if($Interface =~ /\A(.+)[\@]+(.+)\Z/) - { - ($MnglName, $SymbolVersion) = ($1, $2); - } - $FuncAttr{2}{$Interface}{"Signature"} = $tr_name{$MnglName}.(($SymbolVersion)?"\@".$SymbolVersion:""); - } - } -} - -sub detectWithdrawn() -{ - #detecting withdrawn - foreach my $Interface (keys(%{$Interface_Library{1}})) - { - if(not $Interface_Library{2}{$Interface} and not $Interface_Library{2}{$SymVer{2}{$Interface}}) - { - next if($DepInterfaces{2}{$Interface}); - $WithdrawnInt{$Interface} = 1; - my ($MnglName, $SymbolVersion) = ($Interface, ""); - if($Interface =~ /\A(.+)[\@]+(.+)\Z/) - { - ($MnglName, $SymbolVersion) = ($1, $2); - } - $FuncAttr{1}{$Interface}{"Signature"} = $tr_name{$MnglName}.(($SymbolVersion)?"\@".$SymbolVersion:""); - } - } -} - -sub isRecurLib($) -{ - my $LibName = $_[0]; - foreach my $LibNameInStack (@RecurLib) - { - if($LibName eq $LibNameInStack) - { - return 1; - } - } - return 0; -} - -sub getSymbols_App($) -{ - my $Path = $_[0]; - return () if(not $Path or not -f $Path); - my @Ints = (); - open(APP, "readelf -WhlSsdA $Path |"); - my $symtab=0;#indicates that we are processing 'symtab' section of 'readelf' output - while() - { - if($symtab == 1) { - #do nothing with symtab (but there are some plans for the future) - next; - } - if( /'.dynsym'/ ) { - $symtab=0; - } - elsif( /'.symtab'/ ) { - $symtab=1; - } - elsif(my ($fullname, $idx, $Ndx) = readlile_ELF($_)) { - if( $Ndx eq "UND" ) { - #only exported interfaces - push(@Ints, $fullname); - } - } - } - close(APP); - return @Ints; -} - -sub readlile_ELF($) -{ - if($_[0]=~/\s*\d+:\s+(\w*)\s+\w+\s+(\w+)\s+(\w+)\s+(\w+)\s+(\w+)\s((\w|@|\.)+)/) - {#the line of 'readelf' output corresponding to the interface - my ($value, $type, $bind, $vis, $Ndx, $fullname)=($1, $2, $3, $4, $5, $6); - if(($bind ne "WEAK") and ($bind ne "GLOBAL")) { - return (); - } - if(($type ne "FUNC") and ($type ne "OBJECT") and ($type ne "COMMON")) { - return (); - } - if($vis ne "DEFAULT") { - return (); - } - if(($Ndx eq "ABS") and ($value !~ /\D|1|2|3|4|5|6|7|8|9/)) { - return (); - } - return ($fullname, $value, $Ndx); - } - else - { - return (); - } -} - -sub getSymbols_Lib($$$) -{ - my ($LibVersion, $Lib_Path, $IsNeededLib) = @_; - return if(not $Lib_Path or not -f $Lib_Path); - my ($Lib_Dir, $Lib_SoName) = separatePath($Lib_Path); - return if($CheckedSoLib{$LibVersion}{$Lib_SoName} and $IsNeededLib); - return if(isRecurLib($Lib_SoName) or $#RecurLib>=1); - $CheckedSoLib{$LibVersion}{$Lib_SoName} = 1; - push(@RecurLib, $Lib_SoName); - my (%Value_Interface, %Interface_Value, %NeededLib) = (); - if(not $IsNeededLib) - { - $SoNames_All{$LibVersion}{$Lib_SoName} = 1; - } - open(SOLIB, "readelf -WhlSsdA $Lib_Path |"); - my $symtab=0;#indicates that we are processing 'symtab' section of 'readelf' output - while() - { - if($symtab == 1) { - #do nothing with symtab (but there are some plans for the future) - next; - } - if(/'.dynsym'/) { - $symtab=0; - } - elsif(/'.symtab'/) { - $symtab=1; - } - elsif(/NEEDED.+\[([^\[\]]+)\]/) - { - $NeededLib{$1} = 1; - } - elsif(my ($fullname, $idx, $Ndx) = readlile_ELF($_)) { - if( $Ndx eq "UND" ) { - #ignore interfaces that are exported form somewhere else - next; - } - my ($realname, $version) = ($fullname, ""); - if($fullname =~ /\A([^@]+)[\@]+([^@]+)\Z/) - { - ($realname, $version) = ($1, $2); - } - next if(defined $InterfacesListPath and not $InterfacesList{$realname}); - next if(defined $AppPath and not $InterfacesList_App{$realname}); - if($IsNeededLib) - { - $DepInterfaces{$LibVersion}{$fullname} = 1; - } - if(not $IsNeededLib or (defined $InterfacesListPath and $InterfacesList{$realname}) or (defined $AppPath and $InterfacesList_App{$realname})) - { - $Interface_Library{$LibVersion}{$fullname} = $Lib_SoName; - $Library_Interface{$LibVersion}{$Lib_SoName}{$fullname} = 1; - $Interface_Value{$LibVersion}{$fullname} = $idx; - $Value_Interface{$LibVersion}{$idx}{$fullname} = 1; - if(not $Language{$LibVersion}{$Lib_SoName}) - { - if($fullname =~ /\A_Z[A-Z]*[0-9]+/) - { - $Language{$LibVersion}{$Lib_SoName} = "C++"; - } - } - } - } - } - close(SOLIB); - if(not $IsNeededLib) - { - foreach my $Interface_Name (keys(%{$Interface_Library{$LibVersion}})) - { - next if($Interface_Name !~ /\@/); - my $Interface_SymName = ""; - foreach my $InterfaceName_SameValue (keys(%{$Value_Interface{$LibVersion}{$Interface_Value{$LibVersion}{$Interface_Name}}})) - { - if($InterfaceName_SameValue ne $Interface_Name) - { - $SymVer{$LibVersion}{$InterfaceName_SameValue} = $Interface_Name; - $Interface_SymName = $InterfaceName_SameValue; - last; - } - } - if(not $Interface_SymName) - { - if($Interface_Name =~ /\A([^@]*)[\@]+([^@]*)\Z/ and not $SymVer{$LibVersion}{$1}) - { - $SymVer{$LibVersion}{$1} = $Interface_Name; - } - } - } - } - foreach my $SoLib (keys(%NeededLib)) - { - getSymbols_Lib($LibVersion, find_solib_path($Lib_Dir, $SoLib), 1); - } - pop(@RecurLib); -} - -sub find_solib_path($$) -{ - my ($Dir, $SoName) = @_; - $Dir=~s/\/\Z//g; - if(-f $Dir."/".$SoName) - { - return $Dir."/".$SoName; - } - else - { - return $SoLib_DefaultPath{$SoName}; - } -} - -sub symbols_Preparation($) -{#recreate %SoNames and %Language using info from *.abi file - my $LibVersion = $_[0]; - foreach my $Lib_SoName (keys(%{$Library_Interface{$LibVersion}})) - { - foreach my $Interface_Name (keys(%{$Library_Interface{$LibVersion}{$Lib_SoName}})) - { - $Interface_Library{$LibVersion}{$Interface_Name} = $Lib_SoName; - $SoNames_All{$LibVersion}{$Lib_SoName} = 1; - if(not $Language{$LibVersion}{$Lib_SoName}) - { - if($Interface_Name =~ /\A_Z[A-Z]*[0-9]+/) - { - $Language{$LibVersion}{$Lib_SoName} = "C++"; - } - } - } - } -} - -sub getSoPaths($) -{ - my $LibVersion = $_[0]; - my @SoPaths = (); - foreach my $Dest (split("\n", $Descriptor{$LibVersion}{"Libs"})) - { - $Dest =~ s/\A\s+|\s+\Z//g; - next if(not $Dest); - if(not -e $Dest) - { - print "ERROR: can't access \'$Dest\'\n"; - } - my @SoPaths_Dest = getSOPaths_Dest($Dest); - foreach (@SoPaths_Dest) - { - push(@SoPaths, $_); - } - } - return @SoPaths; -} - -sub getSOPaths_Dest($) -{ - my $Dest = $_[0]; - if(-f $Dest) - { - return $Dest; - } - my @AllObjects = cmd_find($Dest,"f","*\.so*"); - my @SOPaths = (); - foreach my $SharedObject (@AllObjects) - { - if(cmd_file($SharedObject) =~ /shared object/) - { - @SOPaths = (@SOPaths, $SharedObject); - } - } - return @SOPaths; -} - -sub genDescriptorTemplate() -{ - writeFile("library-descriptor.xml", $Descriptor_Template."\n"); - print "descriptor template named 'library-descriptor.xml' has been generated in the current directory\n"; -} - -sub detectPointerSize() -{ - `mkdir -p temp`; - writeFile("temp/get_pointer_size.c", "#include -int main() -{ - printf(\"\%d\", sizeof(int*)); - return 0; -}\n"); - system("gcc temp/get_pointer_size.c -o temp/get_pointer_size"); - $POINTER_SIZE = `./temp/get_pointer_size`; - `rm -fr temp`; -} - -sub data_Preparation($) -{ - my $LibVersion = $_[0]; - if($Descriptor{$LibVersion}{"Path"} =~ /\.abi\.tar\.gz/) - { - my $FileName = cmd_tar($Descriptor{$LibVersion}{"Path"}); - if($FileName =~ /\.abi/) - { - chomp($FileName); - my $LibraryABI = eval readFile($FileName); - system("rm", "-f", $FileName); - $TypeDescr{$LibVersion} = $LibraryABI->{"TypeDescr"}; - $FuncDescr{$LibVersion} = $LibraryABI->{"FuncDescr"}; - $Library_Interface{$LibVersion} = $LibraryABI->{"Interfaces"}; - $SymVer{$LibVersion} = $LibraryABI->{"SymVer"}; - $Tid_TDid{$LibVersion} = $LibraryABI->{"Tid_TDid"}; - $Descriptor{$LibVersion}{"Version"} = $LibraryABI->{"LibraryVersion"}; - $OpaqueTypes{$LibVersion} = $LibraryABI->{"OpaqueTypes"}; - $InternalInterfaces{$LibVersion} = $LibraryABI->{"InternalInterfaces"}; - $Headers{$LibVersion} = $LibraryABI->{"Headers"}; - $SoNames_All{$LibVersion} = $LibraryABI->{"SharedObjects"}; - $Constants{$LibVersion} = $LibraryABI->{"Constants"}; - if($LibraryABI->{"ABI_COMPLIANCE_CHECKER_VERSION"} ne $ABI_COMPLIANCE_CHECKER_VERSION) - { - print "ERROR: incompatible version of specified ABI dump (allowed only $ABI_COMPLIANCE_CHECKER_VERSION)\n"; - exit(1); - } - foreach my $Destination (keys(%{$Headers{$LibVersion}})) - { - my $Header = get_FileName($Destination); - $HeaderName_Destinations{$LibVersion}{$Header}{$Destination} = 1; - } - symbols_Preparation($LibVersion); - } - } - elsif($Descriptor{$LibVersion}{"Path"} =~ /\.tar\.gz\Z/) - { - print "ERROR: descriptor must be an XML file or '*.abi.tar.gz' ABI dump\n"; - exit(1); - } - else - { - readDescriptor($LibVersion); - if(not $CheckHeadersOnly) - { - getSymbols($LibVersion); - } - headerSearch($LibVersion); - } -} - -sub dump_sorting($) -{ - my $hash = $_[0]; - if((keys(%{$hash}))[0] =~ /\A[0-9]+\Z/) - { - return [sort {int($a) <=> int($b)} keys %{$hash}]; - } - else - { - return [sort {$a cmp $b} keys %{$hash}]; - } -} - -sub get_solib_default_paths() -{ - foreach my $Line (split("\n", `ldconfig -p`)) - { - if($Line=~/\A[ \t]*([^ \t]+) .* \=\> (.+)\Z/) - { - $SoLib_DefaultPath{$1} = $2; - } - } -} - -sub scenario() -{ - if(defined $Help) - { - HELP_MESSAGE(); - exit(0); - } - if(defined $ShowVersion) - { - print "ABI Compliance Checker $ABI_COMPLIANCE_CHECKER_VERSION\nCopyright (C) The Linux Foundation\nCopyright (C) Institute for System Programming, RAS\nLicense GPLv2: GNU GPL version 2 \nThis program is free software: you can redistribute it and/or modify it.\n\nWritten by Andrey Ponomarenko.\n"; - exit(0); - } - $Data::Dumper::Sortkeys = \&dump_sorting; - if(defined $TestSystem) - { - testSystem_cpp(); - testSystem_c(); - exit(0); - } - if($GenerateDescriptor) - { - genDescriptorTemplate(); - exit(0); - } - if(not defined $TargetLibraryName) - { - print "select library name (option -l )\n"; - exit(1); - } - if(defined $InterfacesListPath) - { - if(not -f $InterfacesListPath) - { - print "ERROR: can't access file $InterfacesListPath\n"; - exit(1); - } - foreach my $Interface (split("\n", readFile($InterfacesListPath))) - { - $InterfacesList{$Interface} = 1; - } - } - if($AppPath) - { - if(-f $AppPath) - { - foreach my $Interface (getSymbols_App($AppPath)) - { - $InterfacesList_App{$Interface} = 1; - } - } - else - { - print "ERROR: can't access file \'$AppPath\'\n"; - exit(1); - } - } - get_solib_default_paths(); - if($DumpInfo_DescriptorPath) - { - if(not -f $DumpInfo_DescriptorPath) - { - print "ERROR: can't access file \'$DumpInfo_DescriptorPath\'\n"; - exit(1); - } - $Descriptor{1}{"Path"} = $DumpInfo_DescriptorPath; - readDescriptor(1); - detectPointerSize(); - getSymbols(1); - translateSymbols(1); - headerSearch(1); - parseHeaders_AllInOne(1); - cleanData(1); - my %LibraryABI = (); - print "creating library ABI info dump ...\n"; - $LibraryABI{"TypeDescr"} = $TypeDescr{1}; - $LibraryABI{"FuncDescr"} = $FuncDescr{1}; - $LibraryABI{"Interfaces"} = $Library_Interface{1}; - $LibraryABI{"SymVer"} = $SymVer{1}; - $LibraryABI{"LibraryVersion"} = $Descriptor{1}{"Version"}; - $LibraryABI{"Library"} = $TargetLibraryName; - $LibraryABI{"SharedObjects"} = $SoNames_All{1}; - $LibraryABI{"Tid_TDid"} = $Tid_TDid{1}; - $LibraryABI{"OpaqueTypes"} = $OpaqueTypes{1}; - $LibraryABI{"InternalInterfaces"} = $InternalInterfaces{1}; - $LibraryABI{"Headers"} = $Headers{1}; - $LibraryABI{"Constants"} = $Constants{1}; - $LibraryABI{"ABI_COMPLIANCE_CHECKER_VERSION"} = $ABI_COMPLIANCE_CHECKER_VERSION; - my $InfoDump_FilePath = "abi_dumps/$TargetLibraryName"; - my $InfoDump_FileName = $TargetLibraryName."_".$Descriptor{1}{"Version"}.".abi"; - system("mkdir", "-p", $InfoDump_FilePath); - system("rm", "-f", $InfoDump_FilePath."/".$InfoDump_FileName.".tar.gz"); - writeFile("$InfoDump_FilePath/$InfoDump_FileName", Dumper(\%LibraryABI)); - system("cd ".esc($InfoDump_FilePath)." && tar -cf ".esc($InfoDump_FileName).".tar ".esc($InfoDump_FileName)); - system("cd ".esc($InfoDump_FilePath)." && gzip ".esc($InfoDump_FileName).".tar --best"); - system("rm", "-f", $InfoDump_FilePath."/".$InfoDump_FileName); - if($?) - { - print "ERROR: can't create library ABI info dump\n"; - exit(1); - } - else - { - print "see library ABI info dump in \'$InfoDump_FilePath/$InfoDump_FileName\.tar\.gz\': use it instead of library version descriptor on other machine\n"; - exit(0); - } - } - if(not $Descriptor{1}{"Path"}) - { - print "select 1st library descriptor (option -d1 )\n"; - exit(1); - } - if(not -f $Descriptor{1}{"Path"}) - { - print "ERROR: descriptor d1 does not exist, incorrect file path '".$Descriptor{1}{"Path"}."'\n"; - exit(1); - } - if(not $Descriptor{2}{"Path"}) - { - print "select 2nd library descriptor (option -d2 )\n"; - exit(1); - } - if(not -f $Descriptor{2}{"Path"}) - { - print "ERROR: descriptor d2 does not exist, incorrect file path '".$Descriptor{2}{"Path"}."'\n"; - exit(1); - } - $StartTime = localtime time; - print "preparation...\n"; - data_Preparation(1); - data_Preparation(2); - if($AppPath and not keys(%{$Interface_Library{1}})) - { - print "WARNING: symbols from the specified application were not found in the specified library shared objects\n"; - } - $REPORT_PATH = "compat_reports/$TargetLibraryName/".$Descriptor{1}{"Version"}."_to_".$Descriptor{2}{"Version"}; - system("mkdir", "-p", $REPORT_PATH); - system("rm", "-f", $REPORT_PATH."/abi_compat_report.html"); - detectPointerSize(); - translateSymbols(1); - translateSymbols(2); - if(not $CheckHeadersOnly) - { - detectAdded(); - detectWithdrawn(); - } - #headers merging - if($HeaderCheckingMode_Separately and $Descriptor{1}{"Path"} !~ /\.abi\.tar\.gz/ and $Descriptor{2}{"Path"} !~ /\.abi\.tar\.gz/) - { - mergeHeaders_Separately(); - } - else - { - if($Descriptor{1}{"Path"} !~ /\.abi\.tar\.gz/) - { - parseHeaders_AllInOne(1); - } - if($Descriptor{2}{"Path"} !~ /\.abi\.tar\.gz/) - { - parseHeaders_AllInOne(2); - } - print "comparing headers ...\n"; - mergeSignatures(); - mergeConstants(); - } - #libraries merging - if(not $CheckHeadersOnly) - { - print "comparing shared objects ...\n"; - mergeLibs(); - } - print "creating ABI compliance report ...\n"; - create_HtmlReport(); - if($HeaderCheckingMode_Separately) - { - if(keys(%HeaderCompileError)) - { - print "\nWARNING: compilation errors in following headers:\n"; - foreach my $Header (keys(%HeaderCompileError)) - { - print $Header." "; - } - print "\nyou can see compilation errors in the following files:\n '$ERR_PATH{1}'\n '$ERR_PATH{2}'\n"; - } - } - `rm -fr temp`; - print "\nstarted: $StartTime, finished: ".(localtime time)."\n" if($ShowExpendTime); - print "see the ABI compliance report in the file '$REPORT_PATH/abi_compat_report.html'\n"; - exit(0); -} - -scenario(); diff --git a/abicheck/run_abi_test b/abicheck/run_abi_test index 4e4bdf298..668ce8e12 100755 --- a/abicheck/run_abi_test +++ b/abicheck/run_abi_test @@ -5,10 +5,15 @@ if [ ! -d ../build ]; then exit 1 fi +if [ ! -x $(which abi-complicance-checker > /dev/null 2>&1) ]; then + echo "Please install the 'abi-complicance-checker' package" + exit 1 +fi + LIBPATH=$(find /usr/lib/ -type f -name "libapt-*.so.*" -printf %p\\\\n) sed s#@installed_libapt@#$LIBPATH# apt_installed.xml.in > apt_installed.xml BUILDPATH=$(readlink -f ../build) sed s#@build_path@#$BUILDPATH# apt_build.xml.in > apt_build.xml -perl abi-compliance-checker.pl -l apt -d1 apt_installed.xml -d2 apt_build.xml +abi-compliance-checker -l apt -d1 apt_installed.xml -d2 apt_build.xml -- cgit v1.2.3 From 7dd5854b48f5d59c02fb0068d850384f3e678c67 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 12 Aug 2013 17:41:36 +0200 Subject: improve error message --- cmdline/apt-cdrom.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc index 545edf439..a95970782 100644 --- a/cmdline/apt-cdrom.cc +++ b/cmdline/apt-cdrom.cc @@ -67,7 +67,8 @@ void pkgCdromTextStatus::Prompt(const char *Text) char C; cout << Text << ' ' << flush; if (read(STDIN_FILENO,&C,1) < 0) - _error->Errno("pkgCdromTextStatus::Prompt", "failed to prompt"); + _error->Errno("pkgCdromTextStatus::Prompt", + "Failed to read from standard input (not a terminal?)"); if (C != '\n') cout << endl; } -- cgit v1.2.3 From 29a59c460403820d0f039398194e321b7e0921fc Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 9 Aug 2013 22:20:27 +0200 Subject: test Release file handling with expired keys Signing files with expired keys is not as easy as it sounds, so the framework jumps a few loops to do it, but it might come in handy to have an expired key around for later tests even if it is not that different from having no key in regards to APT behaviour. Git-Dch: Ignore --- test/integration/framework | 35 ++++++++++++++++++++----- test/integration/rexexpired.pub | Bin 0 -> 1200 bytes test/integration/rexexpired.sec | Bin 0 -> 2502 bytes test/integration/test-releasefile-verification | 35 +++++++++++++++++++++++-- 4 files changed, 62 insertions(+), 8 deletions(-) create mode 100644 test/integration/rexexpired.pub create mode 100644 test/integration/rexexpired.sec diff --git a/test/integration/framework b/test/integration/framework index 7dd7c20a7..f64b8482c 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -711,22 +711,45 @@ setupaptarchive() { signreleasefiles() { local SIGNER="${1:-Joe Sixpack}" + local GPG="gpg --batch --yes --no-default-keyring --trustdb-name rootdir/etc/apt/trustdb.gpg" msgninfo "\tSign archive with $SIGNER key… " - local SECKEYS="" + local REXKEY='keys/rexexpired' + local SECEXPIREBAK="${REXKEY}.sec.bak" + local PUBEXPIREBAK="${REXKEY}.pub.bak" + if [ "${SIGNER}" = 'Rex Expired' ]; then + # the key is expired, so gpg doesn't allow to sign with and the --faked-system-time + # option doesn't exist anymore (and using faketime would add a new obscure dependency) + # therefore we 'temporary' make the key not expired and restore a backup after signing + cp ${REXKEY}.sec $SECEXPIREBAK + cp ${REXKEY}.pub $PUBEXPIREBAK + local SECUNEXPIRED="${REXKEY}.sec.unexpired" + local PUBUNEXPIRED="${REXKEY}.pub.unexpired" + if [ -f "$SECUNEXPIRED" ] && [ -f "$PUBUNEXPIRED" ]; then + cp $SECUNEXPIRED ${REXKEY}.sec + cp $PUBUNEXPIRED ${REXKEY}.pub + else + printf "expire\n1w\nsave\n" | $GPG --keyring ${REXKEY}.pub --secret-keyring ${REXKEY}.sec --command-fd 0 --edit-key "${SIGNER}" >/dev/null 2>&1 || true + cp ${REXKEY}.sec $SECUNEXPIRED + cp ${REXKEY}.pub $PUBUNEXPIRED + fi + fi for KEY in $(find keys/ -name '*.sec'); do - SECKEYS="$SECKEYS --secret-keyring $KEY" + GPG="$GPG --secret-keyring $KEY" done - local PUBKEYS="" for KEY in $(find keys/ -name '*.pub'); do - PUBKEYS="$PUBKEYS --keyring $KEY" + GPG="$GPG --keyring $KEY" done for RELEASE in $(find aptarchive/ -name Release); do - gpg --yes --no-default-keyring $SECKEYS $PUBKEYS --default-key "$SIGNER" -abs -o ${RELEASE}.gpg ${RELEASE} + $GPG --default-key "$SIGNER" --armor --detach-sign --sign --output ${RELEASE}.gpg ${RELEASE} local INRELEASE="$(echo "${RELEASE}" | sed 's#/Release$#/InRelease#')" - gpg --yes --no-default-keyring $SECKEYS $PUBKEYS --default-key "$SIGNER" --clearsign -o $INRELEASE $RELEASE + $GPG --default-key "$SIGNER" --clearsign --output $INRELEASE $RELEASE # we might have set a specific date for the Release file, so copy it touch -d "$(stat --format "%y" ${RELEASE})" ${RELEASE}.gpg ${INRELEASE} done + if [ -f "$SECEXPIREBAK" ] && [ -f "$PUBEXPIREBAK" ]; then + mv -f $SECEXPIREBAK ${REXKEY}.sec + mv -f $PUBEXPIREBAK ${REXKEY}.pub + fi msgdone "info" } diff --git a/test/integration/rexexpired.pub b/test/integration/rexexpired.pub new file mode 100644 index 000000000..5ab2e489a Binary files /dev/null and b/test/integration/rexexpired.pub differ diff --git a/test/integration/rexexpired.sec b/test/integration/rexexpired.sec new file mode 100644 index 000000000..dc00168cd Binary files /dev/null and b/test/integration/rexexpired.sec differ diff --git a/test/integration/test-releasefile-verification b/test/integration/test-releasefile-verification index e56f458d3..daba3919b 100755 --- a/test/integration/test-releasefile-verification +++ b/test/integration/test-releasefile-verification @@ -107,13 +107,24 @@ runtest() { " aptcache show apt installaptnew + prepare ${PKGFILE} + rm -rf rootdir/var/lib/apt/lists + cp keys/rexexpired.pub rootdir/etc/apt/trusted.gpg.d/rexexpired.gpg + signreleasefiles 'Rex Expired' + find aptarchive/ -name "$DELETEFILE" -delete + msgtest 'Cold archive signed by' 'Rex Expired' + aptget update 2>&1 | grep -E '^W: .* KEYEXPIRED' > /dev/null && msgpass || msgfail + testequal "$(cat ${PKGFILE}) +" aptcache show apt + failaptold + rm rootdir/etc/apt/trusted.gpg.d/rexexpired.gpg prepare ${PKGFILE} rm -rf rootdir/var/lib/apt/lists signreleasefiles 'Marvin Paranoid' find aptarchive/ -name "$DELETEFILE" -delete msgtest 'Cold archive signed by' 'Marvin Paranoid' - aptget update 2>&1 | grep -E '^(W|E): ' > /dev/null && msgpass || msgfail + aptget update 2>&1 | grep -E '^W: .* NO_PUBKEY' > /dev/null && msgpass || msgfail testequal "$(cat ${PKGFILE}) " aptcache show apt failaptold @@ -147,10 +158,30 @@ runtest() { signreleasefiles 'Marvin Paranoid' find aptarchive/ -name "$DELETEFILE" -delete msgtest 'Good warm archive signed by' 'Marvin Paranoid' - aptget update 2>&1 | grep -E '^(W|E): ' > /dev/null && msgpass || msgfail + aptget update 2>&1 | grep -E '^W: .* NO_PUBKEY' > /dev/null && msgpass || msgfail + testequal "$(cat ${PKGFILE}) +" aptcache show apt + installaptold + + prepare ${PKGFILE}-new + cp keys/rexexpired.pub rootdir/etc/apt/trusted.gpg.d/rexexpired.gpg + signreleasefiles 'Rex Expired' + find aptarchive/ -name "$DELETEFILE" -delete + msgtest 'Good warm archive signed by' 'Rex Expired' + aptget update 2>&1 | grep -E '^W: .* KEYEXPIRED' > /dev/null && msgpass || msgfail testequal "$(cat ${PKGFILE}) " aptcache show apt installaptold + rm rootdir/etc/apt/trusted.gpg.d/rexexpired.gpg + + prepare ${PKGFILE}-new + signreleasefiles + find aptarchive/ -name "$DELETEFILE" -delete + msgtest 'Good warm archive signed by' 'Joe Sixpack' + aptget update 2>&1 | grep -E '^(W|E): ' > /dev/null && msgfail || msgpass + testequal "$(cat ${PKGFILE}-new) +" aptcache show apt + installaptnew } runtest2() { -- cgit v1.2.3 From 0440d936d70b1e331d49bbc32735f1b749632604 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 10 Aug 2013 10:01:06 +0200 Subject: add chronic-like testsuccess/testfailure helpers For many commands the output isn't stable (like then dpkg is called) but the exitcode is, so this helper enhances the common && msgpass || msgfail by generating automatically a msgtest and showing the output of the command in case of failure instead of discarding it unconditionally, the later being chronic-like behaviour Git-Dch: Ignore --- test/integration/framework | 34 ++++++++++++++++++++++ test/integration/test-apt-cdrom | 2 +- test/integration/test-apt-get-autoremove | 10 +++---- .../test-bug-407511-fail-invalid-default-release | 4 +-- test/integration/test-bug-602412-dequote-redirect | 4 +-- .../integration/test-bug-604222-new-and-autoremove | 2 +- .../test-bug-604401-files-are-directories | 10 +++---- test/integration/test-bug-611729-mark-as-manual | 20 ++++++------- .../test-bug-612099-multiarch-conflicts | 12 ++++---- test/integration/test-bug-612557-garbage-upgrade | 4 +-- .../test-bug-612958-use-dpkg-multiarch-config | 4 +-- .../test-bug-613420-new-garbage-dependency | 2 +- ...test-bug-64141-install-dependencies-for-on-hold | 2 +- .../test-bug-673536-pre-depends-breaks-loop | 4 +-- .../test-bug-679371-apt-get-autoclean-multiarch | 4 +-- .../test-bug-686346-package-missing-architecture | 4 +-- ...bug-712116-dpkg-pre-install-pkgs-hook-multiarch | 2 +- .../test-bug-717891-abolute-uris-for-proxies | 4 +-- test/integration/test-compressed-indexes | 34 +++++++++++----------- .../test-cve-2013-1051-InRelease-parsing | 2 +- test/integration/test-disappearing-packages | 2 +- test/integration/test-pdiff-usage | 4 +-- test/integration/test-policy-pinning | 8 ++--- test/integration/test-releasefile-valid-until | 32 ++++++++++---------- .../test-ubuntu-bug-761175-remove-purge | 6 ++-- ...st-ubuntu-bug-784473-InRelease-one-message-only | 2 +- 26 files changed, 125 insertions(+), 93 deletions(-) diff --git a/test/integration/framework b/test/integration/framework index f64b8482c..e363977f5 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -928,6 +928,40 @@ testmarkedauto() { aptmark showauto 2>&1 | checkdiff $COMPAREFILE - && msgpass || msgfail } +testsuccess() { + if [ "$1" = '--nomsg' ]; then + shift + else + msgtest 'Test for successful execution of' "$*" + fi + local OUTPUT=$(mktemp) + addtrap "rm $OUTPUT;" + if $@ >${OUTPUT} 2>&1; then + msgpass + else + echo + cat $OUTPUT + msgfail + fi +} + +testfailure() { + if [ "$1" = '--nomsg' ]; then + shift + else + msgtest 'Test for failure in execution of' "$*" + fi + local OUTPUT=$(mktemp) + addtrap "rm $OUTPUT;" + if $@ >${OUTPUT} 2>&1; then + echo + cat $OUTPUT + msgfail + else + msgpass + fi +} + pause() { echo "STOPPED execution. Press enter to continue" local IGNORE diff --git a/test/integration/test-apt-cdrom b/test/integration/test-apt-cdrom index 6e3533152..85c3a2fee 100755 --- a/test/integration/test-apt-cdrom +++ b/test/integration/test-apt-cdrom @@ -102,5 +102,5 @@ aptcache show testing -o Acquire::Languages=en | grep -q '^Description-en: ' && # check that we really can install from a 'cdrom' testdpkgnotinstalled testing -aptget install testing -y > /dev/null 2>&1 +testsuccess aptget install testing -y testdpkginstalled testing diff --git a/test/integration/test-apt-get-autoremove b/test/integration/test-apt-get-autoremove index c25ce3f58..dc30cde34 100755 --- a/test/integration/test-apt-get-autoremove +++ b/test/integration/test-apt-get-autoremove @@ -11,11 +11,11 @@ buildsimplenativepackage 'po-debconf' 'all' '1.0.16' 'unstable' buildsimplenativepackage 'debhelper' 'all' '8.0.0' 'unstable' 'Depends: po-debconf' setupaptarchive -aptget install unrelated debhelper -qq 2>&1 > /dev/null +testsuccess aptget install unrelated debhelper -y testdpkginstalled 'unrelated' 'debhelper' 'po-debconf' testmarkedauto 'po-debconf' -aptget remove debhelper -y -qq 2>&1 > /dev/null +testsuccess aptget remove debhelper -y testdpkgnotinstalled 'debhelper' testdpkginstalled 'po-debconf' 'unrelated' @@ -30,15 +30,15 @@ Remv po-debconf [1.0.16]' aptget autoremove -s testdpkginstalled 'po-debconf' echo 'APT::NeverAutoRemove { "^po-debconf$"; };' > rootdir/etc/apt/apt.conf.d/00autoremove -aptget autoremove -y -qq 2>&1 > /dev/null +testsuccess aptget autoremove -y testdpkginstalled 'po-debconf' echo 'APT::NeverAutoRemove { "^po-.*$"; };' > rootdir/etc/apt/apt.conf.d/00autoremove -aptget autoremove -y -qq 2>&1 > /dev/null +testsuccess aptget autoremove -y testdpkginstalled "po-debconf" rm rootdir/etc/apt/apt.conf.d/00autoremove -aptget autoremove -y -qq 2>&1 > /dev/null +testsuccess aptget autoremove -y testdpkgnotinstalled 'po-debconf' testmarkedauto diff --git a/test/integration/test-bug-407511-fail-invalid-default-release b/test/integration/test-bug-407511-fail-invalid-default-release index 7f23a1e82..3d3b0ada3 100755 --- a/test/integration/test-bug-407511-fail-invalid-default-release +++ b/test/integration/test-bug-407511-fail-invalid-default-release @@ -35,14 +35,14 @@ setupaptarchive passdist() { msgtest 'Test that target-release is accepted' $1 - aptget dist-upgrade -t $1 -qq && msgpass || msgfail + testsuccess --nomsg aptget dist-upgrade -t $1 msgtest 'Test that target-release pins with' $1 aptcache policy -t $1 | grep -q ' 990' && msgpass || msgfail } faildist() { msgtest 'Test that target-release is refused' $1 - aptget dist-upgrade -t $1 -qq 2> /dev/null && msgfail || msgpass + testfailure --nomsg aptget dist-upgrade -t $1 } msgtest 'Test that no default-release is active in this test' 'setup' diff --git a/test/integration/test-bug-602412-dequote-redirect b/test/integration/test-bug-602412-dequote-redirect index c20443559..764e13667 100755 --- a/test/integration/test-bug-602412-dequote-redirect +++ b/test/integration/test-bug-602412-dequote-redirect @@ -16,7 +16,7 @@ mv aptarchive/pool aptarchive/newpool mv aptarchive/dists aptarchive/newdists msgtest 'Test redirection works in' 'apt-get update' -aptget update -qq && msgpass || msgfail +testsuccess --nomsg aptget update # check that I-M-S header is kept in redirections testequal 'Hit http://localhost:8080 unstable InRelease @@ -26,4 +26,4 @@ Hit http://localhost:8080 unstable/main Translation-en Reading package lists...' aptget update #-o debug::pkgacquire=1 -o debug::pkgacquire::worker=1 msgtest 'Test redirection works in' 'package download' -aptget install unrelated --download-only -qq && msgpass || msgfail +testsuccess --nomsg aptget install unrelated --download-only diff --git a/test/integration/test-bug-604222-new-and-autoremove b/test/integration/test-bug-604222-new-and-autoremove index ea73c5775..b29347f64 100755 --- a/test/integration/test-bug-604222-new-and-autoremove +++ b/test/integration/test-bug-604222-new-and-autoremove @@ -8,7 +8,7 @@ configarchitecture "i386" setupaptarchive touch rootdir/var/lib/apt/extended_states -aptmark markauto 'libvtk5.4' +testsuccess aptmark markauto 'libvtk5.4' testmarkedauto 'libvtk5.4' testequal "Reading package lists... diff --git a/test/integration/test-bug-604401-files-are-directories b/test/integration/test-bug-604401-files-are-directories index aae717a19..e6913edcf 100755 --- a/test/integration/test-bug-604401-files-are-directories +++ b/test/integration/test-bug-604401-files-are-directories @@ -11,7 +11,7 @@ test ! -e rootdir/etc/apt/apt.conf || mv rootdir/etc/apt/apt.conf rootdir/etc/ap msgtest "Directory instead of a file as apt.conf ignored" mkdir -p rootdir/etc/apt/apt.conf -aptconfig dump > /dev/null && msgpass || msgfail +testsuccess --nomsg aptconfig dump rmdir rootdir/etc/apt/apt.conf msgtest "Good link instead of a file as apt.conf ignored" @@ -22,7 +22,7 @@ rm rootdir/etc/apt/apt.conf msgtest "Broken link instead of a file as apt.conf ignored" ln -s /tmp/doesnt-exist rootdir/etc/apt/apt.conf -aptconfig dump > /dev/null && msgpass || msgfail +testsuccess --nomsg aptconfig dump rm rootdir/etc/apt/apt.conf @@ -30,7 +30,7 @@ test ! -e rootdir/etc/apt/sources.list || mv rootdir/etc/apt/sources.list rootdi msgtest "Directory instead of a file as sources.list ignored" mkdir -p rootdir/etc/apt/sources.list -aptget update --print-uris 2> /dev/null && msgpass || msgfail +testsuccess --nomsg aptget update --print-uris rmdir rootdir/etc/apt/sources.list msgtest "Good link instead of a file as sources.list ignored" @@ -49,7 +49,7 @@ test ! -e rootdir/etc/apt/preferences || mv rootdir/etc/apt/preferences rootdir/ msgtest "Directory instead of a file as preferences ignored" mkdir -p rootdir/etc/apt/preferences -aptcache policy > /dev/null 2> /dev/null && msgpass || msgfail +testsuccess --nomsg aptcache policy rmdir rootdir/etc/apt/preferences msgtest "Good link instead of a file as preferences ignored" @@ -62,5 +62,5 @@ rm rootdir/etc/apt/preferences msgtest "Broken link instead of a file as preferences ignored" ln -s /tmp/doesnt-exist rootdir/etc/apt/preferences -aptcache policy > /dev/null 2> /dev/null && msgpass || msgfail +testsuccess --nomsg aptcache policy rm rootdir/etc/apt/preferences diff --git a/test/integration/test-bug-611729-mark-as-manual b/test/integration/test-bug-611729-mark-as-manual index 9cf01610c..e3d454f97 100755 --- a/test/integration/test-bug-611729-mark-as-manual +++ b/test/integration/test-bug-611729-mark-as-manual @@ -15,21 +15,21 @@ buildsimplenativepackage "c" "all" "1.0" "stable" "Depends: b" setupaptarchive # dpkg freaks out if the last package is removed so keep one around -aptget install peace-dpkg -y -qq 2>&1 > /dev/null +testsuccess aptget install peace-dpkg -y testdpkginstalled peace-dpkg testmarkedauto -aptget install a -y -qq 2>&1 > /dev/null +testsuccess aptget install a -y testdpkginstalled a b testdpkgnotinstalled c testmarkedauto 'b' -aptget remove a -y -qq 2>&1 > /dev/null +testsuccess aptget remove a -y testdpkgnotinstalled a c testdpkginstalled b testmarkedauto 'b' -aptget install c -y -qq 2>&1 > /dev/null +testsuccess aptget install c -y testdpkgnotinstalled a testdpkginstalled b c testmarkedauto 'b' @@ -50,7 +50,7 @@ testmarkedauto 'b' rm rootdir/var/log/apt/history.log -aptget install b --reinstall -y -qq 2>&1 > /dev/null +testsuccess aptget install b --reinstall -y testdpkgnotinstalled a testdpkginstalled b c testmarkedauto 'b' @@ -67,24 +67,24 @@ b set to manually installed. 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget install b testmarkedauto -aptget remove b -y -qq 2>&1 > /dev/null +testsuccess aptget remove b -y testdpkgnotinstalled a b c testmarkedauto -aptget install a b -y -qq 2>&1 > /dev/null +testsuccess aptget install a b -y testdpkginstalled a b testdpkgnotinstalled c testmarkedauto -aptget purge a b -y -qq 2>&1 > /dev/null +testsuccess aptget purge a b -y testdpkgnotinstalled a b c testmarkedauto -aptget install b c -y -qq 2>&1 > /dev/null +testsuccess aptget install b c -y testdpkgnotinstalled a testdpkginstalled b c testmarkedauto -aptget install a -y -qq 2>&1 > /dev/null +testsuccess aptget install a -y testdpkginstalled a b c testmarkedauto diff --git a/test/integration/test-bug-612099-multiarch-conflicts b/test/integration/test-bug-612099-multiarch-conflicts index 530012e5d..b91804826 100755 --- a/test/integration/test-bug-612099-multiarch-conflicts +++ b/test/integration/test-bug-612099-multiarch-conflicts @@ -15,7 +15,7 @@ buildsimplenativepackage 'foobar' 'amd64' '1.0' 'stable' 'Depends: libc6' setupaptarchive -aptget install libc6:i386 -t stable -y -qq 2>&1 > /dev/null +testsuccess aptget install libc6:i386 -t stable -y testdpkginstalled libc6:i386 testequal 'Reading package lists... Building dependency tree... @@ -79,8 +79,8 @@ Conf libc6 (2.0 testing [all])' aptget upgrade -t testing -s # as APT (here i386) disagree about the native architecture, so # we fake it here: #aptget upgrade -y -qq 2>&1 > /dev/null -aptget purge libc6 -y -qq 2>&1 >/dev/null -aptget install libc6:i386 -y -qq 2>&1 >/dev/null +testsuccess aptget purge libc6 -y +testsuccess aptget install libc6:i386 -y testdpkginstalled libc6:all testequal 'Reading package lists... @@ -129,7 +129,7 @@ buildsimplenativepackage 'foobar-same' 'amd64' '1.0' 'stable' 'Depends: libc6-sa setupaptarchive -aptget install libc6-same:i386 -t stable -y -qq 2>&1 > /dev/null +testsuccess aptget install libc6-same:i386 -t stable -y testdpkginstalled libc6-same:i386 testequal 'Reading package lists... @@ -177,8 +177,8 @@ Conf libc6-same (2.0 testing [all])' aptget upgrade -t testing -s # as APT (here i386) disagree about the native architecture, so # we fake it here: #aptget upgrade -y -qq 2>&1 > /dev/null -aptget purge libc6-same -y -qq 2>&1 >/dev/null -aptget install libc6-same:i386 -y -qq 2>&1 >/dev/null +testsuccess aptget purge libc6-same -y +testsuccess aptget install libc6-same:i386 -y testdpkginstalled libc6-same:all diff --git a/test/integration/test-bug-612557-garbage-upgrade b/test/integration/test-bug-612557-garbage-upgrade index 8efd1687a..910b3b149 100755 --- a/test/integration/test-bug-612557-garbage-upgrade +++ b/test/integration/test-bug-612557-garbage-upgrade @@ -13,7 +13,7 @@ insertpackage 'unstable' 'libreoffice-common' 'all' '1:3.3.0-2' 'Conflicts: open setupaptarchive touch rootdir/var/lib/apt/extended_states -aptmark markauto python-uno openoffice.org-common +testsuccess aptmark markauto python-uno openoffice.org-common #aptmark unmarkauto openoffice.org-emailmerge testmarkedauto python-uno openoffice.org-common @@ -32,7 +32,7 @@ The following packages will be upgraded: After this operation, 53.2 MB disk space will be freed. E: Trivial Only specified but this is not a trivial operation.' aptget --trivial-only install python-uno -aptmark markauto openoffice.org-emailmerge +testsuccess aptmark markauto openoffice.org-emailmerge testmarkedauto python-uno openoffice.org-common openoffice.org-emailmerge testequal 'Reading package lists... diff --git a/test/integration/test-bug-612958-use-dpkg-multiarch-config b/test/integration/test-bug-612958-use-dpkg-multiarch-config index 18b964636..4d1f00ca0 100755 --- a/test/integration/test-bug-612958-use-dpkg-multiarch-config +++ b/test/integration/test-bug-612958-use-dpkg-multiarch-config @@ -14,13 +14,13 @@ insertinstalledpackage 'libapt' 'armel' '1.0' testpass() { rm rootdir/var/cache/apt/*.bin msgtest 'Test architecture handling' "$1 with $2" - aptcache show libapt:$2 2> /dev/null > /dev/null && msgpass || msgfail + testsuccess --nomsg aptcache show libapt:$2 } testfail() { rm rootdir/var/cache/apt/*.bin msgtest 'Test architecture handling' "$1 with $2" - aptcache show libapt:$2 2> /dev/null > /dev/null && msgfail || msgpass + testfailure --nomsg aptcache show libapt:$2 } testpass 'no config' 'i386' diff --git a/test/integration/test-bug-613420-new-garbage-dependency b/test/integration/test-bug-613420-new-garbage-dependency index 7a08871ca..9d9f1096a 100755 --- a/test/integration/test-bug-613420-new-garbage-dependency +++ b/test/integration/test-bug-613420-new-garbage-dependency @@ -15,7 +15,7 @@ insertpackage 'unstable' 'openoffice.org-officebean' 'all' '1:3.3.0-5' 'Depends: setupaptarchive touch rootdir/var/lib/apt/extended_states -aptmark markauto openoffice.org-officebean +testsuccess aptmark markauto openoffice.org-officebean testmarkedauto openoffice.org-officebean testequal "Reading package lists... diff --git a/test/integration/test-bug-64141-install-dependencies-for-on-hold b/test/integration/test-bug-64141-install-dependencies-for-on-hold index e2d206fdd..9a9e7be10 100755 --- a/test/integration/test-bug-64141-install-dependencies-for-on-hold +++ b/test/integration/test-bug-64141-install-dependencies-for-on-hold @@ -31,7 +31,7 @@ The following packages will be upgraded: After this operation, 0 B of additional disk space will be used. E: Trivial Only specified but this is not a trivial operation.' aptget dist-upgrade --trivial-only -aptmark hold apt -qq +testsuccess aptmark hold apt testequal 'Reading package lists... Building dependency tree... diff --git a/test/integration/test-bug-673536-pre-depends-breaks-loop b/test/integration/test-bug-673536-pre-depends-breaks-loop index e9d3c4de6..f6a90b21f 100755 --- a/test/integration/test-bug-673536-pre-depends-breaks-loop +++ b/test/integration/test-bug-673536-pre-depends-breaks-loop @@ -15,9 +15,9 @@ setupaptarchive # we check with 'real' packages here as the simulation reports a 'Conf broken' # which is technical correct for the simulation, but testing errormsg is ugly -aptget install basic=1 -qq > /dev/null +testsuccess aptget install basic=1 -y testdpkginstalled basic testdpkgnotinstalled common -aptget dist-upgrade -qq > /dev/null +testsuccess aptget dist-upgrade -y testdpkginstalled basic common diff --git a/test/integration/test-bug-679371-apt-get-autoclean-multiarch b/test/integration/test-bug-679371-apt-get-autoclean-multiarch index ba6857b73..b62d437aa 100755 --- a/test/integration/test-bug-679371-apt-get-autoclean-multiarch +++ b/test/integration/test-bug-679371-apt-get-autoclean-multiarch @@ -14,8 +14,8 @@ setupaptarchive changetowebserver -aptget update -qq -aptget install pkgall pkgnative pkgforeign -y -qq > /dev/null +testsuccess aptget update +testsuccess aptget install pkgall pkgnative pkgforeign -y testdpkginstalled pkgall pkgnative pkgforeign diff --git a/test/integration/test-bug-686346-package-missing-architecture b/test/integration/test-bug-686346-package-missing-architecture index b2c9ec9ee..3b02811ca 100755 --- a/test/integration/test-bug-686346-package-missing-architecture +++ b/test/integration/test-bug-686346-package-missing-architecture @@ -58,13 +58,13 @@ Building dependency tree... # pkgd has no update with an architecture testdpkginstalled pkgd msgtest 'Test apt-get purge' 'pkgd' -aptget purge pkgd -y >/dev/null 2>&1 && msgpass || msgfail +testsuccess --nomsg aptget purge pkgd -y testdpkgnotinstalled pkgd # there is a pkgb with an architecture testdpkginstalled pkgb msgtest 'Test apt-get purge' 'pkgb:none' -aptget purge pkgb:none -y >/dev/null 2>&1 && msgpass || msgfail +testsuccess --nomsg aptget purge pkgb:none -y testdpkgnotinstalled pkgb # check that dependencies are created after the none package exists in the cache diff --git a/test/integration/test-bug-712116-dpkg-pre-install-pkgs-hook-multiarch b/test/integration/test-bug-712116-dpkg-pre-install-pkgs-hook-multiarch index a89cb7191..af65397ea 100755 --- a/test/integration/test-bug-712116-dpkg-pre-install-pkgs-hook-multiarch +++ b/test/integration/test-bug-712116-dpkg-pre-install-pkgs-hook-multiarch @@ -42,7 +42,7 @@ enablehookversion 3 observehook() { rm -f ${hook}-v2.list ${hook}-v3.list msgtest 'Observe hooks while' "$*" - aptget "$@" -y --force-yes >/dev/null 2>&1 && msgpass || msgfail + testsuccess --nomsg aptget "$@" -y --force-yes } observehook install stuff -t stable diff --git a/test/integration/test-bug-717891-abolute-uris-for-proxies b/test/integration/test-bug-717891-abolute-uris-for-proxies index e9c38492e..ac1d6ec11 100755 --- a/test/integration/test-bug-717891-abolute-uris-for-proxies +++ b/test/integration/test-bug-717891-abolute-uris-for-proxies @@ -12,12 +12,12 @@ setupaptarchive changetowebserver --request-absolute='uri' msgtest 'Check that absolute paths are' 'not accepted' -aptget update >/dev/null 2>&1 && msgfail || msgpass +testfailure --nomsg aptget update echo 'Acquire::http::Proxy "http://localhost:8080";' > rootdir/etc/apt/apt.conf.d/99proxy msgtest 'Check that requests to proxies are' 'absolute uris' -aptget update >/dev/null 2>&1 && msgpass || msgfail +testsuccess --nomsg aptget update testequal 'Reading package lists... Building dependency tree... diff --git a/test/integration/test-compressed-indexes b/test/integration/test-compressed-indexes index a5e885745..c6f5ab49e 100755 --- a/test/integration/test-compressed-indexes +++ b/test/integration/test-compressed-indexes @@ -46,10 +46,10 @@ testrun() { msgpass fi msgtest "Check if package is downloadable" - aptget install -d testpkg -qq && msgpass || msgfail - msgtest "\tdeb file is present"; test -f rootdir/var/cache/apt/archives/testpkg_1.0_i386.deb && msgpass || msgfail + testsuccess --nomsg aptget install -d testpkg + msgtest "\tdeb file is present"; testsuccess --nomsg test -f rootdir/var/cache/apt/archives/testpkg_1.0_i386.deb aptget clean - msgtest "\tdeb file is gone"; ! test -f rootdir/var/cache/apt/archives/testpkg_1.0_i386.deb && msgpass || msgfail + msgtest "\tdeb file is gone"; testfailure --nomsg test -f rootdir/var/cache/apt/archives/testpkg_1.0_i386.deb fi rm -f rootdir/var/cache/apt/pkgcache.bin rootdir/var/cache/apt/srcpkgcache.bin testequal "$GOODSHOW" aptcache show testpkg @@ -62,9 +62,9 @@ testrun() { testequal "$GOODSHOWSRC" aptcache showsrc testpkg aptget clean msgtest "Check if the source is aptgetable" - aptget source testpkg -qq 2> /dev/null > /dev/null && msgpass || msgfail - msgtest "\tdsc file is present"; test -f testpkg_1.0.dsc && msgpass || msgfail - msgtest "\tdirectory is present"; test -d testpkg-1.0 && msgpass || msgfail + testsuccess --nomsg aptget source testpkg + msgtest "\tdsc file is present"; testsuccess --nomsg test -f testpkg_1.0.dsc + msgtest "\tdirectory is present"; testsuccess --nomsg test -d testpkg-1.0 rm -rf testpkg-1.0 } @@ -72,11 +72,11 @@ echo 'Acquire::GzipIndexes "false";' > rootdir/etc/apt/apt.conf.d/02compressinde msgmsg "File: Test with uncompressed indexes" testrun -aptget update -qq -o Acquire::Pdiffs=1 +testsuccess aptget update -o Acquire::Pdiffs=1 msgmsg "File: Test with uncompressed indexes (update unchanged with pdiffs)" testrun -aptget update -qq -o Acquire::Pdiffs=0 +testsuccess aptget update -o Acquire::Pdiffs=0 msgmsg "File: Test with uncompressed indexes (update unchanged without pdiffs)" testrun @@ -84,21 +84,21 @@ rm -rf rootdir/var/lib/apt/lists echo 'Acquire::CompressionTypes::Order:: "gz"; Acquire::GzipIndexes "true";' > rootdir/etc/apt/apt.conf.d/02compressindex -aptget update -qq +testsuccess aptget update msgmsg "File: Test with compressed indexes" testrun "compressed" -aptget update -qq -o Acquire::Pdiffs=1 +testsuccess aptget update -o Acquire::Pdiffs=1 msgmsg "File: Test with compressed indexes (update unchanged with pdiffs)" testrun "compressed" -aptget update -qq -o Acquire::Pdiffs=0 +testsuccess aptget update -o Acquire::Pdiffs=0 msgmsg "File: Test with compressed indexes (update unchanged without pdiffs)" testrun "compressed" rm rootdir/etc/apt/apt.conf.d/02compressindex changetowebserver -aptget update -qq +testsuccess aptget update GOODPOLICY="$(aptcache policy testpkg)" test $(echo "$GOODPOLICY" | grep -e '^testpkg:' -e '^ Candidate:' -e '^ Installed: (none)' -e '500 http://' | wc -l) -eq 4 testequal "$GOODPOLICY" aptcache policy testpkg @@ -106,11 +106,11 @@ testequal "$GOODPOLICY" aptcache policy testpkg msgmsg "HTTP: Test with uncompressed indexes" testrun -aptget update -qq -o Acquire::Pdiffs=1 +testsuccess aptget update -o Acquire::Pdiffs=1 msgmsg "HTTP: Test with uncompressed indexes (update unchanged with pdiffs)" testrun -aptget update -qq -o Acquire::Pdiffs=0 +testsuccess aptget update -o Acquire::Pdiffs=0 msgmsg "HTTP: Test with uncompressed indexes (update unchanged without pdiffs)" testrun @@ -118,14 +118,14 @@ rm -rf rootdir/var/lib/apt/lists echo 'Acquire::CompressionTypes::Order:: "gz"; Acquire::GzipIndexes "true";' > rootdir/etc/apt/apt.conf.d/02compressindex -aptget update -qq +testsuccess aptget update msgmsg "HTTP: Test with compressed indexes" testrun "compressed" -aptget update -qq -o Acquire::Pdiffs=1 +testsuccess aptget update -o Acquire::Pdiffs=1 msgmsg "HTTP: Test with compressed indexes (update unchanged with pdiffs)" testrun "compressed" -aptget update -qq -o Acquire::Pdiffs=0 +testsuccess aptget update -o Acquire::Pdiffs=0 msgmsg "HTTP: Test with compressed indexes (update unchanged without pdiffs)" testrun "compressed" diff --git a/test/integration/test-cve-2013-1051-InRelease-parsing b/test/integration/test-cve-2013-1051-InRelease-parsing index 6764fefff..41b27f691 100755 --- a/test/integration/test-cve-2013-1051-InRelease-parsing +++ b/test/integration/test-cve-2013-1051-InRelease-parsing @@ -14,7 +14,7 @@ setupaptarchive changetowebserver ARCHIVE='http://localhost:8080/' msgtest 'Initial apt-get update should work with' 'InRelease' -aptget update -qq && msgpass || msgfail +testsuccess --nomsg aptget update # check that the setup is correct testequal "good-pkg: diff --git a/test/integration/test-disappearing-packages b/test/integration/test-disappearing-packages index d2ac4edc6..09dbf7014 100755 --- a/test/integration/test-disappearing-packages +++ b/test/integration/test-disappearing-packages @@ -29,7 +29,7 @@ rm -rf "$BUILDDIR" setupaptarchive -aptget install old-pkg=1.0 --trivial-only -qq 2>&1 > /dev/null +testsuccess aptget install old-pkg=1.0 --trivial-only testmarkedauto # old-pkg is manual installed diff --git a/test/integration/test-pdiff-usage b/test/integration/test-pdiff-usage index e45326970..994489ee5 100755 --- a/test/integration/test-pdiff-usage +++ b/test/integration/test-pdiff-usage @@ -11,7 +11,7 @@ buildaptarchive setupflataptarchive changetowebserver signreleasefiles -aptget update -qq +testsuccess aptget update testnopackage newstuff PKGFILE="${TESTDIR}/$(echo "$(basename $0)" | sed 's#^test-#Packages-#')" @@ -38,7 +38,7 @@ SHA1-Patches: generatereleasefiles '+1hour' signreleasefiles find aptarchive -name 'Packages*' -type f -delete -aptget update -qq +testsuccess aptget update testnopackage oldstuff testequal "$(cat ${PKGFILE}-new) diff --git a/test/integration/test-policy-pinning b/test/integration/test-policy-pinning index 9e1ea4ac5..8eb4bcbad 100755 --- a/test/integration/test-policy-pinning +++ b/test/integration/test-policy-pinning @@ -228,16 +228,16 @@ testequalpolicycoolstuff "" "2.0~bpo1" 990 500 600 "2.0~bpo1" -o Test=ButAutomat testequalpolicycoolstuff "" "1.0" 100 990 600 "2.0~bpo1" -o Test=ButAutomaticUpgrades -t stable rm rootdir/etc/apt/preferences -aptget install coolstuff -qq > /dev/null 2> /dev/null +testsuccess aptget install coolstuff -y testequalpolicycoolstuff "1.0" "1.0" 100 500 0 "" -o Test=ButAutomaticUpgrades -aptget dist-upgrade -qq > /dev/null 2> /dev/null +testsuccess aptget dist-upgrade -y testequalpolicycoolstuff "1.0" "1.0" 100 500 0 "" -o Test=ButAutomaticUpgrades testequalpolicycoolstuff "1.0" "1.0" 100 990 0 "" -o Test=ButAutomaticUpgrades -t stable testequalpolicycoolstuff "1.0" "2.0~bpo1" 990 500 0 "" -o Test=ButAutomaticUpgrades -t backports -aptget install coolstuff -t backports -qq > /dev/null 2> /dev/null +testsuccess aptget install coolstuff -t backports -y testequalpolicycoolstuff "2.0~bpo1" "2.0~bpo1" 100 500 0 "" -o Test=ButAutomaticUpgrades -aptget dist-upgrade -qq > /dev/null 2> /dev/null +testsuccess aptget dist-upgrade -y testequalpolicycoolstuff "2.0~bpo1" "2.0~bpo1" 100 500 0 "" -o Test=ButAutomaticUpgrades testequalpolicycoolstuff "2.0~bpo1" "2.0~bpo1" 100 990 0 "" -o Test=ButAutomaticUpgrades -t stable testequalpolicycoolstuff "2.0~bpo1" "2.0~bpo1" 990 500 0 "" -o Test=ButAutomaticUpgrades -t backports diff --git a/test/integration/test-releasefile-valid-until b/test/integration/test-releasefile-valid-until index 680a370cb..e673d5f71 100755 --- a/test/integration/test-releasefile-valid-until +++ b/test/integration/test-releasefile-valid-until @@ -32,64 +32,64 @@ aptgetupdate() { setupreleasefile msgtest 'Release file is accepted as it has' 'no Until' -aptgetupdate && msgpass || msgfail +testsuccess --nomsg aptgetupdate setupreleasefile msgtest 'Release file is accepted as it has' 'no Until and good Max-Valid' -aptgetupdate -o Acquire::Max-ValidTime=3600 && msgpass || msgfail +testsuccess --nomsg aptgetupdate -o Acquire::Max-ValidTime=3600 setupreleasefile 'now - 2 days' msgtest 'Release file is rejected as it has' 'no Until, but bad Max-Valid' -aptgetupdate -o Acquire::Max-ValidTime=3600 && msgfail || msgpass +testfailure --nomsg aptgetupdate -o Acquire::Max-ValidTime=3600 setupreleasefile 'now - 3 days' 'now + 1 day' msgtest 'Release file is accepted as it has' 'good Until' -aptgetupdate && msgpass || msgfail +testsuccess --nomsg aptgetupdate setupreleasefile 'now - 7 days' 'now - 4 days' msgtest 'Release file is rejected as it has' 'bad Until' -aptgetupdate && msgfail || msgpass +testfailure --nomsg aptgetupdate setupreleasefile 'now - 7 days' 'now - 4 days' msgtest 'Release file is rejected as it has' 'bad Until (ignore good Max-Valid)' -aptgetupdate -o Acquire::Max-ValidTime=1209600 && msgfail || msgpass +testfailure --nomsg aptgetupdate -o Acquire::Max-ValidTime=1209600 setupreleasefile 'now - 7 days' 'now - 4 days' msgtest 'Release file is rejected as it has' 'bad Max-Valid (bad Until)' -aptgetupdate -o Acquire::Max-ValidTime=86400 && msgfail || msgpass +testfailure --nomsg aptgetupdate -o Acquire::Max-ValidTime=86400 setupreleasefile 'now - 7 days' 'now + 4 days' msgtest 'Release file is rejected as it has' 'bad Max-Valid (good Until)' -aptgetupdate -o Acquire::Max-ValidTime=86400 && msgfail || msgpass +testfailure --nomsg aptgetupdate -o Acquire::Max-ValidTime=86400 setupreleasefile 'now - 7 days' 'now + 4 days' msgtest 'Release file is accepted as it has' 'good labeled Max-Valid' -aptgetupdate -o Acquire::Max-ValidTime=86400 -o Acquire::Max-ValidTime::Testcases=1209600 && msgpass || msgfail +testsuccess --nomsg aptgetupdate -o Acquire::Max-ValidTime=86400 -o Acquire::Max-ValidTime::Testcases=1209600 setupreleasefile 'now - 7 days' 'now + 4 days' msgtest 'Release file is rejected as it has' 'bad labeled Max-Valid' -aptgetupdate -o Acquire::Max-ValidTime=1209600 -o Acquire::Max-ValidTime::Testcases=86400 && msgfail || msgpass +testfailure --nomsg aptgetupdate -o Acquire::Max-ValidTime=1209600 -o Acquire::Max-ValidTime::Testcases=86400 setupreleasefile 'now - 7 days' 'now + 1 days' msgtest 'Release file is accepted as it has' 'good Until (good Min-Valid, no Max-Valid)' -aptgetupdate -o Acquire::Min-ValidTime=1209600 && msgpass || msgfail +testsuccess --nomsg aptgetupdate -o Acquire::Min-ValidTime=1209600 setupreleasefile 'now - 7 days' 'now - 4 days' msgtest 'Release file is accepted as it has' 'good Min-Valid (bad Until, no Max-Valid)' -aptgetupdate -o Acquire::Min-ValidTime=1209600 && msgpass || msgfail +testsuccess --nomsg aptgetupdate -o Acquire::Min-ValidTime=1209600 setupreleasefile 'now - 7 days' 'now - 2 days' msgtest 'Release file is accepted as it has' 'good Min-Valid (bad Until, good Max-Valid) <' -aptgetupdate -o Acquire::Min-ValidTime=1209600 -o Acquire::Max-ValidTime=2419200 && msgpass || msgfail +testsuccess --nomsg aptgetupdate -o Acquire::Min-ValidTime=1209600 -o Acquire::Max-ValidTime=2419200 setupreleasefile 'now - 7 days' 'now - 2 days' msgtest 'Release file is rejected as it has' 'bad Max-Valid (bad Until, good Min-Valid) >' -aptgetupdate -o Acquire::Max-ValidTime=12096 -o Acquire::Min-ValidTime=2419200 && msgfail || msgpass +testfailure --nomsg aptgetupdate -o Acquire::Max-ValidTime=12096 -o Acquire::Min-ValidTime=2419200 setupreleasefile 'now - 7 days' 'now - 2 days' msgtest 'Release file is rejected as it has' 'bad Max-Valid (bad Until, bad Min-Valid) <' -aptgetupdate -o Acquire::Min-ValidTime=12096 -o Acquire::Max-ValidTime=241920 && msgfail || msgpass +testfailure --nomsg aptgetupdate -o Acquire::Min-ValidTime=12096 -o Acquire::Max-ValidTime=241920 setupreleasefile 'now - 7 days' 'now - 2 days' msgtest 'Release file is rejected as it has' 'bad Max-Valid (bad Until, bad Min-Valid) >' -aptgetupdate -o Acquire::Max-ValidTime=12096 -o Acquire::Min-ValidTime=241920 && msgfail || msgpass +testfailure --nomsg aptgetupdate -o Acquire::Max-ValidTime=12096 -o Acquire::Min-ValidTime=241920 diff --git a/test/integration/test-ubuntu-bug-761175-remove-purge b/test/integration/test-ubuntu-bug-761175-remove-purge index f55c6e909..14648e9b8 100755 --- a/test/integration/test-ubuntu-bug-761175-remove-purge +++ b/test/integration/test-ubuntu-bug-761175-remove-purge @@ -18,12 +18,10 @@ setupaptarchive testdpkgnotinstalled compiz-core -msgtest 'Install package' 'compiz-core' -aptget install compiz-core -qq 2>&1 >/dev/null && msgpass || msgfail +testsuccess aptget install compiz-core testdpkginstalled compiz-core -msgtest 'Remove package' 'compiz-core' -aptget remove compiz-core -y -qq 2>&1 >/dev/null && msgpass || msgfail +testsuccess aptget remove compiz-core -y testdpkgnotinstalled compiz-core msgtest 'Check that conffiles are still around for' 'compiz-core' diff --git a/test/integration/test-ubuntu-bug-784473-InRelease-one-message-only b/test/integration/test-ubuntu-bug-784473-InRelease-one-message-only index fad5488fb..e9d684309 100755 --- a/test/integration/test-ubuntu-bug-784473-InRelease-one-message-only +++ b/test/integration/test-ubuntu-bug-784473-InRelease-one-message-only @@ -28,7 +28,7 @@ MD5Sum: done msgtest 'The unsigned garbage before signed block is' 'ignored' -aptget update -qq > /dev/null 2>&1 && msgpass || msgfail +testsuccess --nomsg aptget update ROOTDIR="$(readlink -f .)" testequal "Package files: -- cgit v1.2.3 From ffcccd62f0d5822a71e24baf84126af5c93a5e69 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 10 Aug 2013 12:40:37 +0200 Subject: fix: --print-uris removes authentication MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The constructors of our (clear)sign-acquire-items move a pre-existent file for error-recovery away, which gets restored or discarded later as the acquire progresses, but --print-uris never really starts the acquire process, so the files aren't restored (as they should). To fix this both get a destructor which checks for signs of acquire doing anything and if it hasn't the file is restored. Note that these virtual destructors theoretically break the API, but only with classes extending the sign-acquire-items and nobody does this, as it would be insane for library users to fiddle with Acquire internals – and these classes are internals. Closes: 719263 --- apt-pkg/acquire-item.cc | 31 +++++++++++++--- apt-pkg/acquire-item.h | 2 ++ test/integration/test-bug-602412-dequote-redirect | 2 +- ...st-bug-719263-print-uris-removes-authentication | 41 ++++++++++++++++++++++ 4 files changed, 71 insertions(+), 5 deletions(-) create mode 100755 test/integration/test-bug-719263-print-uris-removes-authentication diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 7bcdf285b..95dadcd6d 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -1067,8 +1067,7 @@ pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner, /*{{{*/ string Final = _config->FindDir("Dir::State::lists"); Final += URItoFileName(RealURI); - struct stat Buf; - if (stat(Final.c_str(),&Buf) == 0) + if (RealFileExists(Final) == true) { // File was already in place. It needs to be re-downloaded/verified // because Release might have changed, we do give it a differnt @@ -1080,6 +1079,19 @@ pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner, /*{{{*/ } QueueURI(Desc); +} + /*}}}*/ +pkgAcqMetaSig::~pkgAcqMetaSig() /*{{{*/ +{ + // if the file was never queued undo file-changes done in the constructor + if (QueueCounter == 1 && Status == StatIdle && FileSize == 0 && Complete == false && + LastGoodSig.empty() == false) + { + string const Final = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI); + if (RealFileExists(Final) == false && RealFileExists(LastGoodSig) == true) + Rename(LastGoodSig, Final); + } + } /*}}}*/ // pkgAcqMetaSig::Custom600Headers - Insert custom request headers /*{{{*/ @@ -1595,14 +1607,25 @@ pkgAcqMetaClearSig::pkgAcqMetaClearSig(pkgAcquire *Owner, /*{{{*/ // keep the old InRelease around in case of transistent network errors string const Final = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI); - struct stat Buf; - if (stat(Final.c_str(),&Buf) == 0) + if (RealFileExists(Final) == true) { string const LastGoodSig = DestFile + ".reverify"; Rename(Final,LastGoodSig); } } /*}}}*/ +pkgAcqMetaClearSig::~pkgAcqMetaClearSig() /*{{{*/ +{ + // if the file was never queued undo file-changes done in the constructor + if (QueueCounter == 1 && Status == StatIdle && FileSize == 0 && Complete == false) + { + string const Final = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI); + string const LastGoodSig = DestFile + ".reverify"; + if (RealFileExists(Final) == false && RealFileExists(LastGoodSig) == true) + Rename(LastGoodSig, Final); + } +} + /*}}}*/ // pkgAcqMetaClearSig::Custom600Headers - Insert custom request headers /*{{{*/ // --------------------------------------------------------------------- // FIXME: this can go away once the InRelease file is used widely diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index 51d539450..10c855e63 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -774,6 +774,7 @@ class pkgAcqMetaSig : public pkgAcquire::Item std::string MetaIndexURI, std::string MetaIndexURIDesc, std::string MetaIndexShortDesc, const std::vector* IndexTargets, indexRecords* MetaIndexParser); + virtual ~pkgAcqMetaSig(); }; /*}}}*/ /** \brief An item that is responsible for downloading the meta-index {{{ @@ -904,6 +905,7 @@ public: std::string const &MetaSigURI, std::string const &MetaSigURIDesc, std::string const &MetaSigShortDesc, const std::vector* IndexTargets, indexRecords* MetaIndexParser); + virtual ~pkgAcqMetaClearSig(); }; /*}}}*/ /** \brief An item that is responsible for fetching a package file. {{{ diff --git a/test/integration/test-bug-602412-dequote-redirect b/test/integration/test-bug-602412-dequote-redirect index 764e13667..bcebb57b8 100755 --- a/test/integration/test-bug-602412-dequote-redirect +++ b/test/integration/test-bug-602412-dequote-redirect @@ -26,4 +26,4 @@ Hit http://localhost:8080 unstable/main Translation-en Reading package lists...' aptget update #-o debug::pkgacquire=1 -o debug::pkgacquire::worker=1 msgtest 'Test redirection works in' 'package download' -testsuccess --nomsg aptget install unrelated --download-only +testsuccess --nomsg aptget install unrelated --download-only -y diff --git a/test/integration/test-bug-719263-print-uris-removes-authentication b/test/integration/test-bug-719263-print-uris-removes-authentication new file mode 100755 index 000000000..1c1a27ceb --- /dev/null +++ b/test/integration/test-bug-719263-print-uris-removes-authentication @@ -0,0 +1,41 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework + +setupenvironment +configarchitecture 'amd64' + +insertinstalledpackage 'unrelated' 'all' '1' +buildsimplenativepackage 'unrelated' 'all' '2' 'unstable' + +setupaptarchive + +testnoact() { + cp -a rootdir/var/lib/dpkg/status rootdir/var/lib/dpkg/status-backup-noact + touch rootdir/var/lib/apt/extended_states + testequal 'Reading package lists... +Building dependency tree... +Reading state information... +The following packages will be upgraded: + unrelated +1 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. +Inst unrelated [1] (2 unstable [all]) +Conf unrelated (2 unstable [all])' aptget install unrelated -s + testsuccess aptget install unrelated -y + testdpkginstalled unrelated + cp -a rootdir/var/lib/dpkg/status-backup-noact rootdir/var/lib/dpkg/status +} + +testnoact +testsuccess aptget update --print-uris +testnoact + +# same thing, just not with InRelease this time +rm -rf rootdir/var/lib/apt/lists +testsuccess aptget update -o Acquire::TryInRelease=0 + +testnoact +testsuccess aptget update --print-uris -o Acquire::TryInRelease=0 +testnoact -- cgit v1.2.3 From 7a2690a3bf59244fff417ab494f68fd9301b74d9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 13 Jul 2013 22:57:44 +0200 Subject: fix output redirection order First redirect output to a file, then redirect other outputs to this output, not the other way around as this will not work. Git-Dch: Ignore --- test/integration/framework | 6 +++--- test/integration/skip-avoid-avoiding-breaks-predepends | 2 +- test/integration/test-bug-612099-multiarch-conflicts | 4 ++-- test/integration/test-bug-618288-multiarch-same-lockstep | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/integration/framework b/test/integration/framework index e363977f5..005e31bd3 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -177,7 +177,7 @@ setupenvironment() { echo "DPKG::options:: \"--root=${TMPWORKINGDIRECTORY}/rootdir\";" >> aptconfig.conf echo "DPKG::options:: \"--force-not-root\";" >> aptconfig.conf echo "DPKG::options:: \"--force-bad-path\";" >> aptconfig.conf - if ! $(which dpkg) --assert-multi-arch 2>&1 > /dev/null; then + if ! $(which dpkg) --assert-multi-arch >/dev/null 2>&1; then echo "DPKG::options:: \"--force-architecture\";" >> aptconfig.conf # Added to test multiarch before dpkg is ready for it… fi echo "DPKG::options:: \"--log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log\";" >> aptconfig.conf @@ -225,7 +225,7 @@ configdpkg() { echo -n > rootdir/var/lib/dpkg/status fi fi - if $(which dpkg) --assert-multi-arch 2>&1 > /dev/null; then + if $(which dpkg) --assert-multi-arch >/dev/null 2>&1; then local ARCHS="$(getarchitectures)" if echo "$ARCHS" | grep -E -q '[^ ]+ [^ ]+'; then DPKGARCH="$(dpkg --print-architecture)" @@ -851,7 +851,7 @@ testequalor2() { echo "$2" > $COMPAREFILE2 shift 2 msgtest "Test for equality OR of" "$*" - $* 2>&1 1> $COMPAREAGAINST + $* >$COMPAREAGAINST 2>&1 (checkdiff $COMPAREFILE1 $COMPAREAGAINST 1> /dev/null || checkdiff $COMPAREFILE2 $COMPAREAGAINST 1> /dev/null) && msgpass || ( echo "\n${CINFO}Diff against OR 1${CNORMAL}" "$(checkdiff $COMPAREFILE1 $COMPAREAGAINST)" \ diff --git a/test/integration/skip-avoid-avoiding-breaks-predepends b/test/integration/skip-avoid-avoiding-breaks-predepends index a47e8bc2b..ed231bc3f 100755 --- a/test/integration/skip-avoid-avoiding-breaks-predepends +++ b/test/integration/skip-avoid-avoiding-breaks-predepends @@ -17,5 +17,5 @@ Pre-Depends: looping (>= 1.15)' setupaptarchive -aptget dist-upgrade -y -o Debug::pkgOrderList=1 #-qq 2>&1 > /dev/null +aptget dist-upgrade -y -o Debug::pkgOrderList=1 #-qq >/dev/null 2>&1 testdpkginstalled looping loop1 loop2 diff --git a/test/integration/test-bug-612099-multiarch-conflicts b/test/integration/test-bug-612099-multiarch-conflicts index b91804826..20dc3a7e5 100755 --- a/test/integration/test-bug-612099-multiarch-conflicts +++ b/test/integration/test-bug-612099-multiarch-conflicts @@ -78,7 +78,7 @@ Conf libc6 (2.0 testing [all])' aptget upgrade -t testing -s # FIXME: on amd64 systems this test wouldn't run with a real upgrade # as APT (here i386) disagree about the native architecture, so # we fake it here: -#aptget upgrade -y -qq 2>&1 > /dev/null +#aptget upgrade -y -qq >/dev/null 2>&1 testsuccess aptget purge libc6 -y testsuccess aptget install libc6:i386 -y testdpkginstalled libc6:all @@ -176,7 +176,7 @@ Conf libc6-same (2.0 testing [all])' aptget upgrade -t testing -s # FIXME: on amd64 systems this test wouldn't run with a real upgrade # as APT (here i386) disagree about the native architecture, so # we fake it here: -#aptget upgrade -y -qq 2>&1 > /dev/null +#aptget upgrade -y -qq >/dev/null 2>&1 testsuccess aptget purge libc6-same -y testsuccess aptget install libc6-same:i386 -y testdpkginstalled libc6-same:all diff --git a/test/integration/test-bug-618288-multiarch-same-lockstep b/test/integration/test-bug-618288-multiarch-same-lockstep index fde075172..e0305b64b 100755 --- a/test/integration/test-bug-618288-multiarch-same-lockstep +++ b/test/integration/test-bug-618288-multiarch-same-lockstep @@ -16,7 +16,7 @@ buildsimplenativepackage 'apt' 'i386' '2' 'unstable' 'Depends: libsame (= 2)' '' buildsimplenativepackage 'apt2' 'amd64' '2' 'unstable' 'Depends: libsame (= 2)' '' 'required' setupaptarchive -aptget dist-upgrade -s 2>&1 > output.apt +aptget dist-upgrade -s >output.apt 2>&1 # order in switch libsame:{amd64,i386} are unpacked is irrelevant, as both are installed - but we need to do it together LS_U_AMD="$(grep -o -n '^Inst libsame ' output.apt | cut -d: -f1)" -- cgit v1.2.3 From 11b126f9d229c85bfc7a6092527af46f7314f188 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 13 Jul 2013 23:05:55 +0200 Subject: do not try to chown if not run as root MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If this code is run as non-root we are in a special situation (e.g. in our testcases) where it is obvious that we can't enforce user/group on any file, so skip this code altogether instead of bugging users with an error message – which we also switch to a warning as a failure to open the file is "just" a warning, so the 'wrong' owner shouldn't be that much of an issue. The file is still handled with chmod, so all the security we can enforce is still enforced of course, which also gets a warning if it fails. Git-Dch: Ignore --- apt-pkg/deb/dpkgpm.cc | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 34ae4e593..5b2a8251e 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -751,14 +751,15 @@ bool pkgDPkgPM::OpenLog() return _error->WarningE("OpenLog", _("Could not open file '%s'"), logfile_name.c_str()); setvbuf(d->term_out, NULL, _IONBF, 0); SetCloseExec(fileno(d->term_out), true); - struct passwd *pw; - struct group *gr; - pw = getpwnam("root"); - gr = getgrnam("adm"); - if (pw != NULL && gr != NULL) - if(chown(logfile_name.c_str(), pw->pw_uid, gr->gr_gid) != 0) - _error->Errno("OpenLog", "chown failed"); - chmod(logfile_name.c_str(), 0640); + if (getuid() == 0) // if we aren't root, we can't chown a file, so don't try it + { + struct passwd *pw = getpwnam("root"); + struct group *gr = getgrnam("adm"); + if (pw != NULL && gr != NULL && chown(logfile_name.c_str(), pw->pw_uid, gr->gr_gid) != 0) + _error->WarningE("OpenLog", "chown to root:adm of file %s failed", logfile_name.c_str()); + } + if (chmod(logfile_name.c_str(), 0640) != 0) + _error->WarningE("OpenLog", "chmod 0640 of file %s failed", logfile_name.c_str()); fprintf(d->term_out, "\nLog started: %s\n", timestr); } -- cgit v1.2.3 From 87281603a1342a7dc4d12f979574704a45bf6b7b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 13 Jul 2013 23:14:41 +0200 Subject: use our _error stack to generate openpty errors While we don't want these error messages on our usual stack, we can use our usual infrastructure to generate an error message with all the usual bells like errno and strerror attached. Git-Dch: Ignore --- apt-pkg/deb/dpkgpm.cc | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 5b2a8251e..959d06455 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -1238,16 +1238,13 @@ bool pkgDPkgPM::Go(int OutStatusFd) // if tcgetattr does not return zero there was a error // and we do not do any pty magic - if (tcgetattr(0, &tt) == 0) + _error->PushToStack(); + if (tcgetattr(STDOUT_FILENO, &tt) == 0) { ioctl(0, TIOCGWINSZ, (char *)&win); - if (openpty(&master, &slave, NULL, &tt, &win) < 0) + if (openpty(&master, &slave, NULL, &tt, &win) < 0) { - const char *s = _("Can not write log, openpty() " - "failed (/dev/pts not mounted?)\n"); - fprintf(stderr, "%s",s); - if(d->term_out) - fprintf(d->term_out, "%s",s); + _error->Errno("openpty", _("Can not write log (%s)"), _("Is /dev/pts mounted?")); master = slave = -1; } else { struct termios rtt; @@ -1265,6 +1262,15 @@ bool pkgDPkgPM::Go(int OutStatusFd) sigprocmask(SIG_SETMASK, &original_sigmask, 0); } } + // complain only if stdout is either a terminal (but still failed) or is an invalid + // descriptor otherwise we would complain about redirection to e.g. /dev/null as well. + else if (isatty(STDOUT_FILENO) == 1 || errno == EBADF) + _error->Errno("tcgetattr", _("Can not write log (%s)"), _("Is stdout a terminal?")); + + if (_error->PendingError() == true) + _error->DumpErrors(std::cerr); + _error->RevertToStack(); + // Fork dpkg pid_t Child; _config->Set("APT::Keep-Fds::",fd[1]); -- cgit v1.2.3 From 3dc55197095e0536aae4d5c0c91e28bfd4740ec6 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 11 Jul 2013 19:20:09 +0200 Subject: add a not documented apt-key --fakeroot option Usually, most apt-key commands require root, so the script is checking for being run as root, but in your tests we use a non-root location, so we don't need to be root and therefore need an option to skip the check. Git-Dch: Ignore --- cmdline/apt-key | 73 ++++++++++++++++++++++++++++++++------------------------- 1 file changed, 41 insertions(+), 32 deletions(-) diff --git a/cmdline/apt-key b/cmdline/apt-key index 2c087acbc..89e224923 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -158,39 +158,48 @@ usage() { echo "If no specific keyring file is given the command applies to all keyring files." } -# Determine on which keyring we want to work -if [ "$1" = "--keyring" ]; then - #echo "keyfile given" - shift - TRUSTEDFILE="$1" - if [ -r "$TRUSTEDFILE" ] || [ "$2" = 'add' ] || [ "$2" = 'adv' ]; then - GPG="$GPG --keyring $TRUSTEDFILE --primary-keyring $TRUSTEDFILE" - else - echo >&2 "Error: The specified keyring »$TRUSTEDFILE« is missing or not readable" - exit 1 - fi - shift -# otherwise use the default -else - #echo "generate list" - TRUSTEDFILE="/etc/apt/trusted.gpg" - eval $(apt-config shell TRUSTEDFILE Apt::GPGV::TrustedKeyring) - eval $(apt-config shell TRUSTEDFILE Dir::Etc::Trusted/f) - if [ -r "$TRUSTEDFILE" ]; then - GPG="$GPG --keyring $TRUSTEDFILE" - fi - GPG="$GPG --primary-keyring $TRUSTEDFILE" - TRUSTEDPARTS="/etc/apt/trusted.gpg.d" - eval $(apt-config shell TRUSTEDPARTS Dir::Etc::TrustedParts/d) - if [ -d "$TRUSTEDPARTS" ]; then - #echo "parts active" - for trusted in $(run-parts --list $TRUSTEDPARTS --regex '^.*\.gpg$'); do - #echo "part -> $trusted" - GPG="$GPG --keyring $trusted" - done - fi +while [ -n "$1" ]; do + case "$1" in + --keyring) + shift + TRUSTEDFILE="$1" + if [ -r "$TRUSTEDFILE" ] || [ "$2" = 'add' ] || [ "$2" = 'adv' ]; then + GPG="$GPG --keyring $TRUSTEDFILE --primary-keyring $TRUSTEDFILE" + else + echo >&2 "Error: The specified keyring »$TRUSTEDFILE« is missing or not readable" + exit 1 + fi + shift + ;; + --fakeroot) + requires_root() { true; } + shift + ;; + --*) + echo >&2 "Unknown option: $1" + usage + exit 1;; + *) + break;; + esac +done + +if [ -z "$TRUSTEDFILE" ]; then + TRUSTEDFILE="/etc/apt/trusted.gpg" + eval $(apt-config shell TRUSTEDFILE Apt::GPGV::TrustedKeyring) + eval $(apt-config shell TRUSTEDFILE Dir::Etc::Trusted/f) + if [ -r "$TRUSTEDFILE" ]; then + GPG="$GPG --keyring $TRUSTEDFILE" + fi + GPG="$GPG --primary-keyring $TRUSTEDFILE" + TRUSTEDPARTS="/etc/apt/trusted.gpg.d" + eval $(apt-config shell TRUSTEDPARTS Dir::Etc::TrustedParts/d) + if [ -d "$TRUSTEDPARTS" ]; then + for trusted in $(run-parts --list $TRUSTEDPARTS --regex '^.*\.gpg$'); do + GPG="$GPG --keyring $trusted" + done + fi fi -#echo "COMMAND: $GPG" command="$1" if [ -z "$command" ]; then -- cgit v1.2.3 From c0a013221d296e97d68b4e9a66fef5c886d2bbb0 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 11 Jul 2013 20:07:22 +0200 Subject: always use our own trustdb.gpg in apt-key APT doesn't care for the trustdb.gpg, but gnupg requires one even for the simplest commands, so we either use the one root has available in /etc or if we don't have access to it (as only root can read that file) we create a temporary directory to store a trustdb.gpg in it. We can't create just a temporary file as gpg requires the given trustdb.gpg file to be valid (if it exists), so we would have to remove the file before calling gnupg which would allow mktemp (and co) to hand exactly this filename out to another program (unlikely, but still). --- cmdline/apt-key | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/cmdline/apt-key b/cmdline/apt-key index 89e224923..4596e4a47 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -6,15 +6,23 @@ unset GREP_OPTIONS # We don't use a secret keyring, of course, but gpg panics and # implodes if there isn't one available SECRETKEYRING="$(mktemp)" -trap "rm -f '${SECRETKEYRING}'" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM +CURRENTTRAP="rm -f '${SECRETKEYRING}';" +trap "${CURRENTTRAP}" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM GPG_CMD="gpg --ignore-time-conflict --no-options --no-default-keyring --secret-keyring ${SECRETKEYRING}" -if [ "$(id -u)" -eq 0 ]; then - # we could use a tmpfile here too, but creation of this tends to be time-consuming - eval $(apt-config shell TRUSTDBDIR Dir::Etc/d) - GPG_CMD="$GPG_CMD --trustdb-name ${TRUSTDBDIR}/trustdb.gpg" +eval $(apt-config shell TRUSTDBDIR Dir::Etc/d) +if [ "$(id -u)" -eq 0 ] || [ -r "${TRUSTDBDIR}/trustdb.gpg" ]; then + # root can read/create the file as needed, so use the default + true +else + # gpg needs a trustdb to function, but it can't be invalid (not even empty) + # so we create a tempory directory to store our fresh readable trustdb in + TRUSTDBDIR="$(mktemp -d)" + CURRENTTRAP="${CURRENTTRAP} rm -rf '${TRUSTDBDIR}';" + trap "${CURRENTTRAP}" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM + chmod 700 "$TRUSTDBDIR" fi - +GPG_CMD="$GPG_CMD --trustdb-name ${TRUSTDBDIR}/trustdb.gpg" GPG="$GPG_CMD" MASTER_KEYRING="" -- cgit v1.2.3 From f9e64e7bb0c125b54f0699d9e08956a88b467a7f Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 12 Aug 2013 00:19:10 +0200 Subject: use a tmpfile for trustdb.gpg in apt-key MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit for some "interesting" reason gpg decides that it needs to update its trustdb.gpg file in a --list-keys command even if right before gpg is asked to --check-trustdb. That wouldn't be as bad if it wouldn't modify the keyring being listed at that moment as well, which generates not only warnings which are not a problem for us, but as the keyring modified can be in /usr it modified files which aren't allowed to be modified. The suggested solution in the bugreport is running --check-trustdb unconditionally in an 'apt-key update' call, but this command will not be used in the future and this could still potentially bite us in net-update or adv calls. All of this just to keep a file around, which we do not need… The commit therefore switches to the use of a temporary created trusted.gpg file for everyone and asks gpg to not try to update the trustdb after its intial creation, which seems to avoid the problem altogether. It is using your also faked secring btw as calling the check-trustdb without a keyring is a lot slower … Closes: #687611 Thanks: Andreas Beckmann for the initial patch! --- cmdline/apt-key | 36 ++++++++++++++++++------------------ debian/apt.postinst | 13 +++++++++---- 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/cmdline/apt-key b/cmdline/apt-key index 4596e4a47..e010e6e90 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -3,26 +3,26 @@ set -e unset GREP_OPTIONS -# We don't use a secret keyring, of course, but gpg panics and -# implodes if there isn't one available -SECRETKEYRING="$(mktemp)" -CURRENTTRAP="rm -f '${SECRETKEYRING}';" -trap "${CURRENTTRAP}" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM -GPG_CMD="gpg --ignore-time-conflict --no-options --no-default-keyring --secret-keyring ${SECRETKEYRING}" +GPG_CMD="gpg --ignore-time-conflict --no-options --no-default-keyring" -eval $(apt-config shell TRUSTDBDIR Dir::Etc/d) -if [ "$(id -u)" -eq 0 ] || [ -r "${TRUSTDBDIR}/trustdb.gpg" ]; then - # root can read/create the file as needed, so use the default - true -else - # gpg needs a trustdb to function, but it can't be invalid (not even empty) - # so we create a tempory directory to store our fresh readable trustdb in - TRUSTDBDIR="$(mktemp -d)" - CURRENTTRAP="${CURRENTTRAP} rm -rf '${TRUSTDBDIR}';" - trap "${CURRENTTRAP}" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM - chmod 700 "$TRUSTDBDIR" -fi +# gpg needs a trustdb to function, but it can't be invalid (not even empty) +# so we create a temporary directory to store our fresh readable trustdb in +TRUSTDBDIR="$(mktemp -d)" +CURRENTTRAP="${CURRENTTRAP} rm -rf '${TRUSTDBDIR}';" +trap "${CURRENTTRAP}" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM +chmod 700 "$TRUSTDBDIR" +# We also don't use a secret keyring, of course, but gpg panics and +# implodes if there isn't one available - and writeable for imports +SECRETKEYRING="${TRUSTDBDIR}/secring.gpg" +touch $SECRETKEYRING +GPG_CMD="$GPG_CMD --secret-keyring $SECRETKEYRING" GPG_CMD="$GPG_CMD --trustdb-name ${TRUSTDBDIR}/trustdb.gpg" + +# now create the trustdb with an (empty) dummy keyring +$GPG_CMD --quiet --check-trustdb --keyring $SECRETKEYRING +# and make sure that gpg isn't trying to update the file +GPG_CMD="$GPG_CMD --no-auto-check-trustdb --trust-model always" + GPG="$GPG_CMD" MASTER_KEYRING="" diff --git a/debian/apt.postinst b/debian/apt.postinst index 9ff1e031c..caa05ccdf 100644 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -15,10 +15,15 @@ set -e case "$1" in configure) - SECRING='/etc/apt/secring.gpg' - # test if secring is an empty normal file - if test -f $SECRING -a ! -s $SECRING; then - rm -f $SECRING + if dpkg --compare-versions "$2" lt-nl 0.9.9.5; then + # we are using tmpfiles for both + rm -f /etc/apt/trustdb.gpg + # this removal was done unconditional since 0.8.15.3 + SECRING='/etc/apt/secring.gpg' + # test if secring is an empty normal file + if test -f $SECRING -a ! -s $SECRING; then + rm -f $SECRING + fi fi apt-key update -- cgit v1.2.3 From 59f46f3ace16e769383a61ee336a76c6d03931ea Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 12 Aug 2013 00:33:37 +0200 Subject: do not double-slash paths in apt-key Closes: 665411 --- cmdline/apt-key | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cmdline/apt-key b/cmdline/apt-key index e010e6e90..7038be265 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -203,7 +203,12 @@ if [ -z "$TRUSTEDFILE" ]; then TRUSTEDPARTS="/etc/apt/trusted.gpg.d" eval $(apt-config shell TRUSTEDPARTS Dir::Etc::TrustedParts/d) if [ -d "$TRUSTEDPARTS" ]; then - for trusted in $(run-parts --list $TRUSTEDPARTS --regex '^.*\.gpg$'); do + # strip / suffix as gpg will double-slash in that case (#665411) + STRIPPED_TRUSTEDPARTS="${TRUSTEDPARTS%/}" + if [ "${STRIPPED_TRUSTEDPARTS}/" = "$TRUSTEDPARTS" ]; then + TRUSTEDPARTS="$STRIPPED_TRUSTEDPARTS" + fi + for trusted in $(run-parts --list "$TRUSTEDPARTS" --regex '^.*\.gpg$'); do GPG="$GPG --keyring $trusted" done fi -- cgit v1.2.3 From 80f3aeb04d043356bd98de7714fc164b3fff3861 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 12 Aug 2013 00:36:52 +0200 Subject: make the keyring locations in apt-key configurable Might come in handy for more than just a simple testcase. --- cmdline/apt-key | 6 +++++- test/integration/test-apt-key | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100755 test/integration/test-apt-key diff --git a/cmdline/apt-key b/cmdline/apt-key index 7038be265..a9cbea55c 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -26,12 +26,16 @@ GPG_CMD="$GPG_CMD --no-auto-check-trustdb --trust-model always" GPG="$GPG_CMD" MASTER_KEYRING="" -ARCHIVE_KEYRING_URI="" #MASTER_KEYRING=/usr/share/keyrings/debian-master-keyring.gpg +eval $(apt-config shell MASTER_KEYRING APT::Key::MasterKeyring) +ARCHIVE_KEYRING_URI="" #ARCHIVE_KEYRING_URI=http://ftp.debian.org/debian/debian-archive-keyring.gpg +eval $(apt-config shell ARCHIVE_KEYRING_URI APT::Key::ArchiveKeyringURI) ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg +eval $(apt-config shell ARCHIVE_KEYRING APT::Key::ArchiveKeyring) REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg +eval $(apt-config shell REMOVED_KEYS APT::Key::RemovedKeys) requires_root() { if [ "$(id -u)" -ne 0 ]; then diff --git a/test/integration/test-apt-key b/test/integration/test-apt-key new file mode 100755 index 000000000..5beb6f220 --- /dev/null +++ b/test/integration/test-apt-key @@ -0,0 +1,39 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework + +setupenvironment +configarchitecture 'amd64' + +msgtest 'Check that paths in list output are not' 'double-slashed' +aptkey list 2>&1 | grep -q '//' && msgfail || msgpass + +msgtest 'Check that paths in finger output are not' 'double-slashed' +aptkey finger 2>&1 | grep -q '//' && msgfail || msgpass + +echo 'APT::Key::ArchiveKeyring "./keys/joesixpack.pub"; +APT::Key::RemovedKeys "./keys/rexexpired.pub";' > rootdir/etc/apt/apt.conf.d/aptkey.conf + +aptkey list | grep '^pub' > aptkey.list +testfileequal ./aptkey.list 'pub 2048R/DBAC8DAE 2010-08-18' + +testequal 'gpg: key DBAC8DAE: "Joe Sixpack (APT Testcases Dummy) " not changed +gpg: Total number processed: 1 +gpg: unchanged: 1' aptkey --fakeroot update + +aptkey list | grep '^pub' > aptkey.list +testfileequal ./aptkey.list 'pub 2048R/DBAC8DAE 2010-08-18' + +testsuccess aptkey --fakeroot add ./keys/rexexpired.pub + +aptkey list | grep '^pub' > aptkey.list +testfileequal ./aptkey.list 'pub 2048R/27CE74F9 2013-07-12 [expired: 2013-07-13] +pub 2048R/DBAC8DAE 2010-08-18' + +msgtest 'Execute update again to trigger removal of' 'Rex Expired key' +testsuccess --nomsg aptkey --fakeroot update + +aptkey list | grep '^pub' > aptkey.list +testfileequal ./aptkey.list 'pub 2048R/DBAC8DAE 2010-08-18' -- cgit v1.2.3 From 804d4a0d92a2e107aad38198ac08f1d2d64b5e53 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 12 Aug 2013 15:51:42 +0200 Subject: ensure that testcases exiting because of set -e aren't successful Git-Dch: Ignore --- test/integration/framework | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/test/integration/framework b/test/integration/framework index 005e31bd3..72c899e32 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -131,13 +131,23 @@ exitwithstatus() { exit $((EXIT_CODE <= 255 ? EXIT_CODE : 255)); } +shellsetedetector() { + local exit_status=$? + if [ "$exit_status" != '0' ]; then + echo >&2 "${CERROR}E: Looks like the testcases ended prematurely with exitcode: ${exit_status}${CNORMAL}" + if [ "$EXIT_CODE" = '0' ]; then + EXIT_CODE="$exit_status" + fi + fi +} + addtrap() { if [ "$1" = 'prefix' ]; then CURRENTTRAP="$2 $CURRENTTRAP" else CURRENTTRAP="$CURRENTTRAP $1" fi - trap "$CURRENTTRAP exitwithstatus;" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM + trap "shellsetedetector; $CURRENTTRAP exitwithstatus;" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM } setupenvironment() { -- cgit v1.2.3 From 04937adc655ceda0b3367f540e76df10296cfba1 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 12 Aug 2013 16:19:37 +0200 Subject: let apt-key del work better with softlink and single key keyrings Having fragement files means there is a good chance that there is one key per keyring, so deal with that as well as with setups in which keyrings are linked into trusted.gpg.d as we can't just modify those files (they might be in /usr for example). --- cmdline/apt-key | 59 +++++++++++++++++++++++++++++++++++-- test/integration/test-apt-key | 68 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 124 insertions(+), 3 deletions(-) diff --git a/cmdline/apt-key b/cmdline/apt-key index a9cbea55c..713a41c07 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -151,6 +151,60 @@ update() { fi } +remove_key_from_keyring() { + local GPG="$GPG_CMD --keyring $1" + # check if the key is in this keyring: the key id is in the 5 column at the end + if ! $GPG --with-colons --list-keys 2>&1 | grep -q "^pub:[^:]*:[^:]*:[^:]*:[0-9A-F]\+$2:"; then + return + fi + if [ ! -w "$1" ]; then + echo >&2 "Key ${2} is in keyring ${1}, but can't be removed as it is read only." + return + fi + # check if it is the only key in the keyring and if so remove the keyring alltogether + if [ '1' = "$($GPG --with-colons --list-keys | grep "^pub:[^:]*:[^:]*:[^:]*:[0-9A-F]\+:" | wc -l)" ]; then + mv -f "$1" "${1}~" # behave like gpg + return + fi + # we can't just modify pointed to files as these might be in /usr or something + local REALTARGET + if [ -L "$1" ]; then + REALTARGET="$(readlink -f "$1")" + mv -f "$1" "${1}.dpkg-tmp" + cp -a "$REALTARGET" "$1" + ls "$(dirname $1)" + fi + # delete the key from the keyring + $GPG --batch --delete-key --yes "$2" + if [ -n "$REALTARGET" ]; then + # the real backup is the old link, not the copy we made + mv -f "${1}.dpkg-tmp" "${1}~" + fi +} + +remove_key() { + requires_root + + # if a --keyring was given, just remove from there + if [ -n "$FORCED_KEYRING" ]; then + remove_key_from_keyring "$FORCED_KEYRING" "$1" + else + # otherwise all known keyrings are up for inspection + local TRUSTEDFILE="/etc/apt/trusted.gpg" + eval $(apt-config shell TRUSTEDFILE Apt::GPGV::TrustedKeyring) + eval $(apt-config shell TRUSTEDFILE Dir::Etc::Trusted/f) + remove_key_from_keyring "$TRUSTEDFILE" "$1" + TRUSTEDPARTS="/etc/apt/trusted.gpg.d" + eval $(apt-config shell TRUSTEDPARTS Dir::Etc::TrustedParts/d) + if [ -d "$TRUSTEDPARTS" ]; then + for trusted in $(run-parts --list "$TRUSTEDPARTS" --regex '^.*\.gpg$'); do + remove_key_from_keyring "$trusted" "$1" + done + fi + fi + echo "OK" +} + usage() { echo "Usage: apt-key [--keyring file] [command] [arguments]" @@ -175,6 +229,7 @@ while [ -n "$1" ]; do --keyring) shift TRUSTEDFILE="$1" + FORCED_KEYRING="$1" if [ -r "$TRUSTEDFILE" ] || [ "$2" = 'add' ] || [ "$2" = 'adv' ]; then GPG="$GPG --keyring $TRUSTEDFILE --primary-keyring $TRUSTEDFILE" else @@ -239,10 +294,8 @@ case "$command" in echo "OK" ;; del|rm|remove) - requires_root init_keyring "$TRUSTEDFILE" - $GPG --quiet --batch --delete-key --yes "$1" - echo "OK" + remove_key "$1" ;; update) init_keyring "$TRUSTEDFILE" diff --git a/test/integration/test-apt-key b/test/integration/test-apt-key index 5beb6f220..68b3f9710 100755 --- a/test/integration/test-apt-key +++ b/test/integration/test-apt-key @@ -37,3 +37,71 @@ testsuccess --nomsg aptkey --fakeroot update aptkey list | grep '^pub' > aptkey.list testfileequal ./aptkey.list 'pub 2048R/DBAC8DAE 2010-08-18' + +msgtest "Try to remove a key which exists, but isn't in the" 'forced keyring' +testsuccess --nomsg aptkey --fakeroot --keyring rootdir/etc/apt/trusted.gpg del DBAC8DAE + +aptkey list | grep '^pub' > aptkey.list +testfileequal ./aptkey.list 'pub 2048R/DBAC8DAE 2010-08-18' + +testsuccess aptkey --fakeroot del DBAC8DAE +testempty aptkey list + +# start from a clean plate again +cleanplate() { + rm -rf rootdir/etc/apt/trusted.gpg.d/ rootdir/etc/apt/trusted.gpg + mkdir rootdir/etc/apt/trusted.gpg.d/ +} + +msgtest 'Test key removal with' 'single key in real file' +cleanplate +cp -a keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg +testsuccess --nomsg aptkey --fakeroot del DBAC8DAE +testempty aptkey list +testsuccess test ! -e rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg +testsuccess cmp keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg~ + +msgtest 'Test key removal with' 'single key in softlink' +cleanplate +ln -s $(readlink -f ./keys/joesixpack.pub) rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg +testsuccess --nomsg aptkey --fakeroot del DBAC8DAE +testempty aptkey list +testsuccess test ! -e rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg +testsuccess test -L rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg~ + +cleanplate +testsuccess aptkey --fakeroot add ./keys/joesixpack.pub +testsuccess aptkey --fakeroot add ./keys/marvinparanoid.pub +aptkey list | grep '^pub' > aptkey.list +testfileequal ./aptkey.list 'pub 2048R/DBAC8DAE 2010-08-18 +pub 2048R/528144E2 2011-01-16' +cp -a rootdir/etc/apt/trusted.gpg keys/testcase-multikey.pub # store for reuse + +msgtest 'Test key removal with' 'multi key in real file' +cleanplate +cp -a keys/testcase-multikey.pub rootdir/etc/apt/trusted.gpg.d/multikey.gpg +testsuccess --nomsg aptkey --fakeroot del DBAC8DAE +aptkey list | grep '^pub' > aptkey.list +testfileequal ./aptkey.list 'pub 2048R/528144E2 2011-01-16' +testsuccess cmp keys/testcase-multikey.pub rootdir/etc/apt/trusted.gpg.d/multikey.gpg~ + +msgtest 'Test key removal with' 'multi key in softlink' +cleanplate +ln -s $(readlink -f ./keys/testcase-multikey.pub) rootdir/etc/apt/trusted.gpg.d/multikey.gpg +testsuccess --nomsg aptkey --fakeroot del DBAC8DAE +aptkey list | grep '^pub' > aptkey.list +testfileequal ./aptkey.list 'pub 2048R/528144E2 2011-01-16' +testsuccess cmp keys/testcase-multikey.pub rootdir/etc/apt/trusted.gpg.d/multikey.gpg~ +testsuccess test ! -L rootdir/etc/apt/trusted.gpg.d/multikey.gpg +testsuccess test -L rootdir/etc/apt/trusted.gpg.d/multikey.gpg~ + +msgtest 'Test key removal with' 'multiple files including key' +cleanplate +cp -a keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg +cp -a keys/testcase-multikey.pub rootdir/etc/apt/trusted.gpg.d/multikey.gpg +testsuccess --nomsg aptkey --fakeroot del DBAC8DAE +aptkey list | grep '^pub' > aptkey.list +testfileequal ./aptkey.list 'pub 2048R/528144E2 2011-01-16' +testsuccess test ! -e rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg +testsuccess cmp keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg~ +testsuccess cmp keys/testcase-multikey.pub rootdir/etc/apt/trusted.gpg.d/multikey.gpg~ -- cgit v1.2.3 From ec9272975f454d3911e61e5cc3b29fe90fe2ee54 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 12 Aug 2013 17:26:54 +0200 Subject: do not call 'apt-key update' in apt.postinst The debian-archive-keyring package ships trusted.gpg.d fragment files for a while now and dropped their call to 'apt-key update', so there is no need for use to call it as the keys will always be available. This also finally allows a user to remove key(ring)s without APT to overriding this decision by readding them with this step. The functionality is kept around in the odd case that an old debian-archive-keyring package is used which still calls 'apt-key update' and depends on the import (hence, we also do not enforce a newer version of the debian-archive-keyring via our dependencies) --- debian/apt.postinst | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/apt.postinst b/debian/apt.postinst index caa05ccdf..70de237d0 100644 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -25,7 +25,6 @@ case "$1" in rm -f $SECRING fi fi - apt-key update # ensure tighter permissons on the logs, see LP: #975199 if dpkg --compare-versions "$2" lt-nl 0.9.7.7; then -- cgit v1.2.3 From 713a2de01cc1a0b8dcd71a4137f8a099d22783b7 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 12 Aug 2013 21:45:59 +0200 Subject: update changelog for upload --- debian/changelog | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d1ecbff1f..8e4def2b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,48 @@ -apt (0.9.9.5) UNRELEASED; urgency=low +apt (0.9.10) unstable; urgency=low + The "Hello to Debconf" upload + + [ Christian Perrier ] * Vietnamese translation update. Closes: #718615 * Japanese translation update. Closes: #719279 - -- Christian Perrier Sat, 03 Aug 2013 16:06:55 +0200 + [ Michael Vogt ] + * work on fixing coverity scan results: + - fix some off-by-one errors + - fix some resource leaks + - fixes in chroot() handling + - fix some missing va_end() + * make the code -Wall clean again + * remove duplicated #include + * add .travis.yml + * use the 'abi-complicance-checker' package and remove the buildin + copy for the abi checks + + [ David Kalnischkies ] + * ensure that FileFd::Size returns 0 in error cases + * add missing Turkish (tr) to po/LINGUAS + * correct management-typo in description found by lintian + * implement debian/rules build-{arch,indep} as required by policy 3.9.4 + * reenable automatic parallel build of APT + * exclude config.{sub,guess} from source package + * update the symbol files to reflect current state + * unset LANGUAGE for showing [Y/n] answer hints + * fix some unitialized data members + * specific pins below 1000 cause downgrades (Closes: 543966) + * use pkgTagFile to parse "header" of Release files + * fix: --print-uris removes authentication (Closes: 719263) + * always use our own trustdb.gpg in apt-key + * use a tmpfile for trustdb.gpg in apt-key. + Thanks to Andreas Beckmann for the initial patch! (Closes: #687611) + * do not double-slash paths in apt-key (Closes: 665411) + * make the keyring locations in apt-key configurable + * let apt-key del work better with softlink and single key keyrings + * do not call 'apt-key update' in apt.postinst + + [ Colin Watson ] + * prefer native arch over higher priority for providers (Closes: #718482) + + -- Michael Vogt Mon, 12 Aug 2013 21:45:07 +0200 apt (0.9.9.4) unstable; urgency=low -- cgit v1.2.3 From 183116d1a64a2610b88fa6b50f2c5199b69d5841 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 12 Aug 2013 23:33:57 +0200 Subject: fix typo in the test for abi-compliance-checker --- abicheck/run_abi_test | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/abicheck/run_abi_test b/abicheck/run_abi_test index 668ce8e12..9ee840ea0 100755 --- a/abicheck/run_abi_test +++ b/abicheck/run_abi_test @@ -5,8 +5,8 @@ if [ ! -d ../build ]; then exit 1 fi -if [ ! -x $(which abi-complicance-checker > /dev/null 2>&1) ]; then - echo "Please install the 'abi-complicance-checker' package" +if [ ! -x "$(which abi-compliance-checker 2>/dev/null )" ]; then + echo "Please install the 'abi-compliance-checker' package" exit 1 fi -- cgit v1.2.3