diff options
Diffstat (limited to 'po/apt-all.pot')
| -rw-r--r-- | po/apt-all.pot | 472 |
1 files changed, 382 insertions, 90 deletions
diff --git a/po/apt-all.pot b/po/apt-all.pot index f0c430fef..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" @@ -94,72 +100,77 @@ 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 "" +<<<<<<< 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 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 +207,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 +444,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 +551,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 +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 "" @@ -578,7 +601,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 +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 "" @@ -699,7 +722,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 +730,89 @@ 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 "" +<<<<<<< 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 "" -#: 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 +820,149 @@ 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 "" +<<<<<<< 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" @@ -973,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" @@ -1041,7 +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 "" @@ -1175,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 "" @@ -1189,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 "" @@ -1328,11 +1382,16 @@ msgstr "" 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 "" @@ -1350,6 +1409,33 @@ 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 "" + +#: methods/gpgv.cc:172 +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 +#, 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:215 methods/gpgv.cc:222 +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" @@ -1387,6 +1473,7 @@ msgstr "" msgid "Unknown date format" msgstr "" +<<<<<<< HEAD #: methods/http.cc:818 msgid "Select failed" msgstr "" @@ -1412,6 +1499,33 @@ msgid "Error reading from server. Remote end closed connection" msgstr "" #: methods/http.cc:921 +======= +#: methods/http.cc:827 +msgid "Select failed" +msgstr "" + +#: methods/http.cc:832 +msgid "Connection timed out" +msgstr "" + +#: methods/http.cc:855 +msgid "Error writing to output file" +msgstr "" + +#: methods/http.cc:886 +msgid "Error writing to file" +msgstr "" + +#: methods/http.cc:914 +msgid "Error writing to the file" +msgstr "" + +#: methods/http.cc:928 +msgid "Error reading from server. Remote end closed connection" +msgstr "" + +#: methods/http.cc:930 +>>>>>>> upstream/debian/sid msgid "Error reading from server" msgstr "" @@ -1429,11 +1543,19 @@ 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 "" @@ -1460,7 +1582,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 "" @@ -1540,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 "" @@ -1850,23 +1981,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 "" @@ -2083,7 +2214,11 @@ msgstr "" 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 "" @@ -2213,77 +2348,94 @@ 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 "" +<<<<<<< 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 "" @@ -2293,31 +2445,62 @@ 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 "" + +#: apt-pkg/contrib/fileutl.cc:1202 +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 "" @@ -2508,19 +2691,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 " @@ -2539,23 +2722,35 @@ 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." 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 "" @@ -2592,7 +2787,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 "" @@ -2655,6 +2850,7 @@ 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 @@ -2663,6 +2859,16 @@ msgstr "" #: 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 +>>>>>>> upstream/debian/sid #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "" @@ -2683,16 +2889,25 @@ 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" @@ -2703,6 +2918,18 @@ 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" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:1304 +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 "" @@ -2715,40 +2942,69 @@ 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 "" "A error occurred during the signature verification. The repository is not " @@ -2756,32 +3012,52 @@ msgid "" 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 "" @@ -2831,7 +3107,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 "" @@ -2889,30 +3165,46 @@ 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 "" +<<<<<<< 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 "" |