summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 17:03:51 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 17:03:51 +0000
commit58d768314ed24fa53f1559a4c323e70c56aad6dd (patch)
tree209245e5d5db85d86c344236ccbccad91cb68def /po
parent06fc4dafb464a5905a7cdc3add72524d5fcd0cfa (diff)
* apt-get build-dep, when trying to skip over the remai...
Author: mdz Date: 2003-09-24 04:00:25 GMT * apt-get build-dep, when trying to skip over the remaining elements of an or-expression, would accidentally inherit the version requirements of a later item in the or-expression. Fixed it. * Let apt-get build-dep try alternatives if the first dependency in an or-expression is not available * Add a Debug::BuildDeps to generate some trace output * Help apt-get build-dep produce more useful error messages * Process build-dependencies in forward rather than reverse order * Error out if an installed package is too new for a << or <= build-dependency
Diffstat (limited to 'po')
-rw-r--r--po/apt-all.pot32
1 files changed, 22 insertions, 10 deletions
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 03cbdf202..5b6c78a6a 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: 2003-09-10 15:26-0400\n"
+"POT-Creation-Date: 2003-09-23 23:59-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -146,9 +146,9 @@ msgstr ""
msgid " %4i %s\n"
msgstr ""
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cdrom.cc:730 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1581 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:544
-#: cmdline/apt-get.cc:2206 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2264 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr ""
@@ -958,35 +958,47 @@ msgstr ""
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2113
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2146
+#: cmdline/apt-get.cc:2159
#, 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:2174
+#: cmdline/apt-get.cc:2193
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+
+#: cmdline/apt-get.cc:2218
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr ""
+
+#: cmdline/apt-get.cc:2232
+#, c-format
msgid ""
-"Some broken packages were found while trying to process build-dependencies.\n"
+"Some broken packages were found while trying to process build-dependencies "
+"for %s.\n"
"You might want to run `apt-get -f install' to correct these."
msgstr ""
-#: cmdline/apt-get.cc:2179
+#: cmdline/apt-get.cc:2237
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2211
+#: cmdline/apt-get.cc:2269
msgid "Supported Modules:"
msgstr ""
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:2310
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"