From e01c08b0206b54c2d977a360beab2d72cf079f0c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 25 Jul 2008 20:21:53 +0200 Subject: * improve apt progress reporting, display trigger actions --- po/apt-all.pot | 73 +++++++++++++++++++++++++++++++++------------------------- 1 file changed, 42 insertions(+), 31 deletions(-) (limited to 'po/apt-all.pot') diff --git a/po/apt-all.pot b/po/apt-all.pot index 6319e740f..81a84a928 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-04 09:50+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1597,7 +1597,7 @@ msgstr "" msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "" @@ -1609,7 +1609,7 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "" @@ -2001,70 +2001,70 @@ msgstr "" msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "" @@ -2574,68 +2574,79 @@ msgstr "" msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, c-format msgid "Directory '%s' missing" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, c-format msgid "Preparing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, c-format msgid "Unpacking %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, c-format msgid "Preparing to configure %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Configuring %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, c-format msgid "Processing triggers for %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, c-format msgid "Installed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Removing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, c-format msgid "Removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, c-format msgid "Preparing to completely remove %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, c-format msgid "Completely removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, c-format +msgid "Installing %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -- cgit v1.2.3 From 3c8cda8b05d6eeaef76c7ccc673fe378b0c74f37 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 28 Oct 2008 18:14:29 +0100 Subject: fix various -Wall warnings --- po/apt-all.pot | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) (limited to 'po/apt-all.pot') diff --git a/po/apt-all.pot b/po/apt-all.pot index 922b9af1e..19e57536a 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-10-28 16:44+0100\n" +"POT-Creation-Date: 2008-10-28 18:12+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1663,7 +1663,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1855,15 +1855,19 @@ msgstr "" msgid "Error reading from server" msgstr "" -#: methods/http.cc:1104 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +msgid "Failed to truncate file" +msgstr "" + +#: methods/http.cc:1105 msgid "Bad header data" msgstr "" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "" -#: methods/http.cc:1228 +#: methods/http.cc:1229 msgid "Internal error" msgstr "" @@ -1876,6 +1880,10 @@ msgstr "" msgid "Couldn't make mmap of %lu bytes" msgstr "" +#: apt-pkg/contrib/mmap.cc:213 +msgid "Dynamic MMap ran out of room" +msgstr "" + #: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" @@ -1992,12 +2000,13 @@ msgstr "" msgid "Unable to stat the mount point %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40 #, c-format msgid "Unable to change to %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:187 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" msgstr "" @@ -2274,12 +2283,12 @@ msgstr "" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:827 +#: apt-pkg/acquire.cc:828 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/acquire.cc:829 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li" msgstr "" -- cgit v1.2.3 From 2c120e24097b1f495658d5b06c62dfe19028b6da Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sat, 8 Nov 2008 21:11:14 +0200 Subject: Re-applied apt-cache built-in help fixes. --- po/apt-all.pot | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'po/apt-all.pot') diff --git a/po/apt-all.pot b/po/apt-all.pot index 19e57536a..518aabcd3 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-10-28 18:12+0100\n" +"POT-Creation-Date: 2008-11-08 21:08+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -184,8 +184,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -2449,35 +2449,35 @@ msgstr "" msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1421 +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 msgid "Hash Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:1113 +#: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1226 +#: apt-pkg/acquire-item.cc:1231 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1285 +#: apt-pkg/acquire-item.cc:1290 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:1326 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1413 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" msgstr "" -- cgit v1.2.3 From 527afa0016c9d74e212015b1ae491214f4b301d7 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Wed, 12 Nov 2008 22:09:45 +0100 Subject: Update POT file --- po/apt-all.pot | 99 ++++++++++++++++++++++++++++++---------------------------- 1 file changed, 51 insertions(+), 48 deletions(-) (limited to 'po/apt-all.pot') diff --git a/po/apt-all.pot b/po/apt-all.pot index 518aabcd3..70f81f357 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-08 21:08+0200\n" +"POT-Creation-Date: 2008-11-12 22:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -156,7 +156,7 @@ msgstr "" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2571 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "" @@ -713,11 +713,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1990 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2071 cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "" @@ -746,7 +746,7 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2166 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, c-format msgid "Couldn't determine free space in %s" msgstr "" @@ -780,7 +780,7 @@ msgstr "" msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2214 apt-pkg/algorithms.cc:1349 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -789,7 +789,7 @@ msgstr "" msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2223 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" msgstr "" @@ -909,7 +909,17 @@ msgid "" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1733 +#. +#. if (Packages == 1) +#. { +#. c1out << endl; +#. c1out << +#. _("Since you only requested a single operation it is extremely likely that\n" +#. "the package is simply not installable and a bug report against\n" +#. "that package should be filed.") << endl; +#. } +#. +#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735 msgid "The following information may help to resolve the situation:" msgstr "" @@ -959,159 +969,152 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1728 -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:1736 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1765 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1855 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1883 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1886 methods/ftp.cc:702 methods/connect.cc:112 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1891 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1958 cmdline/apt-get.cc:1966 +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2066 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:2096 cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2145 +#: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2173 +#: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:2179 +#: cmdline/apt-get.cc:2181 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2182 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2188 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2219 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2247 +#: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2260 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2296 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2340 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2412 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2465 +#: cmdline/apt-get.cc:2467 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2503 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2526 +#: cmdline/apt-get.cc:2528 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2542 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2544 +#: cmdline/apt-get.cc:2546 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2578 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -2654,7 +2657,7 @@ msgstr "" msgid "Completely removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:788 +#: apt-pkg/deb/dpkgpm.cc:791 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -- cgit v1.2.3