From 5ae23bbe35e039d6543540412b293724390248af Mon Sep 17 00:00:00 2001
From: Bart Gravendeel <bgravendeel@proton.me>
Date: Sat, 3 Feb 2024 19:23:17 +0100
Subject: [PATCH] cleanup: GNOME HIG corrections (#351)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* cleanup: GNOME HIG corrections

* cleanup: Remove ...

* cleanup: Remove …
---
 recipe.json                                 | 8 ++++----
 vanilla_installer/defaults/conn_check.py    | 4 ++--
 vanilla_installer/gtk/default-conn-check.ui | 2 +-
 vanilla_installer/gtk/default-disk.ui       | 2 +-
 vanilla_installer/gtk/default-nvidia.ui     | 4 ++--
 vanilla_installer/gtk/default-vm.ui         | 4 ++--
 vanilla_installer/gtk/dialog-poweroff.ui    | 2 +-
 vanilla_installer/gtk/layout-yes-no.ui      | 2 +-
 vanilla_installer/gtk/progress.ui           | 4 ++--
 9 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/recipe.json b/recipe.json
index 7e981d4a..528f92c4 100644
--- a/recipe.json
+++ b/recipe.json
@@ -13,22 +13,22 @@
         "welcome": {
             "resource": "/org/vanillaos/Installer/assets/welcome.png",
             "title": "Installing Vanilla OS",
-            "description": "The process could take a few minutes, please be patient."
+            "description": "The process could take a few minutes, please be patient"
         },
         "control": {
             "resource": "/org/vanillaos/Installer/assets/ready.svg",
             "title": "Always Ready",
-            "description": "Don't be held back by your system, use it the way you want."
+            "description": "Don't be held back by your system, use it the way you want"
         },
         "containerized": {
             "resource": "/org/vanillaos/Installer/assets/containerized.svg",
             "title": "Containerized",
-            "description": "You never have to worry about breakage due to incompatible or conflicting packages."
+            "description": "You never have to worry about breakage due to incompatible or conflicting packages"
         },
         "completed": {
             "resource": "/org/vanillaos/Installer/assets/complete.svg",
             "title": "Complete and Reliable",
-            "description": "The largest software catalog at your fingertips."
+            "description": "The largest software catalog at your fingertips"
         }
     },
     "steps": {
diff --git a/vanilla_installer/defaults/conn_check.py b/vanilla_installer/defaults/conn_check.py
index 74e14fc6..0dbc4563 100644
--- a/vanilla_installer/defaults/conn_check.py
+++ b/vanilla_installer/defaults/conn_check.py
@@ -109,8 +109,8 @@ def callback(res, *args):
     def __on_btn_recheck_clicked(self, widget, *args):
         widget.set_visible(False)
         self.status_page.set_icon_name("content-loading-symbolic")
-        self.status_page.set_title(_("Checking Connection…"))
+        self.status_page.set_title(_("Checking Connection"))
         self.status_page.set_description(
-            _("Please wait until the connection check is done.")
+            _("Please wait until the connection check is done")
         )
         self.__conn_check()
diff --git a/vanilla_installer/gtk/default-conn-check.ui b/vanilla_installer/gtk/default-conn-check.ui
index cf33e4ee..b2df9bfc 100644
--- a/vanilla_installer/gtk/default-conn-check.ui
+++ b/vanilla_installer/gtk/default-conn-check.ui
@@ -9,7 +9,7 @@
         <child>
             <object class="AdwStatusPage" id="status_page">
                 <property name="icon-name">content-loading-symbolic</property>
-                <property name="title" translatable="yes">Checking Connection…</property>
+                <property name="title" translatable="yes">Checking Connection</property>
                 <property name="description" translatable="yes">Please wait until the connection check is done</property>
                 <child>
                     <object class="GtkButton" id="btn_recheck">
diff --git a/vanilla_installer/gtk/default-disk.ui b/vanilla_installer/gtk/default-disk.ui
index 2b6196b4..a329f0b0 100644
--- a/vanilla_installer/gtk/default-disk.ui
+++ b/vanilla_installer/gtk/default-disk.ui
@@ -83,7 +83,7 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="disk_space_err_label">
-                            <property name="label" translatable="yes">You need at least %s of disk space to proceed with the installation.</property>
+                            <property name="label" translatable="yes">You need at least %s of disk space to proceed with the installation</property>
                           </object>
                         </child>
                       </object>
diff --git a/vanilla_installer/gtk/default-nvidia.ui b/vanilla_installer/gtk/default-nvidia.ui
index 353a8481..98a1bcaf 100644
--- a/vanilla_installer/gtk/default-nvidia.ui
+++ b/vanilla_installer/gtk/default-nvidia.ui
@@ -12,7 +12,7 @@
         <property name="hexpand">true</property>
         <property name="icon-name">video-display-symbolic</property>
         <property name="title" translatable="yes">NVIDIA® Drivers</property>
-        <property name="description" translatable="yes">Choose whether to install proprietary NVIDIA drivers for better compatibility and performance.</property>
+        <property name="description" translatable="yes">Choose whether to install proprietary NVIDIA drivers for better compatibility and performance</property>
         <child>
           <object class="GtkBox">
             <property name="orientation">1</property>
@@ -35,7 +35,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="btn_yes">
-                    <property name="label" translatable="yes">Install  (Recommended)</property>
+                    <property name="label" translatable="yes">Install</property>
                     <property name="halign">3</property>
                     <style>
                       <class name="pill"/>
diff --git a/vanilla_installer/gtk/default-vm.ui b/vanilla_installer/gtk/default-vm.ui
index 096c0f10..669e0219 100644
--- a/vanilla_installer/gtk/default-vm.ui
+++ b/vanilla_installer/gtk/default-vm.ui
@@ -12,7 +12,7 @@
         <property name="hexpand">true</property>
         <property name="icon-name">video-display-symbolic</property>
         <property name="title" translatable="yes">VM Tools</property>
-        <property name="description" translatable="yes">Choose whether to install VM Tools for better compatibility and performance.</property>
+        <property name="description" translatable="yes">Choose whether to install VM Tools for better compatibility and performance</property>
         <child>
           <object class="GtkBox">
             <property name="orientation">1</property>
@@ -35,7 +35,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="btn_yes">
-                    <property name="label" translatable="yes">Install  (Recommended)</property>
+                    <property name="label" translatable="yes">Install</property>
                     <property name="halign">3</property>
                     <style>
                       <class name="pill"/>
diff --git a/vanilla_installer/gtk/dialog-poweroff.ui b/vanilla_installer/gtk/dialog-poweroff.ui
index 5ab7169e..2ec6b42c 100644
--- a/vanilla_installer/gtk/dialog-poweroff.ui
+++ b/vanilla_installer/gtk/dialog-poweroff.ui
@@ -55,7 +55,7 @@
                         <child>
                           <object class="AdwActionRow" id="row_firmware_setup">
                             <property name="icon-name">application-x-executable-symbolic</property>
-                            <property name="title" translatable="yes">Restart into Firmware Setup</property>
+                            <property name="title" translatable="yes">Restart Into Firmware Setup</property>
                             <property name="activatable">true</property>
                             <child type="suffix">
                               <object class="GtkImage">
diff --git a/vanilla_installer/gtk/layout-yes-no.ui b/vanilla_installer/gtk/layout-yes-no.ui
index a39cfdf1..83b0abd5 100644
--- a/vanilla_installer/gtk/layout-yes-no.ui
+++ b/vanilla_installer/gtk/layout-yes-no.ui
@@ -33,7 +33,7 @@
                             </child>
                             <child>
                                 <object class="GtkButton" id="btn_yes">
-                                <property name="label" translatable="yes">Yes, enable it</property>
+                                <property name="label" translatable="yes">Enable</property>
                                 <property name="halign">center</property>
                                 <style>
                                     <class name="pill" />
diff --git a/vanilla_installer/gtk/progress.ui b/vanilla_installer/gtk/progress.ui
index d83675d7..0b12a768 100644
--- a/vanilla_installer/gtk/progress.ui
+++ b/vanilla_installer/gtk/progress.ui
@@ -107,7 +107,7 @@
                         <property name="valign">center</property>
                         <property name="margin-top">40</property>
                         <property name="margin-start">40</property>
-                        <property name="label" translatable="yes">Installing...</property>
+                        <property name="label" translatable="yes">Installing</property>
                         <style>
                             <class name="title-4"/>
                         </style>
@@ -128,7 +128,7 @@
                         <property name="icon-name">media-view-subtitles-symbolic</property>
                         <property name="halign">end</property>
                         <property name="valign">center</property>
-                        <property name="tooltip-text" translatable="yes">Show Console output</property>
+                        <property name="tooltip-text" translatable="yes">Show Console Output</property>
                         <style>
                             <class name="circular" />
                         </style>