Merging upstream version 2.9.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 44 insertions, 9 deletions

diff --git a/po/apt-all.pot b/po/apt-all.pot
index 42a70d5..612c35c 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 2.9.0\n"
+"Project-Id-Version: apt 2.9.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2024-04-12 18:21+0000\n"
+"POT-Creation-Date: 2024-04-14 16:52+0000\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"
@@ -1798,7 +1798,7 @@ msgstr ""
 
 #: apt-private/private-install.cc
 #, c-format
-msgid "  Download size: %sB/%sB\n"
+msgid "  Download size: %sB / %sB\n"
 msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
@@ -1822,14 +1822,45 @@ msgstr ""
 
 #: apt-private/private-install.cc
 #, c-format
-msgid "  Installed size: %sB\n"
+msgid "After this operation, %sB of additional disk space will be used.\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
 #: apt-private/private-install.cc
 #, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
+msgid "Space needed: %sB / %sB available\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
+#: apt-private/private-install.cc
+#, c-format
+msgid "More space needed than available: %sB > %sB, installation may fail"
+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 -
+#. The first %s is the location of the boot directory (determined from Dir::Boot),
+#. and it tells the space being needed there.
+#. (We have two spaces to align with parent "space needed:"for /boot)
+#: apt-private/private-install.cc
+#, c-format
+msgid "in %s:  %sB / %sB available\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
+#. The first %s is the location of the boot directory (determined from Dir::Boot)
+#: apt-private/private-install.cc
+#, c-format
+msgid ""
+"More space needed in %s than available: %sB > %sB, installation may fail"
+msgstr ""
+
+#: apt-private/private-install.cc
+#, c-format
+msgid "Space needed: %sB\n"
 msgstr ""
 
 #: apt-private/private-install.cc
@@ -1855,6 +1886,10 @@ msgid ""
 msgstr ""
 
 #: apt-private/private-install.cc
+msgid "Continue anyway?"
+msgstr ""
+
+#: apt-private/private-install.cc
 msgid "Continue?"
 msgstr ""
 
@@ -2133,7 +2168,7 @@ msgid "The following packages will be DOWNGRADED:"
 msgstr ""
 
 #: apt-private/private-output.cc
-msgid "Changing held packages:Changing held packages:"
+msgid "Changing held packages:"
 msgstr ""
 
 #: apt-private/private-output.cc
@@ -2152,17 +2187,17 @@ msgid ""
 msgstr ""
 
 #: apt-private/private-output.cc
-msgid "Summary:\n"
+msgid "Summary:"
 msgstr ""
 
 #: apt-private/private-output.cc
 #, c-format
-msgid "  Upgrading: %lu, Installing: %lu, "
+msgid "%lu upgraded, %lu newly installed, "
 msgstr ""
 
 #: apt-private/private-output.cc
 #, c-format
-msgid "%lu upgraded, %lu newly installed, "
+msgid "Upgrading: %lu, Installing: %lu, "
 msgstr ""
 
 #: apt-private/private-output.cc