diff options
Diffstat (limited to 'po')
| -rw-r--r-- | po/apt-all.pot | 508 |
1 files changed, 387 insertions, 121 deletions
diff --git a/po/apt-all.pot b/po/apt-all.pot index 1bfca4088..518844781 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -5,9 +5,15 @@ #, fuzzy msgid "" msgstr "" +<<<<<<< HEAD +"Project-Id-Version: apt 0.9.7.7ubuntu3\n" +"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" +"POT-Creation-Date: 2013-04-11 14:52+0200\n" +======= "Project-Id-Version: apt 0.9.8.1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" "POT-Creation-Date: 2013-06-26 07:37+0200\n" +>>>>>>> upstream/debian/sid "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -151,8 +157,13 @@ msgstr "" msgid " Version table:" msgstr "" +<<<<<<< HEAD +#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3366 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 +>>>>>>> upstream/debian/sid #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -577,7 +588,11 @@ msgstr "" msgid "Do you want to continue [Y/n]? " msgstr "" +<<<<<<< HEAD +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 +======= #: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 +>>>>>>> upstream/debian/sid #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -751,7 +766,11 @@ msgstr "" msgid "Calculating upgrade... " msgstr "" +<<<<<<< HEAD +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 +======= #: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 +>>>>>>> upstream/debian/sid msgid "Failed" msgstr "" @@ -931,11 +950,19 @@ msgstr "" msgid "Changelog for %s (%s)" msgstr "" +<<<<<<< HEAD +#: cmdline/apt-get.cc:3371 +msgid "Supported modules:" +msgstr "" + +#: cmdline/apt-get.cc:3412 +======= #: cmdline/apt-get.cc:3366 msgid "Supported modules:" msgstr "" #: cmdline/apt-get.cc:3407 +>>>>>>> upstream/debian/sid msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -981,7 +1008,11 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" +<<<<<<< HEAD +#: cmdline/apt-get.cc:3577 +======= #: cmdline/apt-get.cc:3572 +>>>>>>> upstream/debian/sid msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1049,8 +1080,12 @@ msgid "%s was already not hold.\n" msgstr "" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 +<<<<<<< HEAD +#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001 +======= #: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 #: apt-pkg/deb/dpkgpm.cc:1002 +>>>>>>> upstream/debian/sid #, c-format msgid "Waited for %s but it wasn't there" msgstr "" @@ -1184,8 +1219,13 @@ msgstr "" msgid "Server closed the connection" msgstr "" +<<<<<<< HEAD +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274 +#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286 +======= #: 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 +>>>>>>> upstream/debian/sid msgid "Read error" msgstr "" @@ -1198,8 +1238,13 @@ msgid "Protocol corruption" msgstr "" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 +<<<<<<< HEAD +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410 +======= #: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 #: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 +>>>>>>> upstream/debian/sid msgid "Write error" msgstr "" @@ -1253,7 +1298,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "" @@ -1280,73 +1325,91 @@ msgstr "" msgid "Unable to invoke " msgstr "" -#: methods/connect.cc:76 +#: methods/connect.cc:75 #, c-format msgid "Connecting to %s (%s)" msgstr "" -#: methods/connect.cc:87 +#: methods/connect.cc:86 #, c-format msgid "[IP: %s %s]" msgstr "" -#: methods/connect.cc:94 +#: methods/connect.cc:93 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "" -#: methods/connect.cc:100 +#: methods/connect.cc:99 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" -#: methods/connect.cc:126 +#: methods/connect.cc:125 #, c-format msgid "Could not connect to %s:%s (%s)." 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:153 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "" -#: methods/connect.cc:180 methods/connect.cc:199 +#: methods/connect.cc:172 methods/connect.cc:191 #, c-format msgid "Could not resolve '%s'" msgstr "" -#: methods/connect.cc:205 +#: methods/connect.cc:197 #, c-format msgid "Temporary failure resolving '%s'" msgstr "" -#: methods/connect.cc:209 -#, c-format -msgid "System error resolving '%s:%s'" -msgstr "" - -#: methods/connect.cc:211 +#: methods/connect.cc:200 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "" -#: methods/connect.cc:258 +#: methods/connect.cc:247 #, c-format msgid "Unable to connect to %s:%s:" msgstr "" +<<<<<<< HEAD +#: methods/gpgv.cc:180 +======= #: methods/gpgv.cc:166 +>>>>>>> upstream/debian/sid msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" +<<<<<<< HEAD +#: methods/gpgv.cc:185 +msgid "At least one invalid signature was encountered." +msgstr "" + +#: methods/gpgv.cc:189 +msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" +msgstr "" + +#: methods/gpgv.cc:194 +msgid "Unknown error executing gpgv" +msgstr "" + +#: methods/gpgv.cc:228 methods/gpgv.cc:235 +msgid "The following signatures were invalid:\n" +msgstr "" + +#: methods/gpgv.cc:242 +======= #: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "" @@ -1372,6 +1435,7 @@ msgid "The following signatures were invalid:\n" msgstr "" #: methods/gpgv.cc:229 +>>>>>>> upstream/debian/sid msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1409,6 +1473,33 @@ msgstr "" msgid "Unknown date format" msgstr "" +<<<<<<< HEAD +#: methods/http.cc:818 +msgid "Select failed" +msgstr "" + +#: methods/http.cc:823 +msgid "Connection timed out" +msgstr "" + +#: methods/http.cc:846 +msgid "Error writing to output file" +msgstr "" + +#: methods/http.cc:877 +msgid "Error writing to file" +msgstr "" + +#: methods/http.cc:905 +msgid "Error writing to the file" +msgstr "" + +#: methods/http.cc:919 +msgid "Error reading from server. Remote end closed connection" +msgstr "" + +#: methods/http.cc:921 +======= #: methods/http.cc:827 msgid "Select failed" msgstr "" @@ -1434,28 +1525,37 @@ msgid "Error reading from server. Remote end closed connection" msgstr "" #: methods/http.cc:930 +>>>>>>> upstream/debian/sid msgid "Error reading from server" msgstr "" -#: methods/http.cc:1198 +#: methods/http.cc:1194 msgid "Bad header data" msgstr "" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1211 methods/http.cc:1266 msgid "Connection failed" msgstr "" -#: methods/http.cc:1362 +#: methods/http.cc:1358 msgid "Internal error" msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. +<<<<<<< HEAD +#: 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 +#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109 +#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 +======= #: 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/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 +>>>>>>> upstream/debian/sid #, c-format msgid "Unable to read %s" msgstr "" @@ -1567,7 +1667,11 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" +<<<<<<< HEAD +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 +======= #: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 +>>>>>>> upstream/debian/sid #, c-format msgid "Unable to write to %s" msgstr "" @@ -1672,8 +1776,8 @@ msgstr "" msgid "Unable to open DB file %s: %s" msgstr "" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 #, c-format msgid "Failed to stat %s" msgstr "" @@ -1686,87 +1790,87 @@ msgstr "" msgid "Unable to get a cursor" msgstr "" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to read directory %s\n" msgstr "" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:85 #, c-format msgid "W: Unable to stat %s\n" msgstr "" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:141 msgid "E: " msgstr "" -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:143 msgid "W: " msgstr "" -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:150 msgid "E: Errors apply to file " msgstr "" -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:168 ftparchive/writer.cc:200 #, c-format msgid "Failed to resolve %s" msgstr "" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:181 msgid "Tree walking failed" msgstr "" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:208 #, c-format msgid "Failed to open %s" msgstr "" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:267 #, c-format msgid " DeLink %s [%s]\n" msgstr "" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:275 #, c-format msgid "Failed to readlink %s" msgstr "" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:279 #, c-format msgid "Failed to unlink %s" msgstr "" -#: ftparchive/writer.cc:288 +#: ftparchive/writer.cc:286 #, c-format msgid "*** Failed to link %s to %s" msgstr "" -#: ftparchive/writer.cc:298 +#: ftparchive/writer.cc:296 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:403 +#: ftparchive/writer.cc:401 msgid "Archive had no package field" msgstr "" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:409 ftparchive/writer.cc:714 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 +#: ftparchive/writer.cc:477 ftparchive/writer.cc:858 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" -#: ftparchive/writer.cc:711 +#: ftparchive/writer.cc:724 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:715 +#: ftparchive/writer.cc:728 #, c-format msgid " %s has no binary override entry either\n" msgstr "" @@ -1840,7 +1944,7 @@ msgstr "" msgid "Problem unlinking %s" msgstr "" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 #, c-format msgid "Failed to rename %s to %s" msgstr "" @@ -1964,54 +2068,54 @@ msgstr "" msgid "Failed to close file %s" msgstr "" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 #, c-format msgid "The path %s is too long" msgstr "" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:127 #, c-format msgid "Unpacking %s more than once" msgstr "" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:137 #, c-format msgid "The directory %s is diverted" msgstr "" -#: apt-inst/extract.cc:145 +#: apt-inst/extract.cc:147 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 msgid "The diversion path is too long" msgstr "" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:243 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:283 msgid "Failed to locate node in its hash bucket" msgstr "" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:287 msgid "The path is too long" msgstr "" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:415 #, c-format msgid "Overwrite package match with no version for %s" msgstr "" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:432 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:492 #, c-format msgid "Unable to stat %s" msgstr "" @@ -2087,30 +2191,34 @@ msgid "" msgstr "" #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:378 +#: apt-pkg/contrib/strutl.cc:372 #, c-format msgid "%lid %lih %limin %lis" msgstr "" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:385 +#: apt-pkg/contrib/strutl.cc:379 #, c-format msgid "%lih %limin %lis" msgstr "" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:392 +#: apt-pkg/contrib/strutl.cc:386 #, c-format msgid "%limin %lis" msgstr "" #. s means seconds -#: apt-pkg/contrib/strutl.cc:397 +#: apt-pkg/contrib/strutl.cc:391 #, c-format msgid "%lis" msgstr "" +<<<<<<< HEAD +#: apt-pkg/contrib/strutl.cc:1167 +======= #: apt-pkg/contrib/strutl.cc:1173 +>>>>>>> upstream/debian/sid #, c-format msgid "Selection %s not found" msgstr "" @@ -2180,16 +2288,6 @@ msgstr "" msgid "%c%s... Done" msgstr "" -#: apt-pkg/contrib/progress.cc:179 -msgid "..." -msgstr "" - -#. Print the spinner -#: apt-pkg/contrib/progress.cc:195 -#, c-format -msgid "%c%s... %u%%" -msgstr "" - #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2301,26 +2399,53 @@ msgstr "" msgid "Sub-process %s received signal %u." msgstr "" +<<<<<<< HEAD +#: apt-pkg/contrib/fileutl.cc:846 +======= #: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 +>>>>>>> upstream/debian/sid #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" +<<<<<<< HEAD +#: apt-pkg/contrib/fileutl.cc:848 +======= #: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 +>>>>>>> upstream/debian/sid #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" +<<<<<<< HEAD +#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659 +======= #: apt-pkg/contrib/fileutl.cc:985 +>>>>>>> upstream/debian/sid #, c-format msgid "Could not open file %s" msgstr "" +<<<<<<< HEAD +#: apt-pkg/contrib/fileutl.cc:1066 +======= #: apt-pkg/contrib/fileutl.cc:1062 +>>>>>>> upstream/debian/sid #, c-format msgid "Could not open file descriptor %d" msgstr "" +<<<<<<< HEAD +#: apt-pkg/contrib/fileutl.cc:1156 +msgid "Failed to create subprocess IPC" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:1212 +msgid "Failed to exec compressor " +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:1309 +======= #: apt-pkg/contrib/fileutl.cc:1147 msgid "Failed to create subprocess IPC" msgstr "" @@ -2330,40 +2455,55 @@ msgid "Failed to exec compressor " msgstr "" #: apt-pkg/contrib/fileutl.cc:1297 +>>>>>>> upstream/debian/sid #, c-format msgid "read, still have %llu to read but none left" msgstr "" +<<<<<<< HEAD +#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420 +======= #: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 +>>>>>>> upstream/debian/sid #, c-format msgid "write, still have %llu to write but couldn't" msgstr "" +<<<<<<< HEAD +#: apt-pkg/contrib/fileutl.cc:1736 +======= #: apt-pkg/contrib/fileutl.cc:1681 +>>>>>>> upstream/debian/sid #, c-format msgid "Problem closing the file %s" msgstr "" +<<<<<<< HEAD +#: apt-pkg/contrib/fileutl.cc:1748 +======= #: apt-pkg/contrib/fileutl.cc:1693 +>>>>>>> upstream/debian/sid #, c-format msgid "Problem renaming the file %s to %s" msgstr "" +<<<<<<< HEAD +#: apt-pkg/contrib/fileutl.cc:1759 +======= #: apt-pkg/contrib/fileutl.cc:1704 +>>>>>>> upstream/debian/sid #, c-format msgid "Problem unlinking the file %s" msgstr "" +<<<<<<< HEAD +#: apt-pkg/contrib/fileutl.cc:1774 +======= #: apt-pkg/contrib/fileutl.cc:1717 +>>>>>>> upstream/debian/sid msgid "Problem syncing the file" msgstr "" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:76 -#, c-format -msgid "No keyring installed in %s." -msgstr "" - #: apt-pkg/pkgcache.cc:148 msgid "Empty package cache" msgstr "" @@ -2389,59 +2529,59 @@ msgstr "" msgid "The package cache was built for a different architecture" msgstr "" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:305 msgid "Depends" msgstr "" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:305 msgid "PreDepends" msgstr "" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:305 msgid "Suggests" msgstr "" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:306 msgid "Recommends" msgstr "" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:306 msgid "Conflicts" msgstr "" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:306 msgid "Replaces" msgstr "" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:307 msgid "Obsoletes" msgstr "" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:307 msgid "Breaks" msgstr "" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:307 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:318 msgid "important" msgstr "" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:318 msgid "required" msgstr "" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:318 msgid "standard" msgstr "" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:319 msgid "optional" msgstr "" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:319 msgid "extra" msgstr "" @@ -2541,12 +2681,12 @@ msgstr "" msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:285 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" @@ -2582,17 +2722,29 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" +<<<<<<< HEAD +#: apt-pkg/algorithms.cc:1228 +======= #: apt-pkg/algorithms.cc:1234 +>>>>>>> upstream/debian/sid msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" +<<<<<<< HEAD +#: apt-pkg/algorithms.cc:1230 +msgid "Unable to correct problems, you have held broken packages." +msgstr "" + +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 +======= #: apt-pkg/algorithms.cc:1236 msgid "Unable to correct problems, you have held broken packages." msgstr "" #: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 +>>>>>>> upstream/debian/sid msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2640,12 +2792,12 @@ msgstr "" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -#: apt-pkg/init.cc:151 +#: apt-pkg/init.cc:152 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" -#: apt-pkg/init.cc:167 +#: apt-pkg/init.cc:168 msgid "Unable to determine a suitable packaging system type" msgstr "" @@ -2698,6 +2850,16 @@ 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 +<<<<<<< HEAD +#: 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 @@ -2706,6 +2868,7 @@ msgstr "" #: 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 +>>>>>>> upstream/debian/sid #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "" @@ -2726,16 +2889,36 @@ msgstr "" msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" +<<<<<<< HEAD +#: apt-pkg/pkgcachegen.cc:577 +======= #: apt-pkg/pkgcachegen.cc:570 +>>>>>>> upstream/debian/sid #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" +<<<<<<< HEAD +#: apt-pkg/pkgcachegen.cc:1150 +======= #: apt-pkg/pkgcachegen.cc:1199 +>>>>>>> upstream/debian/sid #, c-format msgid "Couldn't stat source package list %s" msgstr "" +<<<<<<< HEAD +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +msgid "Reading package lists" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:1255 +msgid "Collecting File Provides" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +======= #: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 #: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 msgid "Reading package lists" @@ -2746,6 +2929,7 @@ msgid "Collecting File Provides" msgstr "" #: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +>>>>>>> upstream/debian/sid msgid "IO Error saving source cache" msgstr "" @@ -2758,97 +2942,146 @@ msgstr "" msgid "MD5Sum mismatch" msgstr "" +<<<<<<< HEAD +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870 +#: apt-pkg/acquire-item.cc:2013 +msgid "Hash Sum mismatch" +msgstr "" + +#: apt-pkg/acquire-item.cc:1381 +======= #: 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:1377 +>>>>>>> upstream/debian/sid #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" +<<<<<<< HEAD +#: apt-pkg/acquire-item.cc:1397 +======= #: apt-pkg/acquire-item.cc:1393 +>>>>>>> upstream/debian/sid #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "" +<<<<<<< HEAD +#: apt-pkg/acquire-item.cc:1439 +msgid "There is no public key available for the following key IDs:\n" +msgstr "" + +#: apt-pkg/acquire-item.cc:1477 +======= #: 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:1473 +>>>>>>> upstream/debian/sid #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" +<<<<<<< HEAD +#: apt-pkg/acquire-item.cc:1499 +======= #: apt-pkg/acquire-item.cc:1495 +>>>>>>> upstream/debian/sid #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" +<<<<<<< HEAD +#: apt-pkg/acquire-item.cc:1532 +======= #: apt-pkg/acquire-item.cc:1525 +>>>>>>> upstream/debian/sid #, c-format msgid "" -"An error occurred during the signature verification. The repository is not " +"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 "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) +<<<<<<< HEAD +#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547 +======= #: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 +>>>>>>> upstream/debian/sid #, c-format msgid "GPG error: %s: %s" msgstr "" +<<<<<<< HEAD +#: apt-pkg/acquire-item.cc:1646 +======= #: apt-pkg/acquire-item.cc:1652 +>>>>>>> upstream/debian/sid #, 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 "" +<<<<<<< HEAD +#: apt-pkg/acquire-item.cc:1705 +======= #: apt-pkg/acquire-item.cc:1711 +>>>>>>> upstream/debian/sid #, 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 "" +<<<<<<< HEAD +#: apt-pkg/acquire-item.cc:1764 +======= #: apt-pkg/acquire-item.cc:1770 +>>>>>>> upstream/debian/sid #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" +<<<<<<< HEAD +#: apt-pkg/acquire-item.cc:1862 +======= #: apt-pkg/acquire-item.cc:1868 +>>>>>>> upstream/debian/sid msgid "Size mismatch" msgstr "" -#: apt-pkg/indexrecords.cc:68 +#: apt-pkg/indexrecords.cc:64 #, c-format msgid "Unable to parse Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:78 +#: apt-pkg/indexrecords.cc:74 #, c-format msgid "No sections in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:108 #, c-format msgid "No Hash entry in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:121 #, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:140 #, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "" @@ -2940,22 +3173,38 @@ msgstr "" msgid "Source list entries for this disc are:\n" msgstr "" +<<<<<<< HEAD +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880 +======= #: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 +>>>>>>> upstream/debian/sid #, c-format msgid "Wrote %i records.\n" msgstr "" +<<<<<<< HEAD +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882 +======= #: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 +>>>>>>> upstream/debian/sid #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" +<<<<<<< HEAD +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885 +======= #: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 +>>>>>>> upstream/debian/sid #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" +<<<<<<< HEAD +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888 +======= #: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 +>>>>>>> upstream/debian/sid #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -2970,6 +3219,17 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "" +#: apt-pkg/indexcopy.cc:662 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:692 +#, c-format +msgid "No keyring installed in %s." +msgstr "" + #: apt-pkg/cacheset.cc:403 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3033,119 +3293,119 @@ msgstr "" msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 msgid "Execute external solver" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:73 +#: apt-pkg/deb/dpkgpm.cc:72 #, c-format msgid "Installing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951 #, c-format msgid "Configuring %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958 #, c-format msgid "Removing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:76 +#: apt-pkg/deb/dpkgpm.cc:75 #, c-format msgid "Completely removing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:77 +#: apt-pkg/deb/dpkgpm.cc:76 #, c-format msgid "Noting disappearance of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:78 +#: apt-pkg/deb/dpkgpm.cc:77 #, c-format 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:704 #, c-format msgid "Directory '%s' missing" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739 #, c-format msgid "Could not open file '%s'" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:944 #, c-format msgid "Preparing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:945 #, c-format msgid "Unpacking %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:950 #, c-format msgid "Preparing to configure %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:952 #, c-format msgid "Installed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:957 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:959 #, c-format msgid "Removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:964 #, c-format msgid "Preparing to completely remove %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:965 #, c-format msgid "Completely removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1212 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1242 msgid "Running dpkg" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1414 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1476 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:1481 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1483 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:1489 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3157,7 +3417,13 @@ msgid "" "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509 +msgid "" +"No apport report written because the error message indicates an issue on the " +"local system" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1530 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" |