From d466e53e5d710dec93fb78ce7209383373a76ef6 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 21 Jan 2016 16:21:58 +0200 Subject: [PATCH] Fixed typos. (grafted from 5212bd0c72b44da2d16dab9e1592c2843ab0ff1e) --HG-- branch : develop --- src/app/valentina/core/vcmdexport.cpp | 11 ++++++----- .../dialogs/configpages/configurationpage.cpp | 7 ++++--- .../valentina/dialogs/dialoglayoutsettings.ui | 8 ++++---- .../valentina/dialogs/dialogpatternxmledit.ui | 2 +- src/app/valentina/mainwindow.cpp | 2 +- src/app/valentina/mainwindow.ui | 18 +++++++++--------- src/libs/vtools/dialogs/support/dialogundo.ui | 2 +- 7 files changed, 26 insertions(+), 24 deletions(-) diff --git a/src/app/valentina/core/vcmdexport.cpp b/src/app/valentina/core/vcmdexport.cpp index da12f76a9..5678d0210 100644 --- a/src/app/valentina/core/vcmdexport.cpp +++ b/src/app/valentina/core/vcmdexport.cpp @@ -224,10 +224,10 @@ void VCommandLine::InitOptions(VCommandLineOptions &options, QMap optionsIndex.insert(LONG_OPTION_SHIFTLENGTH, index++); options.append(new QCommandLineOption(QStringList() << SINGLE_OPTION_SHIFTLENGTH << LONG_OPTION_SHIFTLENGTH, - translate("VCommandLine", "Shift layout length measured in layout units " - "(export mode). The option show how many points along edge will " - "be used in creating a layout."), - translate("VCommandLine", "Shift length"))); + translate("VCommandLine", "Shift/Offset layout length measured in layout " + "units (export mode). The option show how many points along edge " + "will be used in creating a layout."), + translate("VCommandLine", "Shift/Offset length"))); optionsIndex.insert(LONG_OPTION_GAPWIDTH, index++); options.append(new QCommandLineOption(QStringList() << SINGLE_OPTION_GAPWIDTH << LONG_OPTION_GAPWIDTH, @@ -288,7 +288,8 @@ VLayoutGeneratorPtr VCommandLine::DefaultGenerator() const if ((a || b) && !(a && b)) { - qCritical() << translate("VCommandLine", "Shift length must be used together with shift units.") << "\n"; + qCritical() << translate("VCommandLine", "Shift/Offset length must be used together with shift units.") + << "\n"; const_cast(this)->parser.showHelp(V_EX_USAGE); } } diff --git a/src/app/valentina/dialogs/configpages/configurationpage.cpp b/src/app/valentina/dialogs/configpages/configurationpage.cpp index 3291ad4be..528406837 100644 --- a/src/app/valentina/dialogs/configpages/configurationpage.cpp +++ b/src/app/valentina/dialogs/configpages/configurationpage.cpp @@ -131,7 +131,8 @@ void ConfigurationPage::Apply() const QString unit = qvariant_cast(this->unitCombo->itemData(this->unitCombo->currentIndex())); settings->SetUnit(unit); this->unitChanged = false; - const QString text = tr("Default unit updated and will be used the next pattern creation"); + const QString text = tr("The Default unit has been updated and will be used as the default for the next " + "pattern you create."); QMessageBox::information(this, QApplication::applicationName(), text); } if (labelLangChanged) @@ -333,7 +334,7 @@ QGroupBox *ConfigurationPage::SendGroup() sendReportCheck = new QCheckBox(tr("Send crash reports (recommended)")); sendReportCheck->setChecked(qApp->ValentinaSettings()->GetSendReportState()); - description = new QLabel(tr("After each crash Valentina collect information that may help us fix a " + description = new QLabel(tr("After each crash Valentina collects information that may help us fix the " "problem. We do not collect any personal information. Find more about what " "kind of information we collect.")); @@ -475,7 +476,7 @@ void ConfigurationPage::RetranslateUi() sendGroup->setTitle(tr("Send crash reports")); sendReportCheck->setText(tr("Send crash reports (recommended)")); - description->setText(tr("After each crash Valentina collect information that may help us fix a " + description->setText(tr("After each crash Valentina collects information that may help us fix the " "problem. We do not collect any personal information. Find more about what " "kind of information we collect.")); diff --git a/src/app/valentina/dialogs/dialoglayoutsettings.ui b/src/app/valentina/dialogs/dialoglayoutsettings.ui index de49355c0..77001fb39 100644 --- a/src/app/valentina/dialogs/dialoglayoutsettings.ui +++ b/src/app/valentina/dialogs/dialoglayoutsettings.ui @@ -281,7 +281,7 @@ - Creation options + Layout options @@ -315,7 +315,7 @@ - Shift length: + Shift/Offset length: @@ -520,7 +520,7 @@ - Principle of choosing the next workpiece + Rule for choosing the next workpiece @@ -642,7 +642,7 @@ - + diff --git a/src/app/valentina/dialogs/dialogpatternxmledit.ui b/src/app/valentina/dialogs/dialogpatternxmledit.ui index eb574c357..9825c1292 100644 --- a/src/app/valentina/dialogs/dialogpatternxmledit.ui +++ b/src/app/valentina/dialogs/dialogpatternxmledit.ui @@ -294,7 +294,7 @@ - Immediate apply + Immediately apply false diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index 16d93c15d..2c94b4cd7 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -3332,7 +3332,7 @@ void MainWindow::CreateActions() connect(ui->actionAbout_Valentina, &QAction::triggered, this, &MainWindow::About); connect(ui->actionExit, &QAction::triggered, this, &MainWindow::close); connect(ui->actionPreferences, &QAction::triggered, this, &MainWindow::Preferences); - connect(ui->actionRepotBug, &QAction::triggered, this, &MainWindow::RepotBug); + connect(ui->actionReportBug, &QAction::triggered, this, &MainWindow::RepotBug); connect(ui->actionOnlineHelp, &QAction::triggered, this, &MainWindow::OnlineHelp); connect(ui->actionLast_tool, &QAction::triggered, this, &MainWindow::LastUsedTool); connect(ui->actionPattern_properties, &QAction::triggered, this, &MainWindow::PatternProperties); diff --git a/src/app/valentina/mainwindow.ui b/src/app/valentina/mainwindow.ui index 2c5dd7692..60cc169c3 100644 --- a/src/app/valentina/mainwindow.ui +++ b/src/app/valentina/mainwindow.ui @@ -375,7 +375,7 @@ 0 0 - 130 + 100 58 @@ -461,7 +461,7 @@ 0 0 - 130 + 100 156 @@ -625,7 +625,7 @@ 0 0 - 130 + 100 196 @@ -867,7 +867,7 @@ 0 0 - 130 + 100 58 @@ -953,8 +953,8 @@ 0 0 - 130 - 386 + 98 + 58 @@ -1066,7 +1066,7 @@ &Help - + @@ -1800,9 +1800,9 @@ - + - Repot Bug... + Report Bug... Report bug diff --git a/src/libs/vtools/dialogs/support/dialogundo.ui b/src/libs/vtools/dialogs/support/dialogundo.ui index e893e1ffc..575887078 100644 --- a/src/libs/vtools/dialogs/support/dialogundo.ui +++ b/src/libs/vtools/dialogs/support/dialogundo.ui @@ -29,7 +29,7 @@ - Error while calculation formula. You can try undo last operation or fix broken formula. + Error while calculation formula. You can try to undo last operation or fix broken formula. true