Merge pull request #1909 from ogayot/mantic-merge-2024-02-12

Mantic merge 2024 02 12
canonical · Feb 13, 2024 · f07e5ae · f07e5ae
2 parents 2336e5e + ae19f73
commit f07e5ae
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/subiquity/client/controllers/filesystem.py b/subiquity/client/controllers/filesystem.py
@@ -216,7 +216,7 @@ async def _answers_action(self, action):
                 return
             if isinstance(body.stretchy, ConfirmDeleteStretchy):
                 if action.get("submit", True):
-                    body.stretchy.done()
+                    body.stretchy.confirm()
             else:
                 async for _ in self._enter_form_data(
                     body.stretchy.form, action["data"], action.get("submit", True)

diff --git a/subiquity/ui/views/identity.py b/subiquity/ui/views/identity.py
@@ -181,7 +181,7 @@ class IdentityView(BaseView):
     title = _("Profile setup")
     excerpt = _(
         "Enter the username and password you will use to log in to "
-        "the system. You can configure SSH access on the next screen "
+        "the system. You can configure SSH access on a later screen "
         "but a password is still needed for sudo."
     )
 

diff --git a/subiquity/ui/views/mirror.py b/subiquity/ui/views/mirror.py
@@ -82,7 +82,7 @@ def validate_url(self):
     (False, None): _(
         "The mirror location cannot be checked because no network has been configured."
     ),
-    (True, None): _("The mirror location has not yet started."),
+    (True, None): _("Testing of the mirror location has not yet started."),
     (True, MirrorCheckStatus.RUNNING): _("The mirror location is being tested."),
     (True, MirrorCheckStatus.OK): _("This mirror location passed tests."),
     (True, MirrorCheckStatus.FAILED): _(

diff --git a/subiquity/ui/views/ubuntu_pro.py b/subiquity/ui/views/ubuntu_pro.py
@@ -222,7 +222,7 @@ class UpgradeYesNoFormNoNetwork(UpgradeYesNoForm):
         help="\n"
         + _(
             "Once you are connected to the Internet, you can"
-            " enable Ubuntu Po via the 'pro attach' command."
+            " enable Ubuntu Pro via the 'pro attach' command."
         ),
     )
 
@@ -779,7 +779,7 @@ class AboutProWidget(Stretchy):
     |   • ...                                                 |
     |   • ...                                                 |
     |                                                         |
-    | Ubuntu Pro is free for personal use on up to 3 machines.|
+    | Ubuntu Pro is free for personal use on up to 5 machines.|
     | More information is at ubuntu.com/pro                   |
     |                                                         |
     |                       [ Continue ]                      |
@@ -832,7 +832,7 @@ def itemize(item: str, marker: str = "•") -> Columns:
             Text(""),
             Pile([itemize(svc, marker="  •") for svc in services]),
             Text(""),
-            Text(_("Ubuntu Pro is free for personal use on up to 3 machines.")),
+            Text(_("Ubuntu Pro is free for personal use on up to 5 machines.")),
             Text(_("More information is at ubuntu.com/pro")),
             Text(""),
             button_pile([ok]),
@@ -851,7 +851,7 @@ class HowToRegisterWidget(Stretchy):
     |                                                         |
     |_Create your Ubuntu One account with your email. Each    |
     | Ubuntu One account gets a free personal Ubuntu Pro      |
-    | subscription for up to three machines, including        |
+    | subscription for up to five machines, including         |
     | laptops, servers or cloud virtual machines.             |
     |                                                         |
     | Visit ubuntu.com/pro to get started.                    |
@@ -870,7 +870,7 @@ def __init__(self, parent: UbuntuProView) -> None:
         header = _(
             "Create your Ubuntu One account with your email. Each"
             " Ubuntu One account gets a free personal Ubuntu Pro"
-            " subscription for up to three machines, including"
+            " subscription for up to five machines, including"
             " laptops, servers or cloud virtual machines."
         )