qbs/modules/i18n/i18n.qbs

@@ -23,7 +23,7 @@ Module {
     property bool update: false
 
     // Build with legacy way though .pro file
-    property bool buildWithPro: false
+    property bool buildWithPro: true
 
     property string lupdateName: "lupdate"
 
@@ -135,13 +135,9 @@ Module {
                     // It seems all we need are projectFile, sources and translations options.
 
                     var sources = [];
-                    var includePaths = [];
                     if (inputs["i18n.hpp"] !== undefined)
-                        for (var i = 0; i < inputs["i18n.hpp"].length; i++) {
+                        for (var i = 0; i < inputs["i18n.hpp"].length; i++)
                             sources.push(inputs["i18n.hpp"][i].filePath);
-                            if (!includePaths.includes(FileInfo.path(inputs["i18n.hpp"][i].filePath)))
-                                includePaths.push(FileInfo.path(inputs["i18n.hpp"][i].filePath));
-                        }
 
                     if (inputs["i18n.src"] !== undefined)
                         for (var i = 0; i < inputs["i18n.src"].length; i++)
@@ -170,7 +166,6 @@ Module {
 
                     var project = {
                         projectFile: "", // Looks like can be empty
-                        includePaths: includePaths.sort(),
                         sources: sources.sort(),
                         translations: translations.sort()
                     };

scripts/qbs_lupdate.sh

@@ -19,12 +19,10 @@ wait
 cp -r ./share/translations/* ../share/translations
 rm -r ./share
 
-QMAKEPATH=$HOME/Qt6.6/6.6.0/gcc_64/bin/qmake
-
 # Resolve any changes to config
-qbs resolve -d ../../build_translations -f ../valentina.qbs modules.i18n.update:true moduleProviders.Qt.qmakeFilePaths:${QMAKEPATH}
+qbs resolve -d ../../build_translations modules.i18n.update:true moduleProviders.Qt.qmakeFilePaths:$HOME/Qt6.5/6.5.0/gcc_64/bin/qmake
 # Update local strings
-qbs -d ../../build_translations -f ../valentina.qbs -p 'Translations' modules.i18n.update:true moduleProviders.Qt.qmakeFilePaths:${QMAKEPATH}
+qbs -d ../../build_translations -f ../valentina.qbs -p 'Translations' modules.i18n.update:true moduleProviders.Qt.qmakeFilePaths:$HOME/Qt6.6/6.6.0/gcc_64/bin/qmake
 
 end=$(date +%s)
 runtime=$(python3 -c "print('Time passed %u:%02u seconds' % ((${end} - ${start})/60, (${end} - ${start})%60))")

src/app/tape/dialogs/dialogknownmeasurementscsvcolumns.cpp

@@ -163,16 +163,15 @@ QString DialogKnownMeasurementsCSVColumns::ColumnHeader(int column) const
     switch (individualColumn)
     {
         case KnownMeasurementsColumns::Name:
-            return QCoreApplication::translate("DialogKnownMeasurementsCSVColumns", "Name", "measurement column");
+            return tr("Name", "measurement column");
         case KnownMeasurementsColumns::Group:
-            return QCoreApplication::translate("DialogKnownMeasurementsCSVColumns", "Group", "measurement column");
+            return tr("Group", "measurement column");
         case KnownMeasurementsColumns::FullName:
-            return QCoreApplication::translate("DialogKnownMeasurementsCSVColumns", "Full name", "measurement column");
+            return tr("Full name", "measurement column");
         case KnownMeasurementsColumns::Formula:
-            return QCoreApplication::translate("DialogKnownMeasurementsCSVColumns", "Formula", "measurement column");
+            return tr("Formula", "measurement column");
         case KnownMeasurementsColumns::Description:
-            return QCoreApplication::translate("DialogKnownMeasurementsCSVColumns", "Description",
+            return tr("Description", "measurement column");
-                                               "measurement column");
         default:
             return {};
     }
@@ -285,7 +284,7 @@ void DialogKnownMeasurementsCSVColumns::InitColumnsControls()
 
         if (not ColumnMandatory(column))
         {
-            control->addItem(QCoreApplication::translate("DialogKnownMeasurementsCSVColumns", "Skip"), -1);
+            control->addItem(tr("Skip"), -1);
         }
 
         control->setCurrentIndex(-1);
@@ -445,7 +444,7 @@ void DialogKnownMeasurementsCSVColumns::ShowImportPreview()
 //---------------------------------------------------------------------------------------------------------------------
 void DialogKnownMeasurementsCSVColumns::RetranslateLabels()
 {
-    ui->labelName->setText(QCoreApplication::translate("DialogKnownMeasurementsCSVColumns", "Name") + "*:"_L1);
+    ui->labelName->setText(tr("Name") + "*:"_L1);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -483,8 +482,7 @@ void DialogKnownMeasurementsCSVColumns::CheckStatus()
     if (m_fileName.isEmpty())
     {
         SetStatus(false);
-        ui->labelStatus->setText(
+        ui->labelStatus->setText(tr("File path is empty"));
-            QCoreApplication::translate("DialogKnownMeasurementsCSVColumns", "File path is empty"));
         return;
     }
 
@@ -494,8 +492,7 @@ void DialogKnownMeasurementsCSVColumns::CheckStatus()
     if (columns < MinimumColumns())
     {
         SetStatus(false);
-        ui->labelStatus->setText(
+        ui->labelStatus->setText(tr("Not enough columns"));
-            QCoreApplication::translate("DialogKnownMeasurementsCSVColumns", "Not enough columns"));
         return;
     }
 
@@ -503,21 +500,19 @@ void DialogKnownMeasurementsCSVColumns::CheckStatus()
     if (rows < 1)
     {
         SetStatus(false);
-        ui->labelStatus->setText(
+        ui->labelStatus->setText(tr("Not enough data to import"));
-            QCoreApplication::translate("DialogKnownMeasurementsCSVColumns", "Not enough data to import"));
         return;
     }
 
     if (not ColumnsValid())
     {
         SetStatus(false);
-        ui->labelStatus->setText(QCoreApplication::translate("DialogKnownMeasurementsCSVColumns",
+        ui->labelStatus->setText(tr("Please, select unique number for each column"));
-                                                             "Please, select unique number for each column"));
         return;
     }
 
     SetStatus(true);
-    ui->labelStatus->setText(QCoreApplication::translate("DialogKnownMeasurementsCSVColumns", "Ready"));
+    ui->labelStatus->setText(tr("Ready"));
 }
 
 //---------------------------------------------------------------------------------------------------------------------

src/app/tape/dialogs/dialogmeasurementscsvcolumns.cpp

@@ -240,13 +240,13 @@ auto DialogMeasurementsCSVColumns::ColumnHeader(int column) const -> QString
         switch (individualColumn)
         {
             case IndividualMeasurementsColumns::Name:
-                return QCoreApplication::translate("DialogMeasurementsCSVColumns", "Name", "measurement column");
+                return tr("Name", "measurement column");
             case IndividualMeasurementsColumns::Value:
-                return QCoreApplication::translate("DialogMeasurementsCSVColumns", "Value", "measurement column");
+                return tr("Value", "measurement column");
             case IndividualMeasurementsColumns::FullName:
-                return QCoreApplication::translate("DialogMeasurementsCSVColumns", "Full name", "measurement column");
+                return tr("Full name", "measurement column");
             case IndividualMeasurementsColumns::Description:
-                return QCoreApplication::translate("DialogMeasurementsCSVColumns", "Description", "measurement column");
+                return tr("Description", "measurement column");
             default:
                 return {};
         }
@@ -258,15 +258,14 @@ auto DialogMeasurementsCSVColumns::ColumnHeader(int column) const -> QString
         switch (multisizeColumn)
         {
             case MultisizeMeasurementsColumns::Name:
-                return QCoreApplication::translate("DialogMeasurementsCSVColumns", "Name", "measurement column");
+                return tr("Name", "measurement column");
             case MultisizeMeasurementsColumns::BaseValue:
-                return QCoreApplication::translate("DialogMeasurementsCSVColumns", "Base value", "measurement column");
+                return tr("Base value", "measurement column");
             case MultisizeMeasurementsColumns::ShiftA:
                 if (not m_dimensions.empty())
                 {
                     MeasurementDimension_p dimension = m_dimensions.at(0);
-                    return QCoreApplication::translate("DialogMeasurementsCSVColumns", "Shift", "measurement column") +
+                    return tr("Shift", "measurement column") + suffix.arg(dimension->Name());
-                           suffix.arg(dimension->Name());
                 }
                 else
                 {
@@ -276,8 +275,7 @@ auto DialogMeasurementsCSVColumns::ColumnHeader(int column) const -> QString
                 if (m_dimensions.size() > 1)
                 {
                     MeasurementDimension_p dimension = m_dimensions.at(1);
-                    return QCoreApplication::translate("DialogMeasurementsCSVColumns", "Shift", "measurement column") +
+                    return tr("Shift", "measurement column") + suffix.arg(dimension->Name());
-                           suffix.arg(dimension->Name());
                 }
                 else
                 {
@@ -287,17 +285,16 @@ auto DialogMeasurementsCSVColumns::ColumnHeader(int column) const -> QString
                 if (m_dimensions.size() > 2)
                 {
                     MeasurementDimension_p dimension = m_dimensions.at(2);
-                    return QCoreApplication::translate("DialogMeasurementsCSVColumns", "Shift", "measurement column") +
+                    return tr("Shift", "measurement column") + suffix.arg(dimension->Name());
-                           suffix.arg(dimension->Name());
                 }
                 else
                 {
                     return QStringLiteral("Shift C");
                 }
             case MultisizeMeasurementsColumns::FullName:
-                return QCoreApplication::translate("DialogMeasurementsCSVColumns", "Full name", "measurement column");
+                return tr("Full name", "measurement column");
             case MultisizeMeasurementsColumns::Description:
-                return QCoreApplication::translate("DialogMeasurementsCSVColumns", "Description", "measurement column");
+                return tr("Description", "measurement column");
             default:
                 return {};
         }
@@ -507,7 +504,7 @@ void DialogMeasurementsCSVColumns::InitColumnsControls()
 
         if (not ColumnMandatory(column))
         {
-            control->addItem(QCoreApplication::translate("DialogMeasurementsCSVColumns", "Skip"), -1);
+            control->addItem(tr("Skip"), -1);
         }
 
         control->setCurrentIndex(-1);
@@ -733,43 +730,34 @@ void DialogMeasurementsCSVColumns::HackColumnControls()
 //---------------------------------------------------------------------------------------------------------------------
 void DialogMeasurementsCSVColumns::RetranslateLabels()
 {
-    ui->labelName->setText(QCoreApplication::translate("DialogMeasurementsCSVColumns", "Name", "measurement column") +
+    ui->labelName->setText(tr("Name", "measurement column") + "*:"_L1);
-                           "*:"_L1);
 
     if (m_type == MeasurementsType::Individual)
     {
-        ui->labelValue->setText(
+        ui->labelValue->setText(tr("Value", "measurement column") + "*:"_L1);
-            QCoreApplication::translate("DialogMeasurementsCSVColumns", "Value", "measurement column") + "*:"_L1);
     }
     else
     {
-        ui->labelValue->setText(
+        ui->labelValue->setText(tr("Base value", "measurement column") + "*:"_L1);
-            QCoreApplication::translate("DialogMeasurementsCSVColumns", "Base value", "measurement column") + "*:"_L1);
 
         const QString suffix = QStringLiteral(" (%1)");
 
         if (not m_dimensions.empty())
         {
             MeasurementDimension_p dimension = m_dimensions.at(0);
-            ui->labelShiftA->setText(
+            ui->labelShiftA->setText(tr("Shift", "measurement column") + suffix.arg(dimension->Name()));
-                QCoreApplication::translate("DialogMeasurementsCSVColumns", "Shift", "measurement column") +
-                suffix.arg(dimension->Name()));
         }
 
         if (m_dimensions.size() > 1)
         {
             MeasurementDimension_p dimension = m_dimensions.at(1);
-            ui->labelShiftB->setText(
+            ui->labelShiftB->setText(tr("Shift", "measurement column") + suffix.arg(dimension->Name()));
-                QCoreApplication::translate("DialogMeasurementsCSVColumns", "Shift", "measurement column") +
-                suffix.arg(dimension->Name()));
         }
 
         if (m_dimensions.size() > 2)
         {
             MeasurementDimension_p dimension = m_dimensions.at(2);
-            ui->labelShiftC->setText(
+            ui->labelShiftC->setText(tr("Shift", "measurement column") + suffix.arg(dimension->Name()));
-                QCoreApplication::translate("DialogMeasurementsCSVColumns", "Shift", "measurement column") +
-                suffix.arg(dimension->Name()));
         }
     }
 }
@@ -834,7 +822,7 @@ void DialogMeasurementsCSVColumns::CheckStatus()
     if (m_fileName.isEmpty())
     {
         SetStatus(false);
-        ui->labelStatus->setText(QCoreApplication::translate("DialogMeasurementsCSVColumns", "File path is empty"));
+        ui->labelStatus->setText(tr("File path is empty"));
         return;
     }
 
@@ -844,7 +832,7 @@ void DialogMeasurementsCSVColumns::CheckStatus()
     if (columns < MinimumColumns())
     {
         SetStatus(false);
-        ui->labelStatus->setText(QCoreApplication::translate("DialogMeasurementsCSVColumns", "Not enough columns"));
+        ui->labelStatus->setText(tr("Not enough columns"));
         return;
     }
 
@@ -852,21 +840,19 @@ void DialogMeasurementsCSVColumns::CheckStatus()
     if (rows < 1)
     {
         SetStatus(false);
-        ui->labelStatus->setText(
+        ui->labelStatus->setText(tr("Not enough data to import"));
-            QCoreApplication::translate("DialogMeasurementsCSVColumns", "Not enough data to import"));
         return;
     }
 
     if (not ColumnsValid())
     {
         SetStatus(false);
-        ui->labelStatus->setText(QCoreApplication::translate("DialogMeasurementsCSVColumns",
+        ui->labelStatus->setText(tr("Please, select unique number for each column"));
-                                                             "Please, select unique number for each column"));
         return;
     }
 
     SetStatus(true);
-    ui->labelStatus->setText(QCoreApplication::translate("DialogMeasurementsCSVColumns", "Ready"));
+    ui->labelStatus->setText(tr("Ready"));
 }
 
 //---------------------------------------------------------------------------------------------------------------------

src/app/tape/tkmmainwindow.cpp

@@ -127,7 +127,7 @@ TKMMainWindow::TKMMainWindow(QWidget *parent)
     ReadSettings();
 
 #if defined(Q_OS_MAC)
-    ui->pushButtonShowInExplorer->setText(QCoreApplication::translate("TKMMainWindow", "Show in Finder"));
+    ui->pushButtonShowInExplorer->setText(tr("Show in Finder"));
 #endif // defined(Q_OS_MAC)
 
     if (MApplication::VApp()->IsAppInGUIMode())

src/libs/ifc/xml/vabstractpattern.cpp

@@ -857,7 +857,7 @@ auto VAbstractPattern::ParseSANode(const QDomElement &domElement) -> VPieceNode
             tool = Tool::NodeElArc;
             break;
         default:
-            throw VException(QCoreApplication::translate("VAbstractPattern", "Wrong tag name '%1'.").arg(t));
+            throw VException(tr("Wrong tag name '%1'.").arg(t));
     }
     VPieceNode node(id, tool, reverse);
     node.SetFormulaSABefore(saBefore);
@@ -1597,7 +1597,7 @@ void VAbstractPattern::ToolExists(const quint32 &id)
 {
     if (tools.contains(id) == false)
     {
-        throw VExceptionBadId(QCoreApplication::translate("VAbstractPattern", "Can't find tool in table."), id);
+        throw VExceptionBadId(tr("Can't find tool in table."), id);
     }
 }
 
@@ -2447,7 +2447,7 @@ auto VAbstractPattern::GroupLinkedToTool(vidtype toolId) const -> vidtype
 //---------------------------------------------------------------------------------------------------------------------
 auto VAbstractPattern::GetGroupName(quint32 id) -> QString
 {
-    QString name = QCoreApplication::translate("VAbstractPattern", "New group");
+    QString name = tr("New group");
     QDomElement group = elementById(id, TagGroup);
     if (group.isElement())
     {

src/libs/vlayout/vboundary.cpp

@@ -305,19 +305,17 @@ void VBoundary::InsertPassmark(const VBoundarySequenceItemData &item, QList<VBou
         QString pieceName;
         if (!m_pieceName.isEmpty())
         {
-            pieceName = QCoreApplication::translate("VBoundary", "Piece '%1'.").arg(m_pieceName) + ' '_L1;
+            pieceName = tr("Piece '%1'.").arg(m_pieceName) + ' '_L1;
         }
 
         QString errorMsg;
         if (!passmark.label.isEmpty())
         {
-            errorMsg =
+            errorMsg = pieceName + tr("Unable to insert notch for point '%1'.").arg(passmark.label);
-                pieceName +
-                QCoreApplication::translate("VBoundary", "Unable to insert notch for point '%1'.").arg(passmark.label);
         }
         else
         {
-            errorMsg = pieceName + QCoreApplication::translate("VBoundary", "Unable to insert notch.");
+            errorMsg = pieceName + tr("Unable to insert notch.");
         }
 
         VAbstractApplication::VApp()->IsPedantic()

src/libs/vpatterndb/vpassmark.cpp

@@ -750,8 +750,7 @@ auto VPassmark::PassmarkIntersection(const QVector<QPointF> &path, QLineF line,
             return line;
         }
 
-        const QString errorMsg =
+        const QString errorMsg = QObject::tr("Cannot calculate a notch for point '%1' in piece '%2'. Notch "
-            QCoreApplication::translate("VPassmark", "Cannot calculate a notch for point '%1' in piece '%2'. Notch "
                                              "collapse.")
                                      .arg(m_data.nodeName, m_data.pieceName);
         VAbstractApplication::VApp()->IsPedantic()
@@ -760,8 +759,7 @@ auto VPassmark::PassmarkIntersection(const QVector<QPointF> &path, QLineF line,
     }
     else
     {
-        const QString errorMsg = QCoreApplication::translate(
+        const QString errorMsg = QObject::tr("Cannot calculate a notch for point '%1' in piece '%2'. Cannot find "
-                                     "VPassmark", "Cannot calculate a notch for point '%1' in piece '%2'. Cannot find "
                                              "intersection.")
                                      .arg(m_data.nodeName, m_data.pieceName);
         VAbstractApplication::VApp()->IsPedantic()
@@ -939,9 +937,7 @@ auto VPassmark::BuiltInSAPassmarkBaseLine(const VPiece &piece) const -> QVector<
             }
             else
             {
-                const QString errorMsg =
+                const QString errorMsg = QObject::tr("Cannot calculate a notch for point '%1' in piece '%2' with built "
-                    QCoreApplication::translate("VPassmark",
-                                                "Cannot calculate a notch for point '%1' in piece '%2' with built "
                                                      "in seam allowance. User must manually provide length.")
                                              .arg(m_data.nodeName, m_data.pieceName);
                 VAbstractApplication::VApp()->IsPedantic()
@@ -996,9 +992,7 @@ auto VPassmark::SAPassmarkBaseLine(const QVector<QPointF> &seamAllowance, const
 
     if (rotatedSeamAllowance.size() < 2)
     {
-        const QString errorMsg =
+        const QString errorMsg = QObject::tr("Cannot calculate a notch for point '%1' in piece '%2'. Seam allowance is "
-            QCoreApplication::translate("VPassmark",
-                                        "Cannot calculate a notch for point '%1' in piece '%2'. Seam allowance is "
                                              "empty.")
                                      .arg(m_data.nodeName, m_data.pieceName);
         VAbstractApplication::VApp()->IsPedantic()
@@ -1011,8 +1005,7 @@ auto VPassmark::SAPassmarkBaseLine(const QVector<QPointF> &seamAllowance, const
     const PassmarkStatus seamPassmarkType = GetSeamPassmarkSAPoint(m_data, rotatedSeamAllowance, seamPassmarkSAPoint);
     if (seamPassmarkType == PassmarkStatus::Error)
     {
-        const QString errorMsg = QCoreApplication::translate(
+        const QString errorMsg = QObject::tr("Cannot calculate a notch for point '%1' in piece '%2'. Cannot find "
-                                     "VPassmark", "Cannot calculate a notch for point '%1' in piece '%2'. Cannot find "
                                              "position for a notch.")
                                      .arg(m_data.nodeName, m_data.pieceName);
         VAbstractApplication::VApp()->IsPedantic()
@@ -1028,9 +1021,7 @@ auto VPassmark::SAPassmarkBaseLine(const QVector<QPointF> &seamAllowance, const
 
     if (not FixNotchPoint(path, m_data, &seamPassmarkSAPoint))
     {
-        const QString errorMsg =
+        const QString errorMsg = QObject::tr("Cannot calculate a notch for point '%1' in piece '%2'. Unable to fix a "
-            QCoreApplication::translate("VPassmark",
-                                        "Cannot calculate a notch for point '%1' in piece '%2'. Unable to fix a "
                                              "notch position.")
                                      .arg(m_data.nodeName, m_data.pieceName);
         VAbstractApplication::VApp()->IsPedantic()

src/libs/vtools/dialogs/tools/piece/dialogpiecepath.cpp

@@ -186,8 +186,7 @@ void DialogPiecePath::ChosenObject(quint32 id, const SceneObject &type)
 
             if (p.CountNodes() == 1)
             {
-                emit ToolTip(QCoreApplication::translate(
+                emit ToolTip(tr("Select main path objects, <b>%1</b> - reverse direction curve, "
-                                 "DialogPiecePath", "Select main path objects, <b>%1</b> - reverse direction curve, "
                                 "<b>%2</b> - finish creation")
                                  .arg(VModifierKey::Shift(), VModifierKey::EnterKey()));
 

src/test/CollectionTest/CollectionTest.qbs

@@ -4,7 +4,7 @@ import qbs.Utilities
 
 VTestApp {
     Depends { name: "buildconfig" }
-    Depends { name: "Qt"; submodules: ["core", "testlib", "gui", "printsupport"] }
+    Depends { name: "Qt"; submodules: ["testlib", "gui", "printsupport"] }
     Depends { name: "VTestLib" }
     Depends { name: "autotest" }
 

src/test/TranslationsTest/TranslationsTest.qbs

@@ -4,7 +4,7 @@ import qbs.Utilities
 VTestApp {
     Depends { name: "buildconfig" }
     Depends { name: "VTestLib" }
-    Depends { name: "Qt"; submodules: ["core", "testlib", "xml", "gui", "printsupport"] }
+    Depends { name: "Qt"; submodules: ["testlib", "xml", "gui", "printsupport"] }
     Depends { name: "autotest" }
 
     Depends {