Merging upstream version 2.9.1.

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

1 files changed, 63 insertions, 18 deletions

diff --git a/po/ru.po b/po/ru.po
index 3123179..b6bd831 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 2.2.0\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: 2021-02-22 20:02+0300\n"
 "Last-Translator: Алексей Шилин <rootlexx@mail.ru>\n"
 "Language-Team: русский <debian-l10n-russian@lists.debian.org>\n"
@@ -1979,7 +1979,7 @@ msgstr "Странно. Несовпадение размеров, напиши�
 #: apt-private/private-install.cc
 #, fuzzy, c-format
 #| msgid "Downloading %s %s"
-msgid "  Download size: %sB/%sB\n"
+msgid "  Download size: %sB / %sB\n"
 msgstr "Выполняется загрузка %s %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
@@ -2003,19 +2003,49 @@ msgid "Need to get %sB of archives.\n"
 msgstr "Необходимо скачать %sB архивов.\n"
 
 #: apt-private/private-install.cc
-#, fuzzy, c-format
-#| msgid "  Installed: "
-msgid "  Installed size: %sB\n"
-msgstr "  Установлен: "
+#, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr ""
+"После данной операции объём занятого дискового пространства возрастёт на "
+"%sB.\n"
 
 #. 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 ""
-"После данной операции объём занятого дискового пространства возрастёт на "
-"%sB.\n"
 
 #: apt-private/private-install.cc
 #, fuzzy, c-format
@@ -2045,6 +2075,10 @@ msgid ""
 msgstr ""
 
 #: apt-private/private-install.cc
+msgid "Continue anyway?"
+msgstr ""
+
+#: apt-private/private-install.cc
 msgid "Continue?"
 msgstr ""
 
@@ -2353,9 +2387,9 @@ msgstr "Следующие пакеты будут заменены на СТА�
 
 #: apt-private/private-output.cc
 #, fuzzy
-#| msgid "The following held packages will be changed:"
-msgid "Changing held packages:Changing held packages:"
-msgstr "Следующие зафиксированные пакеты будут изменены:"
+#| msgid "Pinned packages:"
+msgid "Changing held packages:"
+msgstr "Привязанные пакеты:"
 
 #: apt-private/private-output.cc
 msgid "The following held packages will be changed:"
@@ -2375,12 +2409,7 @@ msgstr ""
 "НЕ ДЕЛАЙТЕ этого, если вы НЕ представляете себе все возможные последствия!"
 
 #: apt-private/private-output.cc
-msgid "Summary:\n"
-msgstr ""
-
-#: apt-private/private-output.cc
-#, c-format
-msgid "  Upgrading: %lu, Installing: %lu, "
+msgid "Summary:"
 msgstr ""
 
 #: apt-private/private-output.cc
@@ -2389,6 +2418,12 @@ msgid "%lu upgraded, %lu newly installed, "
 msgstr "Обновлено %lu пакетов, установлено %lu новых пакетов, "
 
 #: apt-private/private-output.cc
+#, fuzzy, c-format
+#| msgid "Installing %s"
+msgid "Upgrading: %lu, Installing: %lu, "
+msgstr "Устанавливается %s"
+
+#: apt-private/private-output.cc
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "переустановлено %lu пакетов, "
@@ -4104,6 +4139,16 @@ msgstr "Соединение закрыто преждевременно"
 msgid "Empty files can't be valid archives"
 msgstr "Пустые файлы не могут быть допустимыми архивами"
 
+#, fuzzy, c-format
+#~| msgid "  Installed: "
+#~ msgid "  Installed size: %sB\n"
+#~ msgstr "  Установлен: "
+
+#, fuzzy
+#~| msgid "The following held packages will be changed:"
+#~ msgid "Changing held packages:Changing held packages:"
+#~ msgstr "Следующие зафиксированные пакеты будут изменены:"
+
 #~ msgid "Yes, do as I say!"
 #~ msgstr "Да, делать, как я говорю!"