X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/831103710a3ff307703c2823760de9e6b34deeaa..7aee90b638490036b8f4244dcb3d14ba0bc6dd8a:/po/en_GB.po diff --git a/po/en_GB.po b/po/en_GB.po index a5d075d8c..574a296d3 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -5,7 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" -"POT-Creation-Date: 2003-04-27 01:12-0500\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2002-11-10 20:56+0100\n" "Last-Translator: Michael Piefel \n" "Language-Team: en_GB \n" @@ -13,144 +14,148 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:133 +#: cmdline/apt-cache.cc:135 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "" -#: cmdline/apt-cache.cc:173 cmdline/apt-cache.cc:525 cmdline/apt-cache.cc:613 -#: cmdline/apt-cache.cc:769 cmdline/apt-cache.cc:987 cmdline/apt-cache.cc:1353 -#: cmdline/apt-cache.cc:1499 +#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 +#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 +#: cmdline/apt-cache.cc:1508 #, c-format msgid "Unable to locate package %s" msgstr "" -#: cmdline/apt-cache.cc:230 -msgid "Total Package Names : " -msgstr "" - -#: cmdline/apt-cache.cc:270 -msgid " Normal Packages: " -msgstr "" - -#: cmdline/apt-cache.cc:271 -msgid " Pure Virtual Packages: " +#: cmdline/apt-cache.cc:232 +msgid "Total package names : " msgstr "" #: cmdline/apt-cache.cc:272 -msgid " Single Virtual Packages: " +msgid " Normal packages: " msgstr "" #: cmdline/apt-cache.cc:273 -msgid " Mixed Virtual Packages: " +msgid " Pure virtual packages: " msgstr "" #: cmdline/apt-cache.cc:274 -msgid " Missing: " +msgid " Single virtual packages: " +msgstr "" + +#: cmdline/apt-cache.cc:275 +msgid " Mixed virtual packages: " msgstr "" #: cmdline/apt-cache.cc:276 -msgid "Total Distinct Versions: " +msgid " Missing: " msgstr "" #: cmdline/apt-cache.cc:278 -msgid "Total Dependencies: " +msgid "Total distinct versions: " msgstr "" -#: cmdline/apt-cache.cc:281 -msgid "Total Ver/File relations: " +#: cmdline/apt-cache.cc:280 +msgid "Total dependencies: " msgstr "" #: cmdline/apt-cache.cc:283 -msgid "Total Provides Mappings: " +msgid "Total ver/file relations: " +msgstr "" + +#: cmdline/apt-cache.cc:285 +msgid "Total Provides mappings: " msgstr "" -#: cmdline/apt-cache.cc:295 -msgid "Total Globbed Strings: " +#: cmdline/apt-cache.cc:297 +msgid "Total globbed strings: " msgstr "" -#: cmdline/apt-cache.cc:309 -msgid "Total Dependency Version space: " +#: cmdline/apt-cache.cc:311 +msgid "Total dependency version space: " msgstr "" -#: cmdline/apt-cache.cc:314 -msgid "Total Slack space: " +#: cmdline/apt-cache.cc:316 +msgid "Total slack space: " msgstr "" -#: cmdline/apt-cache.cc:322 -msgid "Total Space Accounted for: " +#: cmdline/apt-cache.cc:324 +msgid "Total space accounted for: " msgstr "" -#: cmdline/apt-cache.cc:444 cmdline/apt-cache.cc:1187 +#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 #, c-format msgid "Package file %s is out of sync." msgstr "" -#: cmdline/apt-cache.cc:1229 +#: cmdline/apt-cache.cc:1231 msgid "You must give exactly one pattern" msgstr "" -#: cmdline/apt-cache.cc:1453 -msgid "Package Files:" +#: cmdline/apt-cache.cc:1385 +msgid "No packages found" msgstr "" -#: cmdline/apt-cache.cc:1460 cmdline/apt-cache.cc:1546 +#: cmdline/apt-cache.cc:1462 +msgid "Package files:" +msgstr "" + +#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" -#: cmdline/apt-cache.cc:1461 +#: cmdline/apt-cache.cc:1470 #, c-format msgid "%4i %s\n" msgstr "" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1473 -msgid "Pinned Packages:" +#: cmdline/apt-cache.cc:1482 +msgid "Pinned packages:" msgstr "" -#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 msgid "(not found)" msgstr "" #. Installed version -#: cmdline/apt-cache.cc:1506 +#: cmdline/apt-cache.cc:1515 msgid " Installed: " msgstr "" -#: cmdline/apt-cache.cc:1508 cmdline/apt-cache.cc:1516 +#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 msgid "(none)" msgstr "" #. Candidate Version -#: cmdline/apt-cache.cc:1513 +#: cmdline/apt-cache.cc:1522 msgid " Candidate: " msgstr "" -#: cmdline/apt-cache.cc:1523 -msgid " Package Pin: " +#: cmdline/apt-cache.cc:1532 +msgid " Package pin: " msgstr "" #. Show the priority tables -#: cmdline/apt-cache.cc:1532 -msgid " Version Table:" +#: cmdline/apt-cache.cc:1541 +msgid " Version table:" msgstr "" -#: cmdline/apt-cache.cc:1547 +#: cmdline/apt-cache.cc:1556 #, c-format msgid " %4i %s\n" msgstr "" -#: cmdline/apt-cache.cc:1574 cmdline/apt-cdrom.cc:730 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:544 -#: cmdline/apt-get.cc:2165 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 +#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1658 msgid "" "Usage: apt-cache [options] command\n" -" apt-cache [options] add file1 [file1 ...]\n" +" apt-cache [options] add file1 [file2 ...]\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" " apt-cache [options] showsrc pkg1 [pkg2 ...]\n" "\n" @@ -182,7 +187,7 @@ msgid "" " -q Disable progress indicator.\n" " -i Show only important deps for the unmet command.\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" @@ -203,7 +208,7 @@ msgid "" "Options:\n" " -h This help text.\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" #: cmdline/apt-extracttemplates.cc:98 @@ -222,48 +227,52 @@ msgid "" " -h This help text\n" " -t Set the temp dir\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:699 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 #, c-format msgid "Unable to write to %s" msgstr "" -#: cmdline/apt-extracttemplates.cc:302 +#: cmdline/apt-extracttemplates.cc:310 msgid "Cannot get debconf version. Is debconf installed?" msgstr "" -#: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:336 +#: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337 +#, fuzzy msgid "Package extension list is too long" -msgstr "" +msgstr "Option ‘%s’ is too long" #: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179 -#: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:251 -#: ftparchive/apt-ftparchive.cc:265 ftparchive/apt-ftparchive.cc:287 +#: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252 +#: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288 #, c-format -msgid "Error Processing directory %s" +msgid "Error processing directory %s" msgstr "" -#: ftparchive/apt-ftparchive.cc:249 +#: ftparchive/apt-ftparchive.cc:250 +#, fuzzy msgid "Source extension list is too long" -msgstr "" +msgstr "Option ‘%s’ is too long" -#: ftparchive/apt-ftparchive.cc:366 +#: ftparchive/apt-ftparchive.cc:367 msgid "Error writing header to contents file" msgstr "" -#: ftparchive/apt-ftparchive.cc:396 +#: ftparchive/apt-ftparchive.cc:397 #, c-format -msgid "Error Processing Contents %s" +msgid "Error processing contents %s" msgstr "" -#: ftparchive/apt-ftparchive.cc:550 +#: ftparchive/apt-ftparchive.cc:551 +#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" -"Commands: packges binarypath [overridefile [pathprefix]]\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" " sources srcpath [overridefile [pathprefix]]\n" " contents path\n" +" release path\n" " generate config [groups]\n" " clean config\n" "\n" @@ -281,9 +290,9 @@ msgid "" "\n" "The 'packages' and 'sources' command should be run in the root of the\n" "tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contian the override flags. Pathprefix is\n" +"override file should contain the override flags. Pathprefix is\n" "appended to the filename fields if present. Example usage from the \n" -"debian archive:\n" +"Debian archive:\n" " apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" " dists/potato/main/binary-i386/Packages\n" "\n" @@ -296,10 +305,10 @@ msgid "" " --no-delink Enable delinking debug mode\n" " --contents Control contents file generation\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option" +" -o=? Set an arbitrary configuration option" msgstr "" "Usage: apt-ftparchive [options] command\n" -"Commands: packges binarypath [overridefile [pathprefix]]\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" " sources srcpath [overridefile [pathprefix]]\n" " contents path\n" " generate config [groups]\n" @@ -319,9 +328,9 @@ msgstr "" "\n" "The ‘packages’ and ‘sources’ command should be run in the root of the\n" "tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contian the override flags. Pathprefix is\n" +"override file should contain the override flags. Pathprefix is\n" "appended to the filename fields if present. Example usage from the \n" -"debian archive:\n" +"Debian archive:\n" " apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" " dists/potato/main/binary-i386/Packages\n" "\n" @@ -334,122 +343,132 @@ msgstr "" " --no-delink Enable delinking debug mode\n" " --contents Control contents file generation\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option" +" -o=? Set an arbitrary configuration option" -#: ftparchive/apt-ftparchive.cc:731 +#: ftparchive/apt-ftparchive.cc:757 msgid "No selections matched" msgstr "" -#: ftparchive/apt-ftparchive.cc:804 +#: ftparchive/apt-ftparchive.cc:830 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Some files are missing in the package file group ‘%s’" -#: ftparchive/cachedb.cc:43 +#: ftparchive/cachedb.cc:45 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "" -#: ftparchive/cachedb.cc:59 +#: ftparchive/cachedb.cc:63 #, c-format -msgid "Unable to open DB2 file %s" +msgid "DB is old, attempting to upgrade %s" msgstr "" -#: ftparchive/cachedb.cc:99 +#: ftparchive/cachedb.cc:73 +#, fuzzy, c-format +msgid "Unable to open DB file %s: %s" +msgstr "Unable to fetch file, server said ‘%s’" + +#: ftparchive/cachedb.cc:114 #, c-format msgid "File date has changed %s" msgstr "" -#: ftparchive/cachedb.cc:140 +#: ftparchive/cachedb.cc:155 msgid "Archive has no control record" msgstr "" -#: ftparchive/cachedb.cc:253 ftparchive/cachedb.cc:257 +#: ftparchive/cachedb.cc:267 msgid "Unable to get a cursor" msgstr "" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "" -#: ftparchive/writer.cc:122 +#: ftparchive/writer.cc:126 msgid "E: " msgstr "" -#: ftparchive/writer.cc:124 +#: ftparchive/writer.cc:128 msgid "W: " msgstr "" -#: ftparchive/writer.cc:131 +#: ftparchive/writer.cc:135 msgid "E: Errors apply to file " msgstr "" -#: ftparchive/writer.cc:148 ftparchive/writer.cc:178 -#, c-format +#: ftparchive/writer.cc:152 ftparchive/writer.cc:182 +#, fuzzy, c-format msgid "Failed to resolve %s" -msgstr "" +msgstr "Could not resolve ‘%s’" -#: ftparchive/writer.cc:160 +#: ftparchive/writer.cc:164 msgid "Tree walking failed" msgstr "" -#: ftparchive/writer.cc:185 +#: ftparchive/writer.cc:189 #, c-format msgid "Failed to open %s" msgstr "" -#: ftparchive/writer.cc:242 +#: ftparchive/writer.cc:246 #, c-format msgid " DeLink %s [%s]\n" msgstr "" -#: ftparchive/writer.cc:250 +#: ftparchive/writer.cc:254 #, c-format msgid "Failed to readlink %s" msgstr "" -#: ftparchive/writer.cc:254 +#: ftparchive/writer.cc:258 #, c-format msgid "Failed to unlink %s" msgstr "" -#: ftparchive/writer.cc:261 +#: ftparchive/writer.cc:265 #, c-format msgid "*** Failed to link %s to %s" msgstr "" -#: ftparchive/writer.cc:271 +#: ftparchive/writer.cc:275 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:338 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 #, c-format msgid "Failed to stat %s" msgstr "" -#: ftparchive/writer.cc:358 +#: ftparchive/writer.cc:378 msgid "Archive had no package field" msgstr "" -#: ftparchive/writer.cc:366 ftparchive/writer.cc:576 +#: ftparchive/writer.cc:386 ftparchive/writer.cc:595 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:409 ftparchive/writer.cc:658 +#: ftparchive/writer.cc:429 ftparchive/writer.cc:677 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" -#: ftparchive/contents.cc:346 ftparchive/contents.cc:377 +#: ftparchive/contents.cc:317 +#, c-format +msgid "Internal error, could not locate member %s" +msgstr "" + +#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 msgid "realloc - Failed to allocate memory" msgstr "" @@ -479,8 +498,8 @@ msgid "Failed to read the override file %s" msgstr "" #: ftparchive/multicompress.cc:75 -#, c-format -msgid "Unknown Compresison Algorithm '%s'" +#, fuzzy, c-format +msgid "Unknown compression algorithm '%s'" msgstr "Unknown Compression Algorithm ‘%s’" #: ftparchive/multicompress.cc:105 @@ -501,12 +520,12 @@ msgid "Failed to fork" msgstr "" #: ftparchive/multicompress.cc:215 -msgid "Compress Child" +msgid "Compress child" msgstr "" #: ftparchive/multicompress.cc:238 #, c-format -msgid "Internal Error, Failed to create %s" +msgid "Internal error, failed to create %s" msgstr "" #: ftparchive/multicompress.cc:289 @@ -539,187 +558,203 @@ msgstr "" msgid "Failed to rename %s to %s" msgstr "" -#. This needs to be a capital -#: cmdline/apt-get.cc:116 +#: cmdline/apt-get.cc:118 msgid "Y" msgstr "" -#: cmdline/apt-get.cc:220 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 +#, c-format +msgid "Regex compilation error - %s" +msgstr "" + +#: cmdline/apt-get.cc:235 msgid "The following packages have unmet dependencies:" msgstr "" -#: cmdline/apt-get.cc:310 +#: cmdline/apt-get.cc:325 #, c-format msgid "but %s is installed" msgstr "" -#: cmdline/apt-get.cc:312 +#: cmdline/apt-get.cc:327 #, c-format msgid "but %s is to be installed" msgstr "" -#: cmdline/apt-get.cc:319 +#: cmdline/apt-get.cc:334 msgid "but it is not installable" msgstr "" -#: cmdline/apt-get.cc:321 +#: cmdline/apt-get.cc:336 msgid "but it is a virtual package" msgstr "" -#: cmdline/apt-get.cc:324 +#: cmdline/apt-get.cc:339 msgid "but it is not installed" msgstr "" -#: cmdline/apt-get.cc:324 +#: cmdline/apt-get.cc:339 msgid "but it is not going to be installed" msgstr "" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:344 msgid " or" msgstr "" -#: cmdline/apt-get.cc:358 +#: cmdline/apt-get.cc:373 msgid "The following NEW packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:384 +#: cmdline/apt-get.cc:399 msgid "The following packages will be REMOVED:" msgstr "" -#: cmdline/apt-get.cc:406 -msgid "The following packages have been kept back" +#: cmdline/apt-get.cc:421 +msgid "The following packages have been kept back:" msgstr "" -#: cmdline/apt-get.cc:427 -msgid "The following packages will be upgraded" +#: cmdline/apt-get.cc:442 +msgid "The following packages will be upgraded:" msgstr "" -#: cmdline/apt-get.cc:448 -msgid "The following packages will be DOWNGRADED" +#: cmdline/apt-get.cc:463 +msgid "The following packages will be DOWNGRADED:" msgstr "" -#: cmdline/apt-get.cc:468 +#: cmdline/apt-get.cc:483 msgid "The following held packages will be changed:" msgstr "" -#: cmdline/apt-get.cc:521 +#: cmdline/apt-get.cc:536 #, c-format msgid "%s (due to %s) " msgstr "" -#: cmdline/apt-get.cc:529 +#: cmdline/apt-get.cc:544 msgid "" -"WARNING: The following essential packages will be removed\n" +"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:559 +#: cmdline/apt-get.cc:575 #, c-format -msgid "%lu packages upgraded, %lu newly installed, " +msgid "%lu upgraded, %lu newly installed, " msgstr "" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:579 #, c-format msgid "%lu reinstalled, " msgstr "" -#: cmdline/apt-get.cc:565 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu downgraded, " msgstr "" -#: cmdline/apt-get.cc:567 +#: cmdline/apt-get.cc:583 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "" -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:587 #, c-format -msgid "%lu packages not fully installed or removed.\n" +msgid "%lu not fully installed or removed.\n" msgstr "" -#: cmdline/apt-get.cc:631 +#: cmdline/apt-get.cc:647 msgid "Correcting dependencies..." msgstr "" -#: cmdline/apt-get.cc:634 +#: cmdline/apt-get.cc:650 msgid " failed." msgstr "" -#: cmdline/apt-get.cc:637 +#: cmdline/apt-get.cc:653 msgid "Unable to correct dependencies" msgstr "" -#: cmdline/apt-get.cc:640 +#: cmdline/apt-get.cc:656 msgid "Unable to minimize the upgrade set" msgstr "" -#: cmdline/apt-get.cc:642 +#: cmdline/apt-get.cc:658 msgid " Done" msgstr "" -#: cmdline/apt-get.cc:646 +#: cmdline/apt-get.cc:662 msgid "You might want to run `apt-get -f install' to correct these." msgstr "You might want to run ‘apt-get -f install’ to correct these." -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:665 msgid "Unmet dependencies. Try using -f." msgstr "" -#: cmdline/apt-get.cc:702 -msgid "Packages need to be removed but Remove is disabled." +#: cmdline/apt-get.cc:687 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "" + +#: cmdline/apt-get.cc:698 +msgid "Install these packages without verification [y/N]? " +msgstr "" + +#: cmdline/apt-get.cc:700 +msgid "Some packages could not be authenticated" +msgstr "" + +#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 +msgid "There are problems and -y was used without --force-yes" msgstr "" -#: cmdline/apt-get.cc:728 cmdline/apt-get.cc:1694 cmdline/apt-get.cc:1727 +#: cmdline/apt-get.cc:762 +msgid "Packages need to be removed but remove is disabled." +msgstr "" + +#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:738 cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1986 +#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "" -#: cmdline/apt-get.cc:758 +#: cmdline/apt-get.cc:818 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "" -#: cmdline/apt-get.cc:761 +#: cmdline/apt-get.cc:821 #, c-format msgid "Need to get %sB of archives.\n" msgstr "" -#: cmdline/apt-get.cc:766 +#: cmdline/apt-get.cc:826 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" -#: cmdline/apt-get.cc:769 +#: cmdline/apt-get.cc:829 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:786 +#: cmdline/apt-get.cc:846 #, c-format msgid "You don't have enough free space in %s." msgstr "" -#: cmdline/apt-get.cc:795 -msgid "There are problems and -y was used without --force-yes" -msgstr "" - -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: cmdline/apt-get.cc:803 +#: cmdline/apt-get.cc:863 msgid "Yes, do as I say!" msgstr "" -#: cmdline/apt-get.cc:805 -#, c-format +#: cmdline/apt-get.cc:865 +#, fuzzy, c-format msgid "" -"You are about to do something potentially harmful\n" +"You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" @@ -727,154 +762,148 @@ msgstr "" "To continue type in the phrase ‘%s’\n" " ?] " -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 msgid "Abort." msgstr "" -#: cmdline/apt-get.cc:826 -msgid "Do you want to continue? [Y/n] " +#: cmdline/apt-get.cc:886 +msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:895 cmdline/apt-get.cc:1266 cmdline/apt-get.cc:1884 +#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" -#: cmdline/apt-get.cc:913 +#: cmdline/apt-get.cc:976 msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:914 cmdline/apt-get.cc:1893 +#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:983 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -#: cmdline/apt-get.cc:924 +#: cmdline/apt-get.cc:987 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -#: cmdline/apt-get.cc:929 +#: cmdline/apt-get.cc:992 msgid "Unable to correct missing packages." msgstr "" -#: cmdline/apt-get.cc:930 -msgid "Aborting Install." +#: cmdline/apt-get.cc:993 +msgid "Aborting install." msgstr "" -#: cmdline/apt-get.cc:963 -#, c-format +#: cmdline/apt-get.cc:1026 +#, fuzzy, c-format msgid "Note, selecting %s instead of %s\n" -msgstr "" +msgstr "Note, selecting %s for regex ‘%s’\n" -#: cmdline/apt-get.cc:973 +#: cmdline/apt-get.cc:1036 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -#: cmdline/apt-get.cc:991 +#: cmdline/apt-get.cc:1054 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1065 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1077 msgid " [Installed]" msgstr "" -#: cmdline/apt-get.cc:1019 +#: cmdline/apt-get.cc:1082 msgid "You should explicitly select one to install." msgstr "" -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1087 #, c-format msgid "" -"Package %s has no available version, but exists in the database.\n" -"This typically means that the package was mentioned in a dependency and\n" -"never uploaded, has been obsoleted or is not available with the contents\n" -"of sources.list\n" +"Package %s is not available, but is referred to by another package.\n" +"This may mean that the package is missing, has been obsoleted, or\n" +"is only available from another source\n" msgstr "" -#: cmdline/apt-get.cc:1044 +#: cmdline/apt-get.cc:1106 msgid "However the following packages replace it:" msgstr "" -#: cmdline/apt-get.cc:1047 +#: cmdline/apt-get.cc:1109 #, c-format msgid "Package %s has no installation candidate" msgstr "" -#: cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:1129 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" -#: cmdline/apt-get.cc:1075 +#: cmdline/apt-get.cc:1137 #, c-format msgid "%s is already the newest version.\n" msgstr "" -#: cmdline/apt-get.cc:1102 +#: cmdline/apt-get.cc:1164 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release ‘%s’ for ‘%s’ was not found" -#: cmdline/apt-get.cc:1104 +#: cmdline/apt-get.cc:1166 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Version ‘%s’ for ‘%s’ was not found" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1172 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "" -#: cmdline/apt-get.cc:1220 +#: cmdline/apt-get.cc:1282 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1233 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1285 +#: cmdline/apt-get.cc:1353 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" -#: cmdline/apt-get.cc:1304 -msgid "Internal Error, AllUpgrade broke stuff" +#: cmdline/apt-get.cc:1372 +msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1394 cmdline/apt-get.cc:1430 +#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1407 -#, c-format -msgid "Regex compilation error - %s" -msgstr "" - -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Note, selecting %s for regex ‘%s’\n" -#: cmdline/apt-get.cc:1447 +#: cmdline/apt-get.cc:1524 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "You might want to run ‘apt-get -f install’ to correct these:" -#: cmdline/apt-get.cc:1450 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -882,7 +911,7 @@ msgstr "" "Unmet dependencies. Try ‘apt-get -f install’ with no packages (or specify a " "solution)." -#: cmdline/apt-get.cc:1462 +#: cmdline/apt-get.cc:1539 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" @@ -890,142 +919,149 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1470 +#: cmdline/apt-get.cc:1547 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1478 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1504 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1568 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1589 -msgid "Calculating Upgrade... " +#: cmdline/apt-get.cc:1673 +msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1592 methods/ftp.cc:700 methods/connect.cc:99 +#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1597 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1770 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1797 cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:1849 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1852 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1858 +#: cmdline/apt-get.cc:1942 #, c-format -msgid "Fetch Source %s\n" +msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:1889 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:1917 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:1929 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Unpack command ‘%s’ failed.\n" -#: cmdline/apt-get.cc:1946 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build command ‘%s’ failed.\n" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:1981 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2009 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2029 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:2165 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2106 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2133 -msgid "" -"Some broken packages were found while trying to process build-dependencies.\n" -"You might want to run `apt-get -f install' to correct these." +#: cmdline/apt-get.cc:2252 +#, c-format +msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" +msgstr "" + +#: cmdline/apt-get.cc:2277 +#, c-format +msgid "Failed to satisfy %s dependency for %s: %s" +msgstr "" + +#: cmdline/apt-get.cc:2291 +#, c-format +msgid "Build-dependencies for %s could not be satisfied." msgstr "" -"Some broken packages were found while trying to process build-dependencies.\n" -"You might want to run ‘apt-get -f install’ to correct these." -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2170 -msgid "Supported Modules:" +#: cmdline/apt-get.cc:2327 +msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2211 +#: cmdline/apt-get.cc:2368 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1061,7 +1097,7 @@ msgid "" " -b Build the source package after fetching it\n" " -V Show verbose version numbers\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" "See the apt-get(8), sources.list(5) and apt.conf(5) manual\n" "pages for more information and options.\n" " This APT has Super Cow Powers.\n" @@ -1089,13 +1125,14 @@ msgid "Fetched %sB in %s (%sB/s)\n" msgstr "" #: cmdline/acqprogress.cc:225 +#, c-format msgid " [Working]" msgstr "" #: cmdline/acqprogress.cc:271 -#, c-format +#, fuzzy, c-format msgid "" -"Media Change: Please insert the disc labeled\n" +"Media change: please insert the disc labeled\n" " '%s'\n" "in the drive '%s' and press enter\n" msgstr "" @@ -1118,7 +1155,7 @@ msgid "" " -h This help text\n" " -s Use source file sorting\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" #: dselect/install:32 @@ -1148,28 +1185,28 @@ msgid "" msgstr "" #: dselect/update:30 -msgid "Merging Available information" +msgid "Merging available information" msgstr "" -#: apt-inst/contrib/extracttar.cc:115 +#: apt-inst/contrib/extracttar.cc:117 msgid "Failed to create pipes" msgstr "" -#: apt-inst/contrib/extracttar.cc:140 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "" -#: apt-inst/contrib/extracttar.cc:177 apt-inst/contrib/extracttar.cc:203 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 msgid "Corrupted archive" msgstr "" -#: apt-inst/contrib/extracttar.cc:192 -msgid "Tar Checksum failed, archive corrupted" +#: apt-inst/contrib/extracttar.cc:195 +msgid "Tar checksum failed, archive corrupted" msgstr "" -#: apt-inst/contrib/extracttar.cc:295 +#: apt-inst/contrib/extracttar.cc:298 #, c-format -msgid "Unkown TAR header type %u, member %s" +msgid "Unknown TAR header type %u, member %s" msgstr "" #: apt-inst/contrib/arfile.cc:73 @@ -1205,7 +1242,7 @@ msgid "Failed to allocate diversion" msgstr "" #: apt-inst/filelist.cc:468 -msgid "Internal Error in AddDiversion" +msgid "Internal error in AddDiversion" msgstr "" #: apt-inst/filelist.cc:481 @@ -1224,9 +1261,9 @@ msgid "Duplicate conf file %s/%s" msgstr "" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" -msgstr "" +#, fuzzy, c-format +msgid "Failed to write file %s" +msgstr "Could not resolve ‘%s’" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 #, c-format @@ -1280,8 +1317,8 @@ msgstr "" msgid "File %s/%s overwrites the one in the package %s" msgstr "" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:701 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:412 apt-pkg/clean.cc:38 +#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "" @@ -1312,9 +1349,9 @@ msgstr "" #. Build the status cache #: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:701 apt-pkg/pkgcachegen.cc:706 -#: apt-pkg/pkgcachegen.cc:829 -msgid "Reading Package Lists" +#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 +#: apt-pkg/pkgcachegen.cc:840 +msgid "Reading package lists" msgstr "" #: apt-inst/deb/dpkgdb.cc:180 @@ -1324,11 +1361,11 @@ msgstr "" #: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 #: apt-inst/deb/dpkgdb.cc:448 -msgid "Internal Error getting a Package Name" +msgid "Internal error getting a package name" msgstr "" #: apt-inst/deb/dpkgdb.cc:205 -msgid "Reading File Listing" +msgid "Reading file listing" msgstr "" #: apt-inst/deb/dpkgdb.cc:216 @@ -1348,7 +1385,7 @@ msgid "Failed reading the list file %sinfo/%s" msgstr "" #: apt-inst/deb/dpkgdb.cc:266 -msgid "Internal Error getting a Node" +msgid "Internal error getting a node" msgstr "" #: apt-inst/deb/dpkgdb.cc:309 @@ -1367,20 +1404,20 @@ msgid "Invalid line in the diversion file: %s" msgstr "" #: apt-inst/deb/dpkgdb.cc:362 -msgid "Internal Error adding a diversion" +msgid "Internal error adding a diversion" msgstr "" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialize first" +msgid "The pkg cache must be initialized first" msgstr "" #: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading File List" +msgid "Reading file list" msgstr "" #: apt-inst/deb/dpkgdb.cc:443 #, c-format -msgid "Failed to find a Package: Header, offset %lu" +msgid "Failed to find a Package: header, offset %lu" msgstr "" #: apt-inst/deb/dpkgdb.cc:465 @@ -1393,31 +1430,31 @@ msgstr "" msgid "Error parsing MD5. Offset %lu" msgstr "" -#: apt-inst/deb/debfile.cc:55 +#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "This is not a valid DEB archive, missing ‘%s’ member" -#: apt-inst/deb/debfile.cc:72 -#, c-format -msgid "Internal Error, could not locate member %s" -msgstr "" +#: apt-inst/deb/debfile.cc:52 +#, fuzzy, c-format +msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" +msgstr "This is not a valid DEB archive, missing ‘%s’ member" -#: apt-inst/deb/debfile.cc:104 +#: apt-inst/deb/debfile.cc:112 #, c-format msgid "Couldn't change to %s" msgstr "" -#: apt-inst/deb/debfile.cc:125 -msgid "Internal Error, could not locate member" +#: apt-inst/deb/debfile.cc:138 +msgid "Internal error, could not locate member" msgstr "" -#: apt-inst/deb/debfile.cc:158 +#: apt-inst/deb/debfile.cc:171 msgid "Failed to locate a valid control file" msgstr "" -#: apt-inst/deb/debfile.cc:243 -msgid "Unparsible control file" +#: apt-inst/deb/debfile.cc:256 +msgid "Unparsable control file" msgstr "" #: methods/cdrom.cc:113 @@ -1427,12 +1464,12 @@ msgstr "" #: methods/cdrom.cc:122 msgid "" -"Please use apt-cdrom to make this CD recognized by APT. apt-get update " -"cannot be used to add new CDs" +"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " +"cannot be used to add new CD-ROMs" msgstr "" #: methods/cdrom.cc:130 methods/cdrom.cc:168 -msgid "Wrong CD" +msgid "Wrong CD-ROM" msgstr "" #: methods/cdrom.cc:163 @@ -1440,7 +1477,7 @@ msgstr "" msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" -#: methods/cdrom.cc:177 methods/file.cc:77 +#: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 msgid "File not found" msgstr "" @@ -1469,9 +1506,9 @@ msgstr "" msgid "Unable to determine the local name" msgstr "" -#: methods/ftp.cc:204 methods/ftp.cc:230 +#: methods/ftp.cc:204 methods/ftp.cc:232 #, c-format -msgid "Server refused our connection and said: %s" +msgid "The server refused the connection and said: %s" msgstr "" #: methods/ftp.cc:210 @@ -1479,125 +1516,125 @@ msgstr "" msgid "USER failed, server said: %s" msgstr "" -#: methods/ftp.cc:216 +#: methods/ftp.cc:217 #, c-format msgid "PASS failed, server said: %s" msgstr "" -#: methods/ftp.cc:235 +#: methods/ftp.cc:237 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" -#: methods/ftp.cc:263 +#: methods/ftp.cc:265 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Login script command ‘%s’ failed, server said: %s" -#: methods/ftp.cc:289 +#: methods/ftp.cc:291 #, c-format msgid "TYPE failed, server said: %s" msgstr "" -#: methods/ftp.cc:327 methods/ftp.cc:438 methods/rsh.cc:183 methods/rsh.cc:226 +#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 msgid "Connection timeout" msgstr "" -#: methods/ftp.cc:333 +#: methods/ftp.cc:335 msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:336 apt-pkg/contrib/fileutl.cc:452 methods/rsh.cc:190 +#: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453 msgid "Read error" msgstr "" -#: methods/ftp.cc:343 methods/rsh.cc:197 +#: methods/ftp.cc:345 methods/rsh.cc:197 msgid "A response overflowed the buffer." msgstr "" -#: methods/ftp.cc:360 methods/ftp.cc:372 +#: methods/ftp.cc:362 methods/ftp.cc:374 msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:444 methods/rsh.cc:232 -msgid "Write Error" +#: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492 +msgid "Write error" msgstr "" -#: methods/ftp.cc:685 methods/ftp.cc:691 methods/ftp.cc:727 +#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 msgid "Could not create a socket" msgstr "" -#: methods/ftp.cc:696 +#: methods/ftp.cc:698 msgid "Could not connect data socket, connection timed out" msgstr "" -#: methods/ftp.cc:702 +#: methods/ftp.cc:704 msgid "Could not connect passive socket." msgstr "" -#: methods/ftp.cc:720 +#: methods/ftp.cc:722 msgid "getaddrinfo was unable to get a listening socket" msgstr "" -#: methods/ftp.cc:734 +#: methods/ftp.cc:736 msgid "Could not bind a socket" msgstr "" -#: methods/ftp.cc:738 +#: methods/ftp.cc:740 msgid "Could not listen on the socket" msgstr "" -#: methods/ftp.cc:745 +#: methods/ftp.cc:747 msgid "Could not determine the socket's name" msgstr "" -#: methods/ftp.cc:777 +#: methods/ftp.cc:779 msgid "Unable to send PORT command" msgstr "" -#: methods/ftp.cc:787 +#: methods/ftp.cc:789 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "" -#: methods/ftp.cc:796 +#: methods/ftp.cc:798 #, c-format msgid "EPRT failed, server said: %s" msgstr "" -#: methods/ftp.cc:816 +#: methods/ftp.cc:818 msgid "Data socket connect timed out" msgstr "" -#: methods/ftp.cc:823 +#: methods/ftp.cc:825 msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:862 methods/http.cc:912 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" -#: methods/ftp.cc:875 +#: methods/ftp.cc:877 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Unable to fetch file, server said ‘%s’" -#: methods/ftp.cc:890 methods/rsh.cc:322 +#: methods/ftp.cc:892 methods/rsh.cc:322 msgid "Data socket timed out" msgstr "" -#: methods/ftp.cc:920 +#: methods/ftp.cc:922 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Data transfer failed, server said ‘%s’" #. Get the files information -#: methods/ftp.cc:995 +#: methods/ftp.cc:997 msgid "Query" msgstr "" -#: methods/ftp.cc:1102 +#: methods/ftp.cc:1106 msgid "Unable to invoke " msgstr "" @@ -1668,79 +1705,83 @@ msgstr "" msgid "Read error from %s process" msgstr "" -#: methods/http.cc:340 +#: methods/http.cc:344 msgid "Waiting for headers" msgstr "" -#: methods/http.cc:486 +#: methods/http.cc:490 #, c-format msgid "Got a single header line over %u chars" msgstr "" -#: methods/http.cc:494 +#: methods/http.cc:498 msgid "Bad header line" msgstr "" -#: methods/http.cc:513 methods/http.cc:520 -msgid "The http server sent an invalid reply header" +#: methods/http.cc:517 methods/http.cc:524 +msgid "The HTTP server sent an invalid reply header" msgstr "" -#: methods/http.cc:549 -msgid "The http server sent an invalid Content-Length header" +#: methods/http.cc:553 +msgid "The HTTP server sent an invalid Content-Length header" msgstr "" -#: methods/http.cc:564 -msgid "The http server sent an invalid Content-Range header" +#: methods/http.cc:568 +msgid "The HTTP server sent an invalid Content-Range header" msgstr "" -#: methods/http.cc:566 -msgid "This http server has broken range support" +#: methods/http.cc:570 +msgid "This HTTP server has broken range support" msgstr "" -#: methods/http.cc:590 +#: methods/http.cc:594 msgid "Unknown date format" msgstr "" -#: methods/http.cc:733 +#: methods/http.cc:741 msgid "Select failed" msgstr "" -#: methods/http.cc:738 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "" -#: methods/http.cc:761 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:789 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "" -#: methods/http.cc:814 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:828 -msgid "Error reading from server Remote end closed connection" +#: methods/http.cc:836 +msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:830 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1061 -msgid "Bad header Data" +#: methods/http.cc:1069 +msgid "Bad header data" msgstr "" -#: methods/http.cc:1078 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "" -#: methods/http.cc:1169 +#: methods/http.cc:1177 msgid "Internal error" msgstr "" +#: methods/rsh.cc:330 +msgid "Connection closed prematurely" +msgstr "" + #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" msgstr "" @@ -1755,47 +1796,57 @@ msgstr "" msgid "Selection %s not found" msgstr "" -#: apt-pkg/contrib/configuration.cc:449 +#: apt-pkg/contrib/configuration.cc:395 +#, c-format +msgid "Unrecognized type abbreviation: '%c'" +msgstr "Unrecognized type abbreviation: ‘%c’" + +#: apt-pkg/contrib/configuration.cc:453 #, c-format msgid "Opening configuration file %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:559 +#: apt-pkg/contrib/configuration.cc:471 #, c-format -msgid "Syntax error %s:%u: Block starts with no name." +msgid "Line %d too long (max %d)" msgstr "" -#: apt-pkg/contrib/configuration.cc:578 +#: apt-pkg/contrib/configuration.cc:567 #, c-format -msgid "Syntax error %s:%u: Malformed Tag" +msgid "Syntax error %s:%u: Block starts with no name." msgstr "" -#: apt-pkg/contrib/configuration.cc:595 +#: apt-pkg/contrib/configuration.cc:586 +#, fuzzy, c-format +msgid "Syntax error %s:%u: Malformed tag" +msgstr "Syntax error %s:%u: Unsupported directive ‘%s’" + +#: apt-pkg/contrib/configuration.cc:603 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "" -#: apt-pkg/contrib/configuration.cc:635 +#: apt-pkg/contrib/configuration.cc:643 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -#: apt-pkg/contrib/configuration.cc:642 +#: apt-pkg/contrib/configuration.cc:650 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "" -#: apt-pkg/contrib/configuration.cc:646 apt-pkg/contrib/configuration.cc:651 +#: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "" -#: apt-pkg/contrib/configuration.cc:655 +#: apt-pkg/contrib/configuration.cc:663 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntax error %s:%u: Unsupported directive ‘%s’" -#: apt-pkg/contrib/configuration.cc:689 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" @@ -1861,7 +1912,7 @@ msgstr "" msgid "Unable to stat the mount point %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:418 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "" @@ -1890,54 +1941,50 @@ msgstr "" msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:358 -#, c-format -msgid "Waited, for %s but it wasn't there" +#: apt-pkg/contrib/fileutl.cc:359 +#, fuzzy, c-format +msgid "Waited for %s but it wasn't there" msgstr "Waited for %s but it wasn't there" -#: apt-pkg/contrib/fileutl.cc:368 +#: apt-pkg/contrib/fileutl.cc:369 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:371 +#: apt-pkg/contrib/fileutl.cc:372 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:373 +#: apt-pkg/contrib/fileutl.cc:374 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:417 +#: apt-pkg/contrib/fileutl.cc:418 #, c-format msgid "Could not open file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:473 +#: apt-pkg/contrib/fileutl.cc:474 #, c-format msgid "read, still have %lu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:491 -msgid "Write error" -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:503 +#: apt-pkg/contrib/fileutl.cc:504 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:578 +#: apt-pkg/contrib/fileutl.cc:579 msgid "Problem closing the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:584 +#: apt-pkg/contrib/fileutl.cc:585 msgid "Problem unlinking the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:595 +#: apt-pkg/contrib/fileutl.cc:596 msgid "Problem syncing the file" msgstr "" @@ -1954,8 +2001,8 @@ msgid "The package cache file is an incompatible version" msgstr "" #: apt-pkg/pkgcache.cc:142 -#, c-format -msgid "This APT does not support the Versioning System '%s'" +#, fuzzy, c-format +msgid "This APT does not support the versioning system '%s'" msgstr "This APT does not support the Versioning System ‘%s’" #: apt-pkg/pkgcache.cc:147 @@ -2011,87 +2058,77 @@ msgid "extra" msgstr "" #: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 -msgid "Building Dependency Tree" +msgid "Building dependency tree" msgstr "" #: apt-pkg/depcache.cc:61 -msgid "Candidate Versions" +msgid "Candidate versions" msgstr "" #: apt-pkg/depcache.cc:90 -msgid "Dependency Generation" +msgid "Dependency generation" msgstr "" -#: apt-pkg/tagfile.cc:81 +#: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" msgstr "" -#: apt-pkg/tagfile.cc:174 +#: apt-pkg/tagfile.cc:160 #, c-format msgid "Unable to parse package file %s (2)" msgstr "" -#: apt-pkg/sourcelist.cc:88 +#: apt-pkg/sourcelist.cc:87 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:89 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:93 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:98 #, c-format -msgid "Malformed line %lu in source list %s (Absolute dist)" +msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:106 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:183 apt-pkg/sourcelist.cc:207 -#, c-format -msgid "Vendor block %s is invalid" -msgstr "" - -#: apt-pkg/sourcelist.cc:235 +#: apt-pkg/sourcelist.cc:156 #, c-format msgid "Opening %s" msgstr "" -#: apt-pkg/sourcelist.cc:249 +#: apt-pkg/sourcelist.cc:170 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:266 +#: apt-pkg/sourcelist.cc:187 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:270 -#, c-format -msgid "Type '%s' is not known in on line %u in source list %s" +#: apt-pkg/sourcelist.cc:191 +#, fuzzy, c-format +msgid "Type '%s' is not known on line %u in source list %s" msgstr "Type ‘%s’ is not known in on line %u in source list %s" -#: apt-pkg/sourcelist.cc:279 apt-pkg/sourcelist.cc:282 +#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" -#: apt-pkg/sourcelist.cc:296 -#, c-format -msgid "Unknown vendor ID '%s' in line %u of source list %s" -msgstr "Unknown vendor ID ‘%s’ in line %u of source list %s" - #: apt-pkg/packagemanager.cc:402 #, c-format msgid "" @@ -2105,19 +2142,19 @@ msgstr "" msgid "Index file type '%s' is not supported" msgstr "Index file type ‘%s’ is not supported" -#: apt-pkg/algorithms.cc:238 +#: apt-pkg/algorithms.cc:241 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1056 +#: apt-pkg/algorithms.cc:1059 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1058 +#: apt-pkg/algorithms.cc:1061 msgid "Unable to correct problems, you have held broken packages." msgstr "" @@ -2147,7 +2184,7 @@ msgid "Packaging system '%s' is not supported" msgstr "Packaging system ‘%s’ is not supported" #: apt-pkg/init.cc:135 -msgid "Unable to determine a suitable system type" +msgid "Unable to determine a suitable packaging system type" msgstr "" #: apt-pkg/clean.cc:61 @@ -2155,7 +2192,7 @@ msgstr "" msgid "Unable to stat %s." msgstr "" -#: apt-pkg/srcrecords.cc:49 +#: apt-pkg/srcrecords.cc:48 msgid "You must put some 'source' URIs in your sources.list" msgstr "You must put some ‘source’ URIs in your sources.list" @@ -2176,43 +2213,47 @@ msgstr "" msgid "Did not understand pin type %s" msgstr "" +#: apt-pkg/policy.cc:299 +msgid "No priority (or zero) specified for pin" +msgstr "" + #: apt-pkg/pkgcachegen.cc:74 msgid "Cache has an incompatible versioning system" msgstr "" #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occured while processing %s (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" msgstr "" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occured while processing %s (UsePackage1)" +msgid "Error occurred while processing %s (UsePackage1)" msgstr "" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occured while processing %s (UsePackage2)" +msgid "Error occurred while processing %s (UsePackage2)" msgstr "" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occured while processing %s (NewFileVer1)" +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occured while processing %s (NewVersion1)" +msgid "Error occurred while processing %s (NewVersion1)" msgstr "" #: apt-pkg/pkgcachegen.cc:188 #, c-format -msgid "Error occured while processing %s (UsePackage3)" +msgid "Error occurred while processing %s (UsePackage3)" msgstr "" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occured while processing %s (NewVersion2)" +msgid "Error occurred while processing %s (NewVersion2)" msgstr "" #: apt-pkg/pkgcachegen.cc:207 @@ -2229,12 +2270,12 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occured while processing %s (FindPkg)" +msgid "Error occurred while processing %s (FindPkg)" msgstr "" #: apt-pkg/pkgcachegen.cc:254 #, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" #: apt-pkg/pkgcachegen.cc:260 @@ -2251,51 +2292,150 @@ msgstr "" msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:774 apt-pkg/pkgcachegen.cc:781 +#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/acquire-item.cc:124 +#: apt-pkg/acquire-item.cc:126 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:353 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 +msgid "MD5Sum mismatch" +msgstr "" + +#: apt-pkg/acquire-item.cc:714 #, 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:388 +#: apt-pkg/acquire-item.cc:767 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:419 +#: apt-pkg/acquire-item.cc:803 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:501 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:511 -msgid "MD5Sum mismatch" +#: apt-pkg/vendorlist.cc:66 +#, c-format +msgid "Vendor block %s contains no fingerprint" msgstr "" -#: methods/rsh.cc:264 -msgid "File Not Found" +#: apt-pkg/cdrom.cc:504 +#, c-format +msgid "" +"Using CD-ROM mount point %s\n" +"Mounting CD-ROM\n" msgstr "" -#: methods/rsh.cc:330 -msgid "Connection closed prematurely" +#: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595 +msgid "Identifying.. " msgstr "" +#: apt-pkg/cdrom.cc:538 +#, c-format +msgid "Stored label: %s \n" +msgstr "" + +#: apt-pkg/cdrom.cc:558 +#, c-format +msgid "Using CD-ROM mount point %s\n" +msgstr "" + +#: apt-pkg/cdrom.cc:576 +msgid "Unmounting CD-ROM\n" +msgstr "" + +#: apt-pkg/cdrom.cc:580 +msgid "Waiting for disc...\n" +msgstr "" + +#. Mount the new CDROM +#: apt-pkg/cdrom.cc:588 +msgid "Mounting CD-ROM...\n" +msgstr "" + +#: apt-pkg/cdrom.cc:606 +msgid "Scanning disc for index files..\n" +msgstr "" + +#: apt-pkg/cdrom.cc:644 +#, c-format +msgid "Found %i package indexes, %i source indexes and %i signatures\n" +msgstr "" + +#: apt-pkg/cdrom.cc:701 +msgid "That is not a valid name, try again.\n" +msgstr "" + +#: apt-pkg/cdrom.cc:717 +#, c-format +msgid "" +"This disc is called: \n" +"'%s'\n" +msgstr "" + +#: apt-pkg/cdrom.cc:721 +msgid "Copying package lists..." +msgstr "" + +#: apt-pkg/cdrom.cc:745 +msgid "Writing new source list\n" +msgstr "" + +#: apt-pkg/cdrom.cc:754 +msgid "Source list entries for this disc are:\n" +msgstr "" + +#: apt-pkg/cdrom.cc:788 +msgid "Unmounting CD-ROM..." +msgstr "" + +#: apt-pkg/indexcopy.cc:261 +#, c-format +msgid "Wrote %i records.\n" +msgstr "" + +#: apt-pkg/indexcopy.cc:263 +#, c-format +msgid "Wrote %i records with %i missing files.\n" +msgstr "" + +#: apt-pkg/indexcopy.cc:266 +#, c-format +msgid "Wrote %i records with %i mismatched files\n" +msgstr "" + +#: apt-pkg/indexcopy.cc:269 +#, c-format +msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgstr "" + +#~ msgid "Unknown vendor ID '%s' in line %u of source list %s" +#~ msgstr "Unknown vendor ID ‘%s’ in line %u of source list %s" + +#~ msgid "" +#~ "Some broken packages were found while trying to process build-" +#~ "dependencies.\n" +#~ "You might want to run `apt-get -f install' to correct these." +#~ msgstr "" +#~ "Some broken packages were found while trying to process build-" +#~ "dependencies.\n" +#~ "You might want to run ‘apt-get -f install’ to correct these." + #~ msgid "<- '" #~ msgstr "<- ‘" @@ -2313,6 +2453,3 @@ msgstr "" #~ msgid "....\"Have you mooed today?\"..." #~ msgstr "....‘Have you mooed today?’..." - -#~ msgid "Errors apply to file '%s'" -#~ msgstr "Errors apply to file ‘%s’"