From 2402bfaf9e5abf8d329dec00f38f2e81e4bfba64 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 28 Mar 2022 17:40:44 +0300 Subject: [PATCH] Fix typos. --- .../puzzle/undocommands/vpundopiecezvaluemove.cpp | 12 ++++++------ src/app/puzzle/vpapplication.cpp | 4 ++-- src/app/puzzle/vpcommandline.cpp | 2 +- src/app/tape/mapplication.cpp | 2 +- src/app/tape/tmainwindow.cpp | 14 +++++++------- src/app/valentina/core/vcmdexport.cpp | 2 +- src/app/valentina/xml/vpattern.cpp | 4 ++-- src/libs/ifc/xml/vabstractconverter.cpp | 2 +- src/libs/ifc/xml/vbackgroundpatternimage.cpp | 2 +- src/libs/ifc/xml/vpatternimage.cpp | 2 +- src/libs/vlayout/dialogs/watermarkwindow.cpp | 2 +- src/libs/vlayout/vbank.cpp | 6 +++--- src/libs/vlayout/vlayoutexporter.cpp | 2 +- .../image/zvaluemovebackgroundimage.cpp | 6 +++--- src/libs/vwidgets/vabstractmainwindow.cpp | 2 +- 15 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/app/puzzle/undocommands/vpundopiecezvaluemove.cpp b/src/app/puzzle/undocommands/vpundopiecezvaluemove.cpp index 1d6ca0a84..d3c423522 100644 --- a/src/app/puzzle/undocommands/vpundopiecezvaluemove.cpp +++ b/src/app/puzzle/undocommands/vpundopiecezvaluemove.cpp @@ -244,9 +244,9 @@ auto VPUndoPieceZValueMove::Levels(const QList &pieces, bool skip) c if (levels.contains(p->ZValue())) { - QVector lavel_images = levels.value(p->ZValue()); - lavel_images.append(p->GetUniqueID()); - levels[p->ZValue()] = lavel_images; + QVector level_images = levels.value(p->ZValue()); + level_images.append(p->GetUniqueID()); + levels[p->ZValue()] = level_images; } else { @@ -487,9 +487,9 @@ auto VPUndoPiecesZValueMove::Levels(const QList &allPieces, const QV if (levels.contains(p->ZValue())) { - QVector lavel_images = levels.value(p->ZValue()); - lavel_images.append(p->GetUniqueID()); - levels[p->ZValue()] = lavel_images; + QVector level_images = levels.value(p->ZValue()); + level_images.append(p->GetUniqueID()); + levels[p->ZValue()] = level_images; } else { diff --git a/src/app/puzzle/vpapplication.cpp b/src/app/puzzle/vpapplication.cpp index cd90f96fb..76165c3d0 100644 --- a/src/app/puzzle/vpapplication.cpp +++ b/src/app/puzzle/vpapplication.cpp @@ -511,14 +511,14 @@ void VPApplication::ProcessArguments(const VPCommandLinePtr &cmd) { if (not cmd->IsGuiEnabled() && args.count() > 1) { - qCCritical(pApp, "%s\n", qPrintable(tr("Export mode doesn't support openning several files."))); + qCCritical(pApp, "%s\n", qPrintable(tr("Export mode doesn't support opening several files."))); cmd.get()->parser.showHelp(V_EX_USAGE); } if (args.count() > 1 && not rawLayouts.isEmpty()) { qCCritical(pApp, "%s\n", - qPrintable(tr("Import raw layout data does not support openning several layout files."))); + qPrintable(tr("Import raw layout data does not support opening several layout files."))); cmd.get()->parser.showHelp(V_EX_USAGE); } diff --git a/src/app/puzzle/vpcommandline.cpp b/src/app/puzzle/vpcommandline.cpp index 29d2713f9..95d530af1 100644 --- a/src/app/puzzle/vpcommandline.cpp +++ b/src/app/puzzle/vpcommandline.cpp @@ -144,7 +144,7 @@ void VPCommandLine::InitCommandLineOptions() translate("VCommandLine", "The filename of exported layout file. Use it to enable console export mode."), translate("VCommandLine", "The filename of layout file")}, {{SINGLE_OPTION_RAW_LAYOUT, LONG_OPTION_RAW_LAYOUT}, - translate("VCommandLine", "Load pattern pieces form the raw layout data file."), + translate("VCommandLine", "Load pattern pieces from the raw layout data file."), translate("VCommandLine", "The raw layout data file")}, {{SINGLE_OPTION_EXP2FORMAT, LONG_OPTION_EXP2FORMAT}, translate("VCommandLine", "Number corresponding to output format (default = 0, export mode): "), diff --git a/src/app/tape/mapplication.cpp b/src/app/tape/mapplication.cpp index 5fdf9e0d4..b8b68c739 100644 --- a/src/app/tape/mapplication.cpp +++ b/src/app/tape/mapplication.cpp @@ -705,7 +705,7 @@ void MApplication::ParseCommandLine(const SocketConnection &connection, const QS { if (testMode && args.count() > 1) { - qCCritical(mApp, "%s\n", qPrintable(tr("Test mode doesn't support openning several files."))); + qCCritical(mApp, "%s\n", qPrintable(tr("Test mode doesn't support opening several files."))); parser.showHelp(V_EX_USAGE); } diff --git a/src/app/tape/tmainwindow.cpp b/src/app/tape/tmainwindow.cpp index 32c81ac6f..16c2b0a63 100644 --- a/src/app/tape/tmainwindow.cpp +++ b/src/app/tape/tmainwindow.cpp @@ -3834,7 +3834,7 @@ QString TMainWindow::CheckMName(const QString &name, const QSet &import { if (name.isEmpty()) { - throw VException(tr("Measurement name in is empty.")); + throw VException(tr("Measurement name is empty.")); } if (importedNames.contains(name)) @@ -3847,24 +3847,24 @@ QString TMainWindow::CheckMName(const QString &name, const QSet &import QRegularExpression rx(NameRegExp()); if (not rx.match(name).hasMatch()) { - throw VException(tr("Merasurement '%1' doesn't match regex pattern.").arg(name)); + throw VException(tr("Measurement '%1' doesn't match regex pattern.").arg(name)); } if (not data->IsUnique(name)) { - throw VException(tr("Merasurement '%1' already used in file.").arg(name)); + throw VException(tr("Measurement '%1' already used in the file.").arg(name)); } } else { if (not ConvertToSet(AllGroupNames()).contains(name)) { - throw VException(tr("Measurement '%1' is not one of known measurements.").arg(name)); + throw VException(tr("Measurement '%1' is not one of the known measurements.").arg(name)); } if (not data->IsUnique(name)) { - throw VException(tr("Merasurement '%1' already used in file.").arg(name)); + throw VException(tr("Measurement '%1' already used in file.").arg(name)); } } @@ -3933,7 +3933,7 @@ void TMainWindow::ImportIndividualMeasurements(const QxtCsvModel &csv, const QVe const QString name = csv.text(i, nameColumn).simplified(); if (name.isEmpty()) { - ShowError(tr("Error in row %1. Measurement name is empty.").arg(i)); + ShowError(tr("Error in row %1. The measurement name is empty.").arg(i)); continue; } @@ -4049,7 +4049,7 @@ void TMainWindow::ImportMultisizeMeasurements(const QxtCsvModel &csv, const QVec const QString name = csv.text(i, nameColumn).simplified(); if (name.isEmpty()) { - ShowError(tr("Error in row %1. Measurement name is empty.").arg(i)); + ShowError(tr("Error in row %1. The measurement name is empty.").arg(i)); continue; } diff --git a/src/app/valentina/core/vcmdexport.cpp b/src/app/valentina/core/vcmdexport.cpp index 7b44b89d8..b33968238 100644 --- a/src/app/valentina/core/vcmdexport.cpp +++ b/src/app/valentina/core/vcmdexport.cpp @@ -781,7 +781,7 @@ void VCommandLine::InitCommandLineOptions() translate("VCommandLine", "The measure unit")}, {{SINGLE_OPTION_IGNORE_MARGINS, LONG_OPTION_IGNORE_MARGINS}, translate("VCommandLine", "Ignore printer margins (export mode). Use if need full paper space. In case of " - "later printing you must account for the margins himself.")}, + "later printing you must account for the margins themselves.")}, {{SINGLE_OPTION_LEFT_MARGIN, LONG_OPTION_LEFT_MARGIN}, translate("VCommandLine", "Page left margin in current units like 3.0 (export mode). If not set will be used " "value from default printer. Or 0 if none printers was found."), diff --git a/src/app/valentina/xml/vpattern.cpp b/src/app/valentina/xml/vpattern.cpp index 95e9549c1..86fc32930 100644 --- a/src/app/valentina/xml/vpattern.cpp +++ b/src/app/valentina/xml/vpattern.cpp @@ -1973,13 +1973,13 @@ void VPattern::ParsePlaceLabel(QDomElement &domElement, const Document &parse) } catch (const VExceptionBadId &e) { - VExceptionObjectError excep(tr("Error creating or updating place lavel"), domElement); + VExceptionObjectError excep(tr("Error creating or updating place label"), domElement); excep.AddMoreInformation(e.ErrorMessage()); throw excep; } catch (qmu::QmuParserError &e) { - VExceptionObjectError excep(tr("Error creating or updating place lavel"), domElement); + VExceptionObjectError excep(tr("Error creating or updating place label"), domElement); excep.AddMoreInformation(QString("Message: " + e.GetMsg() + "\n"+ "Expression: " + e.GetExpr())); throw excep; } diff --git a/src/libs/ifc/xml/vabstractconverter.cpp b/src/libs/ifc/xml/vabstractconverter.cpp index 67a5087bb..5c3ac669e 100644 --- a/src/libs/ifc/xml/vabstractconverter.cpp +++ b/src/libs/ifc/xml/vabstractconverter.cpp @@ -137,7 +137,7 @@ QString VAbstractConverter::Convert() } else { - throw VException(tr("Error openning a temp file: %1.").arg(m_tmpFile.errorString())); + throw VException(tr("Error opening a temp file: %1.").arg(m_tmpFile.errorString())); } m_ver < MaxVer() ? ApplyPatches() : DowngradeToCurrentMaxVersion(); diff --git a/src/libs/ifc/xml/vbackgroundpatternimage.cpp b/src/libs/ifc/xml/vbackgroundpatternimage.cpp index 71c456bca..34961934f 100644 --- a/src/libs/ifc/xml/vbackgroundpatternimage.cpp +++ b/src/libs/ifc/xml/vbackgroundpatternimage.cpp @@ -169,7 +169,7 @@ auto VBackgroundPatternImage::IsValid() const -> bool if (not aliases.contains(m_contentType)) { - m_errorString = tr("Content type mistmatch."); + m_errorString = tr("Content type mismatch."); return false; } diff --git a/src/libs/ifc/xml/vpatternimage.cpp b/src/libs/ifc/xml/vpatternimage.cpp index a12d3ca88..4f99b6cd6 100644 --- a/src/libs/ifc/xml/vpatternimage.cpp +++ b/src/libs/ifc/xml/vpatternimage.cpp @@ -117,7 +117,7 @@ auto VPatternImage::IsValid() const -> bool if (not aliases.contains(m_contentType)) { - m_errorString = tr("Content type mistmatch."); + m_errorString = tr("Content type mismatch."); return false; } diff --git a/src/libs/vlayout/dialogs/watermarkwindow.cpp b/src/libs/vlayout/dialogs/watermarkwindow.cpp index 62814f05b..035d8d199 100644 --- a/src/libs/vlayout/dialogs/watermarkwindow.cpp +++ b/src/libs/vlayout/dialogs/watermarkwindow.cpp @@ -399,7 +399,7 @@ bool WatermarkWindow::on_actionSave_triggered() QMessageBox messageBox(this); messageBox.setIcon(QMessageBox::Question); messageBox.setText(tr("The document has no write permissions.")); - messageBox.setInformativeText(tr("Do you want to change the premissions?")); + messageBox.setInformativeText(tr("Do you want to change the permissions?")); messageBox.setStandardButtons(QMessageBox::Yes | QMessageBox::Cancel); messageBox.setDefaultButton(QMessageBox::Yes); diff --git a/src/libs/vlayout/vbank.cpp b/src/libs/vlayout/vbank.cpp index c6b666825..88acd2297 100644 --- a/src/libs/vlayout/vbank.cpp +++ b/src/libs/vlayout/vbank.cpp @@ -336,7 +336,7 @@ bool VBank::PrepareUnsorted() if (square <= 0) { qCCritical(lBank) << VAbstractValApplication::warningMessageSignature + - tr("Preparing data for layout error: Detail '%1' square <= 0") + tr("Error of preparing data for layout: Detail '%1' square <= 0") .arg(details.at(i).GetName()); prepare = false; return prepare; @@ -361,7 +361,7 @@ bool VBank::PrepareDetails() if (layoutWidth <= 0) { qCCritical(lBank) << VAbstractValApplication::warningMessageSignature + - tr("Preparing data for layout error: Layout paper sheet <= 0"); + tr("Error of preparing data for layout: Layout paper sheet <= 0"); prepare = false; return prepare; } @@ -369,7 +369,7 @@ bool VBank::PrepareDetails() if (details.isEmpty()) { qCCritical(lBank) << VAbstractValApplication::warningMessageSignature + - tr("Preparing data for layout error: List of details is empty"); + tr("Error of preparing data for layout: List of details is empty"); prepare = false; return prepare; } diff --git a/src/libs/vlayout/vlayoutexporter.cpp b/src/libs/vlayout/vlayoutexporter.cpp index c4b440719..f378a5c50 100644 --- a/src/libs/vlayout/vlayoutexporter.cpp +++ b/src/libs/vlayout/vlayoutexporter.cpp @@ -265,7 +265,7 @@ void VLayoutExporter::ExportToFlatDXF(QGraphicsScene *scene, const QListrender(&painter, m_imageRect, m_imageRect, Qt::IgnoreAspectRatio); if (not painter.end()) { - qCritical() << tr("Can't create an flat dxf file.") + qCritical() << tr("Can't create a flat dxf file.") << generator.ErrorString(); } } diff --git a/src/libs/vtools/undocommands/image/zvaluemovebackgroundimage.cpp b/src/libs/vtools/undocommands/image/zvaluemovebackgroundimage.cpp index 2d9612330..bbfe5ce10 100644 --- a/src/libs/vtools/undocommands/image/zvaluemovebackgroundimage.cpp +++ b/src/libs/vtools/undocommands/image/zvaluemovebackgroundimage.cpp @@ -97,9 +97,9 @@ void ZValueMoveBackgroundImage::redo() if (levels.contains(image.ZValue())) { - QVector lavel_images = levels.value(image.ZValue()); - lavel_images.append(image.Id()); - levels[image.ZValue()] = lavel_images; + QVector level_images = levels.value(image.ZValue()); + level_images.append(image.Id()); + levels[image.ZValue()] = level_images; } else { diff --git a/src/libs/vwidgets/vabstractmainwindow.cpp b/src/libs/vwidgets/vabstractmainwindow.cpp index c4f9bfaf9..d01c4ed35 100644 --- a/src/libs/vwidgets/vabstractmainwindow.cpp +++ b/src/libs/vwidgets/vabstractmainwindow.cpp @@ -280,7 +280,7 @@ auto VAbstractMainWindow::CheckFilePermissions(const QString &path, QWidget *mes QMessageBox messageBox(messageBoxParent); messageBox.setIcon(QMessageBox::Question); messageBox.setText(tr("The file has no write permissions.")); - messageBox.setInformativeText(tr("Do you want to change the premissions?")); + messageBox.setInformativeText(tr("Do you want to change the permissions?")); messageBox.setStandardButtons(QMessageBox::Yes | QMessageBox::Cancel); messageBox.setDefaultButton(QMessageBox::Yes);