Merge ~anthonywong/ubuntu/+source/update-manager:i18n-2 into ubuntu/+source/update-manager:ubuntu/devel

[Anthony Wong]

Resubmit against main branch

The "out of disk space" error message could be hard to be localized since parameters can't be reordered.

[Todd (todstephens80)]

I see since parameters can't be reordered.

[Todd (todstephens80)]

since parameters can't be reordered.

review: Approve

[Julian Andres Klode (juliank)]

Please resubmit against https://code.launchpad.net/~ubuntu-core-dev/update-manager/+git/update-manager/+ref/main if this is still an issue so it can be queued with changes for a later release.

review: Needs Resubmitting

Unmerged commits

5354369... by Anthony Wong on 2023-08-02

Better i18n for the "out of disk space" error message.

Signed-off-by: Anthony Wong <email address hidden>

30b96e6... by Brian Murray on 2023-06-09

releasing package update-manager version 1:23.10.1

cf5425f... by Brian Murray on 2023-06-09

When displaying updates also include the quantity of updates in each group. Thanks to Robert Ancell for the patch.

6a3278c... by Brian Murray on 2023-06-09

Cherry pick a patch to show a count of updates

This was in a bzr merge proposal from Robert Ancell

65932d5... by Benjamin Drung on 2023-04-13

Release update-manager 1:23.04.2

Signed-off-by: Benjamin Drung <email address hidden>

a99745d... by Benjamin Drung on 2023-04-13

Run nosetests in verbose mode

Signed-off-by: Benjamin Drung <email address hidden>

7d7dfde... by Grant Orndorff on 2023-04-06

pro: fix field name of package name

faa233e... by Grant Orndorff on 2023-04-06

pro: fallback to no pro updates if pro api errors

LP: #2015113
LP: #2015286

7c8c983... by Benjamin Drung on 2023-04-13

Update Vcs-* links to git

Signed-off-by: Benjamin Drung <email address hidden>

921b9c0... by Benjamin Drung on 2023-02-13

Release update-manager 1:23.04.1

diff --git a/.bzrignore b/.bzrignore
new file mode 100644
index 0000000..981119f
--- /dev/null
+++ b/.bzrignore
@@ -0,0 +1,11 @@
+__pycache__
+debian/*.debhelper*
+debian/*.substvars
+debian/files
+debian/python-update-manager
+debian/python3-update-manager
+debian/tmp
+debian/update-manager
+debian/update-manager-core
+debian/update-manager-kde
+debian/update-manager-text
diff --git a/UpdateManager/UpdatesAvailable.py b/UpdateManager/UpdatesAvailable.py
index e081e1f..1bc15be 100644
--- a/UpdateManager/UpdatesAvailable.py
+++ b/UpdateManager/UpdatesAvailable.py
@@ -897,8 +897,13 @@ class UpdatesAvailable(InternalDialog):
         # print("on_button_install_clicked")
         err_sum = _("Not enough free disk space")
         err_msg = _(
+<<<<<<< UpdateManager/UpdatesAvailable.py
             "The upgrade needs a total of %s free space on disk '%s'. "
             "Please free at least an additional %s of disk space on '%s'. %s"
+=======
+            "The upgrade needs a total of %(size_total)s free space on disk '%(dir)s'. "
+            "Please free at least an additional %(size_needed)s of disk space on '%(dir)s'. %(remedy)s"
+>>>>>>> UpdateManager/UpdatesAvailable.py
         )
         # specific ways to resolve lack of free space
         remedy_archivedir = _(
@@ -927,6 +932,7 @@ class UpdatesAvailable(InternalDialog):
                 if err_long != "":
                     err_long += " "
                 if req.dir == archivedir:
+<<<<<<< UpdateManager/UpdatesAvailable.py
                     err_long += err_msg % (
                         req.size_total,
                         req.dir,
@@ -966,6 +972,42 @@ class UpdatesAvailable(InternalDialog):
                         req.dir,
                         remedy_usr,
                     )
+=======
+                    err_long += err_msg % {
+                        "size_total": req.size_total,
+                        "dir": req.dir,
+                        "size_needed": req.size_needed,
+                        "remedy": remedy_archivedir,
+                    }
+                elif req.dir == "/boot":
+                    err_long += err_msg % {
+                        "size_total": req.size_total,
+                        "dir": req.dir,
+                        "size_needed": req.size_needed,
+                        "remedy": remedy_boot,
+                    }
+                elif req.dir == "/":
+                    err_long += err_msg % {
+                        "size_total": req.size_total,
+                        "dir": req.dir,
+                        "size_needed": req.size_needed,
+                        "remedy": remedy_root,
+                    }
+                elif req.dir == "/tmp":
+                    err_long += err_msg % {
+                        "size_total": req.size_total,
+                        "dir": req.dir,
+                        "size_needed": req.size_needed,
+                        "remedy": remedy_tmp,
+                    }
+                elif req.dir == "/usr":
+                    err_long += err_msg % {
+                        "size_total": req.size_total,
+                        "dir": req.dir,
+                        "size_needed": req.size_needed,
+                        "remedy": remedy_usr,
+                    }
+>>>>>>> UpdateManager/UpdatesAvailable.py
             self.window_main.start_error(False, err_sum, err_long)
             return
         except SystemError:
diff --git a/po/update-manager.pot b/po/update-manager.pot
index a3d5c06..5c02c2a 100644
--- a/po/update-manager.pot
+++ b/po/update-manager.pot
@@ -336,11 +336,20 @@ msgstr ""
 msgid "Not enough free disk space"
 msgstr ""
 
+<<<<<<< po/update-manager.pot
 #: ../UpdateManager/UpdatesAvailable.py:831
 #, python-format
 msgid ""
 "The upgrade needs a total of %s free space on disk '%s'. Please free at "
 "least an additional %s of disk space on '%s'. %s"
+=======
+#: ../UpdateManager/UpdatesAvailable.py:900
+#, python-format
+msgid ""
++"The upgrade needs a total of %(size_total)s free space on disk '%(dir)s'. "
++"Please free at least an additional %(size_needed)s of disk space on "
++"'%(dir)s'. %(remedy)s"
+>>>>>>> po/update-manager.pot
 msgstr ""
 
 #. specific ways to resolve lack of free space