From 29f80b30c7c5a0da8544ebde6e7eb54c41171360 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Wed, 10 Feb 2016 18:02:45 +0100 Subject: Release 1.2.3 Build system messed up the 1.2.2 commit by not updating the .po files properly, so they are now. --- po/apt-all.pot | 99 +++++++++++++++++----------------------------------------- 1 file changed, 28 insertions(+), 71 deletions(-) (limited to 'po/apt-all.pot') diff --git a/po/apt-all.pot b/po/apt-all.pot index cef495f46..33500ff06 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt 1.2.1\n" +"Project-Id-Version: apt 1.2.3\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2016-01-25 18:05+0100\n" +"POT-Creation-Date: 2016-02-10 18:02+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -239,6 +239,32 @@ msgstr "" msgid "Unable to lock the download directory" msgstr "" +#: apt-private/private-install.cc +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" +"distribution that some required packages have not yet been created\n" +"or been moved out of Incoming." +msgstr "" + +#. +#. if (Packages == 1) +#. { +#. c1out << std::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.") << std::endl; +#. } +#. +#: apt-private/private-install.cc +msgid "The following information may help to resolve the situation:" +msgstr "" + +#: apt-private/private-install.cc +msgid "Broken packages" +msgstr "" + #: apt-private/private-install.cc msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" @@ -375,20 +401,6 @@ msgid "" "shouldn't happen. Please file a bug report against apt." msgstr "" -#. -#. if (Packages == 1) -#. { -#. c1out << std::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.") << std::endl; -#. } -#. -#: apt-private/private-install.cc -msgid "The following information may help to resolve the situation:" -msgstr "" - #: apt-private/private-install.cc msgid "Internal Error, AutoRemover broke stuff" msgstr "" @@ -427,18 +439,6 @@ msgid "" "solution)." msgstr "" -#: apt-private/private-install.cc -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" -"distribution that some required packages have not yet been created\n" -"or been moved out of Incoming." -msgstr "" - -#: apt-private/private-install.cc -msgid "Broken packages" -msgstr "" - #: apt-private/private-install.cc msgid "The following additional packages will be installed:" msgstr "" @@ -837,49 +837,6 @@ msgstr "" msgid "Build command '%s' failed.\n" msgstr "" -#: apt-private/private-source.cc -#, c-format -msgid "" -"%s dependency for %s can't be satisfied because %s is not allowed on '%s' " -"packages" -msgstr "" - -#: apt-private/private-source.cc -#, c-format -msgid "" -"%s dependency for %s cannot be satisfied because the package %s cannot be " -"found" -msgstr "" - -#: apt-private/private-source.cc -#, c-format -msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" -msgstr "" - -#: apt-private/private-source.cc -#, c-format -msgid "" -"%s dependency for %s cannot be satisfied because candidate version of " -"package %s can't satisfy version requirements" -msgstr "" - -#: apt-private/private-source.cc -#, c-format -msgid "" -"%s dependency for %s cannot be satisfied because package %s has no candidate " -"version" -msgstr "" - -#: apt-private/private-source.cc -#, c-format -msgid "Failed to satisfy %s dependency for %s: %s" -msgstr "" - -#: apt-private/private-source.cc -#, c-format -msgid "Build-dependencies for %s could not be satisfied." -msgstr "" - #: apt-private/private-source.cc #, c-format msgid "Unable to get build-dependency information for %s" -- cgit v1.2.3