Qt UI: Change keycodes and labels per discussion with @djt

3 files changed, 16 insertions, 17 deletions

diff --git a/ui/qt5/horizonwizard.cc b/ui/qt5/horizonwizard.cc
index 59bef95..2b58e43 100644
--- a/ui/qt5/horizonwizard.cc
+++ b/ui/qt5/horizonwizard.cc
@@ -175,11 +175,11 @@ HorizonWizard::HorizonWizard(QWidget *parent) : QWizard(parent) {
     QObject::connect(button(CancelButton), &QAbstractButton::clicked,
                      [=](bool) {
         QMessageBox cancel(QMessageBox::Question,
-                           tr("Cancel Adélie Linux System Installation"),
+                           tr("Exit Adélie Linux System Installation"),
                    #ifdef HAS_INSTALL_ENV
-                           tr("Adélie Linux has not yet been set up on your computer.  Cancellation will reboot your computer.  Do you wish to cancel?"),
+                           tr("Adélie Linux has not yet been set up on your computer.  Exiting will reboot your computer.  Do you wish to exit?"),
                    #else
-                           tr("You have not yet completed the System Installation wizard.  No installfile will be generated.  Do you wish to cancel?"),
+                           tr("You have not yet completed the System Installation wizard.  No installfile will be generated.  Do you wish to exit?"),
                    #endif
                            QMessageBox::Yes | QMessageBox::No,
                            this);
@@ -191,9 +191,9 @@ HorizonWizard::HorizonWizard(QWidget *parent) : QWizard(parent) {
 
     /* REQ: Iface.UI.ButtonAccel */
     setButtonText(HelpButton, tr("&Help (F1)"));
-    setButtonText(CancelButton, tr("&Cancel (F3)"));
-    setButtonText(BackButton, tr("< &Back (F5)"));
-    setButtonText(NextButton, tr("&Next > (F8)"));
+    setButtonText(CancelButton, tr("E&xit (F3)"));
+    setButtonText(BackButton, tr("< &Back (F6)"));
+    setButtonText(NextButton, tr("Co&ntinue > (F8)"));
 
     f1 = new QShortcut(Qt::Key_F1, this);
     connect(f1, &QShortcut::activated,
@@ -203,9 +203,9 @@ HorizonWizard::HorizonWizard(QWidget *parent) : QWizard(parent) {
     f3 = new QShortcut(Qt::Key_F3, this);
     connect(f3, &QShortcut::activated,
             button(CancelButton), &QAbstractButton::click);
-    f3->setWhatsThis(tr("Prompts to cancel the installation."));
+    f3->setWhatsThis(tr("Prompts to exit the installation."));
 
-    f5 = new QShortcut(Qt::Key_F5, this);
+    f5 = new QShortcut(Qt::Key_F6, this);
     connect(f5, &QShortcut::activated,
             button(BackButton), &QAbstractButton::click);
     f5->setWhatsThis(tr("Goes back to the previous page."));
diff --git a/ui/qt5/intropage.cc b/ui/qt5/intropage.cc
index 20992c9..57b6dc5 100644
--- a/ui/qt5/intropage.cc
+++ b/ui/qt5/intropage.cc
@@ -58,15 +58,14 @@ IntroPage::IntroPage(QWidget *parent) : HorizonWizardPage(parent) {
     toolButton->setMenu(toolMenu);
 
     descLabel = new QLabel(
-                tr("Thank you for choosing the Adélie Linux operating system.  "
-                   "This installation process will only take about 10-15 minutes of your time.  "
-                   "When you're done, your computer will be up and running with the reliable, secure, libre Adélie Linux.\n\n"
+                tr("Thank you for choosing the reliable, secure, libre Adélie Linux operating system.  "
+                   "This installation process will take about 10-15 minutes.\n\n"
 
-                   "When you're ready to answer a few questions, you can get started by choosing Next or pressing F8.  "
+                   "When you're ready to answer a few questions, you can get started by choosing Continue or pressing F8.  "
                    "If you'd like more information about the installation procedure, choose Help or press F1 at any time.\n\n"
 
                    "The installation procedure will not change anything on your computer until the final step.  "
-                   "You can safely cancel at any time, with no change to your computer, by choosing Cancel or pressing F3.\n\n"
+                   "You can safely exit at any time, with no change to your computer, by choosing Exit or pressing F3.\n\n"
 
                    "If you are unable to use a mouse, you may press the Tab key to cycle between the available inputs.  "
                    "The currently selected input will be highlighted."));
diff --git a/ui/qt5/resources/intro-help.txt b/ui/qt5/resources/intro-help.txt
index 5908db9..df6ffd5 100644
--- a/ui/qt5/resources/intro-help.txt
+++ b/ui/qt5/resources/intro-help.txt
@@ -16,17 +16,17 @@ accessible via the 'Help' button in the lower left corner of the screen.</p>
 <p>The Installation System is divided in a series of <i>pages</i>, similar in
 concept to a paper form.</p>
 
-<p>When you are finishing filling in the information on one page, you may go
-to the next one by choosing Next or pressing the F8 key.</p>
+<p>When you are finishing filling in the information on one page, you may
+continue to the next page by choosing Continue or pressing the F8 key.</p>
 
 <p>If you want to go back and review or change information on a previous page,
-you may go back by choosing Back or pressing the F5 key.</p>
+you may go back by choosing Back or pressing the F6 key.</p>
 
 <p>If you need more information about an option provided, you may open the
 Help screen by choosing Help or pressing the F1 key.</p>
 
 <p>If you have decided not to complete the installation procedure at this
-time, you may stop at any time by choosing Cancel or pressing the F3 key.</p>
+time, you may stop at any time by choosing Exit or pressing the F3 key.</p>
 
 
 <hr>