From 04aab49f34bb79af0e38d9224df9191575cffa24 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Sat, 25 May 2024 10:26:26 -0400 Subject: [PATCH] Improve wording in some labels --- apps/armoury/src/settingswindow.cpp | 19 ++++++++++--------- apps/karuku/src/mainwindow.cpp | 14 +++++++------- apps/sagasu/src/mainwindow.cpp | 15 ++++++++------- apps/sdklauncher/src/mainwindow.cpp | 2 +- 4 files changed, 26 insertions(+), 24 deletions(-) diff --git a/apps/armoury/src/settingswindow.cpp b/apps/armoury/src/settingswindow.cpp index fa41cde..8fabf5a 100644 --- a/apps/armoury/src/settingswindow.cpp +++ b/apps/armoury/src/settingswindow.cpp @@ -5,6 +5,7 @@ #include #include +#include #include #include #include @@ -14,12 +15,12 @@ SettingsWindow::SettingsWindow(QWidget *parent) : QWidget(parent) { - setWindowTitle(QStringLiteral("Settings")); + setWindowTitle(i18n("Settings")); auto layout = new QVBoxLayout(); setLayout(layout); - auto sourcesBox = new QGroupBox(QStringLiteral("Sources Output")); + auto sourcesBox = new QGroupBox(i18n("Sources Output")); layout->addWidget(sourcesBox); auto sourcesLayout = new QFormLayout(); @@ -46,9 +47,9 @@ SettingsWindow::SettingsWindow(QWidget *parent) }); sourcesBoxLayout->addWidget(selectSourceUrlButton); - sourcesLayout->addRow(QStringLiteral("Sources Directory"), sourcesBoxLayoutContainer); + sourcesLayout->addRow(i18n("Sources directory:"), sourcesBoxLayoutContainer); - auto penumbraBox = new QGroupBox(QStringLiteral("Penumbra Output")); + auto penumbraBox = new QGroupBox(i18n("Penumbra Output")); layout->addWidget(penumbraBox); auto penumbraLayout = new QFormLayout(); @@ -72,9 +73,9 @@ SettingsWindow::SettingsWindow(QWidget *parent) }); outputBoxLayout->addWidget(selectHomeUrlButton); - penumbraLayout->addRow(QStringLiteral("Output Directory"), outputBoxLayoutContainer); + penumbraLayout->addRow(i18n("Output directory:"), outputBoxLayoutContainer); - auto blenderBox = new QGroupBox(QStringLiteral("Blender")); + auto blenderBox = new QGroupBox(i18n("Blender")); layout->addWidget(blenderBox); auto blenderLayout = new QFormLayout(); @@ -98,17 +99,17 @@ SettingsWindow::SettingsWindow(QWidget *parent) }); blenderBoxLayout->addWidget(selectBlenderButton); - blenderLayout->addRow(QStringLiteral("Blender Path"), blenderBoxLayoutContainer); + blenderLayout->addRow(i18n("Blender path:"), blenderBoxLayoutContainer); auto bottomButtonLayout = new QHBoxLayout(); layout->addLayout(bottomButtonLayout); - auto cancelButton = new QPushButton(QIcon::fromTheme(QStringLiteral("dialog-close")), QStringLiteral("Cancel")); + auto cancelButton = new QPushButton(QIcon::fromTheme(QStringLiteral("dialog-close")), i18n("Cancel")); connect(cancelButton, &QPushButton::clicked, this, &QWidget::close); bottomButtonLayout->addWidget(cancelButton); bottomButtonLayout->addStretch(1); - auto saveButton = new QPushButton(QIcon::fromTheme(QStringLiteral("dialog-ok")), QStringLiteral("Apply")); + auto saveButton = new QPushButton(QIcon::fromTheme(QStringLiteral("dialog-ok")), i18n("Apply")); connect(saveButton, &QPushButton::clicked, this, [this] { applySettings(); close(); diff --git a/apps/karuku/src/mainwindow.cpp b/apps/karuku/src/mainwindow.cpp index 7eced1d..9934f42 100644 --- a/apps/karuku/src/mainwindow.cpp +++ b/apps/karuku/src/mainwindow.cpp @@ -104,13 +104,13 @@ void MainWindow::setupFileMenu(QMenu *menu) auto downloadList = menu->addAction(i18nc("@action:inmenu", "Download Definitions…")); downloadList->setIcon(QIcon::fromTheme(QStringLiteral("download-symbolic"))); connect(downloadList, &QAction::triggered, [this] { - const int ret = - QMessageBox::information(this, - i18nc("@title:window", "Download Confirmation"), - i18n("This will download the definitions from the SaintCoinach repository on GitHub.

Continue?"), - QMessageBox::Ok | QMessageBox::Cancel, - QMessageBox::Ok); + const int ret = QMessageBox::information( + this, + i18nc("@title:window", "Download Confirmation"), + i18n("Novus will download the definitions from the SaintCoinach repository on GitHub.

Would you still like to continue?"), + QMessageBox::Ok | QMessageBox::Cancel, + QMessageBox::Ok); if (ret != QMessageBox::Ok) { return; diff --git a/apps/sagasu/src/mainwindow.cpp b/apps/sagasu/src/mainwindow.cpp index 69a2b79..14a8471 100644 --- a/apps/sagasu/src/mainwindow.cpp +++ b/apps/sagasu/src/mainwindow.cpp @@ -178,13 +178,14 @@ void MainWindow::setupFileMenu(QMenu *menu) auto downloadList = menu->addAction(i18nc("@action:inmenu", "Download Path List…")); downloadList->setIcon(QIcon::fromTheme(QStringLiteral("download-symbolic"))); connect(downloadList, &QAction::triggered, [this] { - const int ret = QMessageBox::information(this, - i18nc("@title:window", "Download Confirmation"), - i18n("This will download the path list from ResLogger.this process usually takes a few minutes. The program " - "may freeze. Please keep it open until the operation is finished.

Continue?"), - QMessageBox::Ok | QMessageBox::Cancel, - QMessageBox::Ok); + const int ret = + QMessageBox::information(this, + i18nc("@title:window", "Download Confirmation"), + i18n("Novus will download the path list from ResLogger.this process usually takes a few minutes. The program " + "may freeze. Please keep it open until the operation is finished.

Would you still like to continue?"), + QMessageBox::Ok | QMessageBox::Cancel, + QMessageBox::Ok); if (ret != QMessageBox::Ok) { return; diff --git a/apps/sdklauncher/src/mainwindow.cpp b/apps/sdklauncher/src/mainwindow.cpp index a59899a..364c7ec 100644 --- a/apps/sdklauncher/src/mainwindow.cpp +++ b/apps/sdklauncher/src/mainwindow.cpp @@ -92,7 +92,7 @@ MainWindow::MainWindow() auto gameCombo = new QComboBox(); gameCombo->setMaximumWidth(175); - formLayout->addRow(i18n("Current Game"), gameCombo); + formLayout->addRow(i18n("Current game"), gameCombo); formLayout->setFieldGrowthPolicy(QFormLayout::FieldsStayAtSizeHint); gameCombo->addItem(game.readEntry("GameDir"));